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

8017 Commits

Author SHA1 Message Date
Enno Rehling 1c7f3fab44 emit a password message for newbie factions 2017-01-22 12:38:41 +01:00
Enno Rehling 517bc54856 Merge pull request #631 from ennorehling/develop 
More configuration through eressea.ini
 2017-01-22 12:04:58 +01:00
Enno Rehling 8d4a83d1b4 make these modules optional 2017-01-22 11:38:01 +01:00
Enno Rehling d29fd96f59 no starting equipment. 
do not let the addplayer function give equipment.
rename equipment for autoseed.
 2017-01-22 08:05:19 +01:00
Enno Rehling cacb450567 game.start in eressea.ini overrides calendar 2017-01-22 05:18:32 +01:00
Enno Rehling 1a20d6e5c6 use FACTION in text template, not ERESSEA 2017-01-22 04:55:19 +01:00
Enno Rehling 446e58c383 use the email address from eressea.ini in CR mailto 2017-01-22 04:46:36 +01:00
Enno Rehling 65d188eeaa Merge pull request #630 from ennorehling/develop 
remove per-game configuration from git
 2017-01-21 21:04:09 +01:00
Enno Rehling f633099b97 add game id to eressea.ini 2017-01-21 21:03:48 +01:00
Enno Rehling f18f083922 config.json settings shall not override eressea.ini 2017-01-21 20:59:16 +01:00
Enno Rehling 8c4cccbc65 fix valgrind error. 
I did not understand what keys look like, then effed up when fixing that.
 2017-01-21 20:51:08 +01:00
Enno Rehling 75a97c2977 fix gcc build, introduce a hard limit on ini section size 2017-01-21 20:39:46 +01:00
Enno Rehling ebbe4fa4ac issue #629: fix eressea.ini config 
fixed reading of ini data into config (keys have a . here, not a :).
added a test.
removed obsolete global.inifile variable.
 2017-01-21 19:53:47 +01:00
Enno Rehling 23e0943baa read game configuration data from .ini file 2017-01-21 18:54:08 +01:00
Enno Rehling 6c8089d36e Merge pull request #627 from ennorehling/develop 
bug 2270 & changes for culbig
 2017-01-20 22:52:06 +01:00
Enno Rehling 9c69963477 change error message categories. 
also removing some unused messages and code that supports them.
https://bugs.eressea.de/view.php?id=2270
 2017-01-20 22:39:38 +01:00
Enno Rehling 0909b0b840 we do not need eressea.conf 2017-01-20 20:05:33 +01:00
Enno Rehling 1b2bfc7995 rename [eressea] section to [game] 2017-01-20 19:43:53 +01:00
Enno Rehling 0261cb45c1 move orders-accept configuration to eressea.ini 
install lunit, too
 2017-01-20 08:32:31 +01:00
Enno Rehling 084b4ed387 github issue #626: installing in non-standard paths 2017-01-14 17:19:08 +01:00
Enno Rehling d73c760949 do not set -Werror twice 2017-01-11 15:09:02 +01:00
Enno Rehling d8e6e80b03 issue #478: re-enable -Werror 2017-01-11 14:55:03 +01:00
Enno Rehling a4d8d36aec issue #621: delete battledebug code 2017-01-11 14:53:35 +01:00
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