Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,861 Commits 10 Branches 0 Tags 41 MiB
Commit Graph

7861 Commits

Author SHA1 Message Date
Enno Rehling aa08a20724 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-12-23 18:05:55 +01:00
Enno Rehling cc227fb707 merge monster.c and monsters.c 
move RCF_DESERT handling to monsters.c
 2016-12-23 18:05:38 +01:00
Enno Rehling 2f52c226f0 clibs MSVC compilation 2016-12-22 07:07:06 +01:00
Enno Rehling 20fe039b16 use joint clibs directory instead of quicklist/critbit. 2016-12-19 21:35:02 +01:00
Enno Rehling 752b6526bd replace submodules 2016-12-19 20:55:36 +01:00
Enno Rehling ceacec8115 Merge branch 'master' into develop 2016-12-16 17:31:59 +01:00
Enno Rehling b0a56c0567 Merge pull request #616 from ennorehling/maxteachers 
BUG 2265: Eliminate MAXTEACHERS warning
 2016-12-16 17:30:14 +01:00
Enno Rehling f5c52a1ccd Merge pull request #617 from ennorehling/hotfix/bug-2266-follow 
BUG 2266 Fixing FOLLOW
 2016-12-16 17:30:02 +01:00
Enno Rehling 72ac801734 fix bug 2266 2016-12-16 17:17:04 +01:00
Enno Rehling ddc7707cde add a failing test for bug 2266 2016-12-16 17:16:10 +01:00
Enno Rehling 95954fb386 start writing a test (WIP). 2016-12-16 07:29:43 +01:00
Enno Rehling a72b29610c small edit (int->bool) 2016-12-11 22:40:06 +01:00
Enno Rehling ccb1799726 unlimited teachers. 
quicklist replaces fixed array.
 2016-12-11 21:29:07 +01:00
Enno Rehling 0197fce9a1 add a test for teach-messages. 
vheck that they are generated for students and teachers.
 2016-12-11 21:21:50 +01:00
Enno Rehling 4502692f30 Merge branch 'master' into develop 2016-12-10 16:23:12 +01:00
Enno Rehling 31b3f2b2de remove Umlaut from Lua script 2016-12-10 16:22:57 +01:00
Enno Rehling 7fe6fea56d Merge branch 'master' into develop 2016-12-09 06:52:23 +01:00
Enno Rehling 06d9604355 Merge pull request #615 from ennorehling/utf8-uppercase 
CR: encoding UTF-8 statt utf-8.
 2016-12-09 06:48:33 +01:00
Enno Rehling 01233c4f82 UTF-8 statt utf-8. 
Auf besonderen Wunsch werden einheitlich Großbuchstaben verwendet.
 2016-12-05 07:54:43 +01:00
Enno Rehling 92b885ae73 Merge branch 'master' into develop 2016-12-03 23:47:12 +01:00
Enno Rehling ada05ff55f Merge pull request #614 from ennorehling/master 
fix bug 2261: bit manipulation error in STEALTH FACTION.
 2016-12-03 23:46:05 +01:00
Enno Rehling afac66e213 fix bug 2261: bit manipulation error in STEALTH FACTION. 
https://bugs.eressea.de/view.php?id=2261
 2016-12-03 23:38:53 +01:00
Enno Rehling 2de3c3179a develop branch is now base for 3.11 2016-11-28 08:39:07 +01:00
Enno Rehling cd2842ef38 Merge branch 'develop' 
Conflicts:
	src/buildno.h
	src/util/unicode.test.c
 2016-11-27 18:48:01 +01:00
Enno Rehling aa7cc69fe1 Merge pull request #613 from ennorehling/develop 
new address, finishing 3.10
 2016-11-27 17:13:56 +01:00
Enno Rehling bf70792da6 make kn-bremen.de official email address 2016-11-27 16:07:46 +01:00
Enno Rehling 641239e388 Merge remote-tracking branch 'upstream/develop' into develop 2016-11-26 17:18:36 +01:00
Enno Rehling 06ba427a77 fix VS2015 build: config.h not found 2016-11-26 17:17:14 +01:00
Enno Rehling daae6dd375 Merge pull request #612 from ennorehling/debian-x32 
fix compilation with glibc >= 2.20, no autoconf
 2016-11-26 17:12:04 +01:00
Enno Rehling 6079293fea the _BSD_SOURCE macro was deprecated with glibc 2.12 2016-11-26 16:54:19 +01:00
Enno Rehling 43b8ff1ea8 fix strdup compilications when compiling with gcc and autoconf. 2016-11-26 16:21:41 +01:00
Enno Rehling 68ce6907f3 new storage module (without textstore and snprintf) 2016-11-26 07:24:19 +01:00
Enno Rehling 7870b63655 fix VS 2015 build 2016-11-26 07:04:18 +01:00
Enno Rehling 14b5c0f922 mac builds using gcc do not need autoconf. 
need to find a differnt way to test autoconf.
 2016-11-25 22:19:59 +01:00
Enno Rehling 2f81dc16b2 fix autoconf usage, force my OSX build to use it 2016-11-25 21:57:47 +01:00
Enno Rehling 31ff07cbec do not #error 2016-11-25 21:17:10 +01:00
Enno Rehling 0208304b07 use autoconf when not MSCVER or GLIBC 2016-11-25 21:12:14 +01:00
Enno Rehling e52cf75c59 remove autoconf.h from platform.h, fix lots of includes 2016-11-25 20:15:11 +01:00
Enno Rehling 5e49ac6fdf fix $MACHINE variable, update submodules 2016-11-25 16:01:28 +00:00
Enno Rehling c9c4f5dd37 gcc complains about BSD_SOURCE now 2016-11-25 09:54:05 +00:00
Enno Rehling 78e63ed4c6 misleading indentation 2016-11-25 09:48:38 +00:00
Enno Rehling 0cb8e36877 Merge pull request #610 from ennorehling/develop 
house cleaning prior to 3.10
 2016-11-23 19:30:57 +01:00
Enno Rehling ecd74c53f5 More PVS-Studio warnings eliminated. 2016-11-23 19:19:04 +01:00
Enno Rehling 91adf420bc strncat error V645 2016-11-23 19:18:54 +01:00
Enno Rehling 7f9313f1a7 static analysis warnings. 
PVS-Studio warnings reduced or suppressed.
 2016-11-23 18:56:40 +01:00
Enno Rehling ea6cd2ca32 remove unguard trigger. 
it is unused by the code
 2016-11-23 17:55:44 +01:00
Enno Rehling 13c29c136c eliminate config.h from triggers. 
was only used once, for a single fset macro
 2016-11-23 17:52:57 +01:00
Enno Rehling 88f5bfaf47 move wages and related functionality to buildin.c 2016-11-23 17:36:39 +01:00
Enno Rehling 09f22ba0bc move findrace into race.c 2016-11-22 12:32:28 +01:00
Enno Rehling 925d65c206 move entertainmoney to economy 2016-11-22 12:22:07 +01:00