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

7986 Commits

Author SHA1 Message Date
Enno Rehling e19f0ad381 issue #633: parse FACTION/PARTEI in any language. 
added a test since the first fix did not work.
 2017-01-23 10:47:49 +01:00
Enno Rehling ed3667130e Merge pull request #635 from ennorehling/develop 
FACTION and PARTEI should both start orders.
 2017-01-23 09:47:46 +01:00
Enno Rehling 23d1355fa1 FACTION and PARTEI should both start orders. 2017-01-23 09:22:29 +01:00
Enno Rehling 31b551aa1e Merge pull request #634 from ennorehling/develop 
Letzte Reste des Eressea-Namens entfernen.
 2017-01-22 21:35:22 +01:00
Enno Rehling 3a07d43321 specify a game id, because there is one in the data 2017-01-22 21:02:15 +01:00
Enno Rehling 30665f874a fix game_name, remove it from rules 2017-01-22 20:32:54 +01:00
Enno Rehling 9ccaab6516 Korrekte Email-Subject und Adresse, auch im NR. 
Eliminate crufty per-game strings.
 2017-01-22 20:19:32 +01:00
Enno Rehling 94fcef2fac the locales module is deprecated. 
let's do this in custom.lua from now on.
 2017-01-22 19:32:03 +01:00
Enno Rehling aa66e5d39f remove unused equipment sets (from an unrealized feature). 2017-01-22 19:06:37 +01:00
Enno Rehling 4598bdf917 Merge pull request #632 from ennorehling/develop 
configurable starting equipment
 2017-01-22 18:58:25 +01:00
Enno Rehling f09259f2b3 eliminate duplicate password message 2017-01-22 18:51:20 +01:00
Enno Rehling 4cbeb03590 clean the quipment interface for lua a little bit. 2017-01-22 18:35:54 +01:00
Enno Rehling 0270b3fb8a rename create_equipment function 2017-01-22 18:28:04 +01:00
Enno Rehling 09d4316568 missing includE 2017-01-22 18:03:46 +01:00
Enno Rehling 9e9cd6ae79 try loading config.lua and custom.lua files, if they exist. 2017-01-22 18:01:09 +01:00
Enno Rehling 2c38883362 configure dbname in eressea.ini (or don't use DB if not 2017-01-22 13:09:32 +01:00
Enno Rehling baa210d1a9 Revert "remove sqlite3 code and dependency" 
This reverts commit 7b55a57610.
 2017-01-22 12:57:25 +01:00
Enno Rehling 7b55a57610 remove sqlite3 code and dependency 2017-01-22 12:51:32 +01:00
Enno Rehling 2c6ae9baef remove ERESSEA keyword from "bad password" message. 2017-01-22 12:43:48 +01:00
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