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

7944 Commits

Author SHA1 Message Date
Enno Rehling 6499901dac Merge pull request #625 from ennorehling/develop 
fix the install script, issue #623
 2017-01-11 11:04:37 +01:00
Enno Rehling 9d33a230d9 Merge branch 'master' into develop 2017-01-11 10:58:07 +01:00
Enno Rehling 281cfbd009 fix the install script, issue #623 2017-01-11 10:57:42 +01:00
Enno Rehling 602ccf7aaf Merge pull request #622 from ennorehling/c99 
simplify compiler/platform compatibility
 2017-01-11 09:33:27 +01:00
Enno Rehling 05b6c1c418 Merge branch 'develop' into c99 2017-01-11 09:30:50 +01:00
Enno Rehling f8ff9ffda5 compiles with gcc on rpi 2017-01-10 18:40:01 +01:00
Enno Rehling ba2f35e44f more stbool.h includes, MSVC has no unlink 2017-01-10 18:20:47 +01:00
Enno Rehling 881dd9886f Merge branch 'c99' of https://github.com/ennorehling/eressea.git 
Conflicts:
	src/platform.h
 2017-01-10 18:10:06 +01:00
Enno Rehling b27e1a01aa continued work for MSVC compilation 2017-01-10 18:07:36 +01:00
Enno Rehling ddd074f393 continue fixing compilation (gcc/clang) 2017-01-10 18:06:44 +01:00
Enno Rehling 8b7dae6977 kill autoconf.h, replace platform.h for C99 compatibility work 2017-01-10 16:31:05 +01:00
Enno Rehling 3ff5a3155e do not update submodules before each build. 
add tolua to .gitignore, it's not a proper submodule.
 2017-01-10 12:54:49 +01:00
Enno Rehling a3cdf03ebd Merge pull request #620 from ennorehling/develop 
eliminate strncpy from the code, reduce snprintf calls
 2017-01-07 21:25:12 +01:00
Enno Rehling 4d2d5ccac9 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-01-07 21:20:11 +01:00
Enno Rehling 6d60b48b3f create_order takes variable arguments! 
more snprintf removal.
 2017-01-07 21:19:58 +01:00
Enno Rehling 3fb12d8f1e replace snprintf and the like. 
you cannot trust _snprintf in MSVC (no zero-termination).
 2017-01-07 21:09:39 +01:00
Enno Rehling 494643d65f remove old & unused fix_famililar repair code. 2017-01-07 20:20:13 +01:00
Enno Rehling f5419a7f45 remove superfluous quicklist includes. 2017-01-06 22:47:50 +01:00
Enno Rehling 262580f1d5 gcc warning eliminated 2017-01-06 21:37:52 +01:00
Enno Rehling 8d02d5a5aa never use strncpy, anywhere. 2017-01-06 21:24:31 +01:00
Enno Rehling 9463642687 eliminate unnecessary strncpy use. 2017-01-06 21:21:20 +01:00
Enno Rehling f9fbe60766 add a happy test for mt_new. 
refactor to not use strncpy.
 2017-01-06 20:54:57 +01:00
Enno Rehling 4c22de2c3e Merge pull request #619 from ennorehling/develop 
BUG 2117: BEZAHLE NICHT in E2
 2016-12-31 21:24:52 +01:00
Enno Rehling ce17d7f2d7 enable PAY NOT in E2 2016-12-31 21:21:23 +01:00
Enno Rehling 6c5213292c Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-12-31 20:26:06 +01:00
Enno Rehling 6c4e458379 Merge remote-tracking branch 'upstream/develop' into develop 2016-12-31 20:25:31 +01:00
Enno Rehling 65d10a76f0 Merge branch 'master' into develop 2016-12-31 20:22:18 +01:00
Enno Rehling fa52e92f3e Merge pull request #618 from ennorehling/2268-name_unit 
BUG 2268: monster names
 2016-12-31 20:21:03 +01:00
Enno Rehling 5b7cdc4d48 monster name pluralization changes with u->number. 2016-12-31 20:17:02 +01:00
Enno Rehling 065439e967 test that monsters with "namegeneric" hook get a NULL name (WIP) 2016-12-31 20:12:13 +01:00
Enno Rehling 4a802be67c fix undead name generation. 2016-12-31 20:03:50 +01:00
Enno Rehling a7f8ad052d failing test for name_unit. 2016-12-31 20:00:04 +01:00
Enno Rehling 44652bae80 fix flt/int compilation bug. 2016-12-23 23:58:24 +01:00
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