Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
8008 commits 10 branches 0 tags 41 MiB
Commit graph

8008 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
d42f1767ff add a test for teach-messages. 
vheck that they are generated for students and teachers.
 2017-01-26 17:57:21 +01:00
Enno Rehling
a4badc0a75 remove quicklist shim, use selist everywhere 2017-01-26 17:41:21 +01:00
Enno Rehling
2ace44d385 fix duplicate cutest library conflict and crash 2017-01-26 16:05:44 +01:00
Enno Rehling
c72b050a42 WIP: quicklist->selist shim can compile and link, but tests crash 2017-01-26 10:53:52 +01:00
Enno Rehling
1382583109 fix compilation (but not linking). 2017-01-26 10:15:26 +01:00
Enno Rehling
d9213c8f25 WIP: still converting to clibs/selist 2017-01-26 10:12:12 +01:00
Enno Rehling
955997d58c WIP: use latest clibs with selist. 
adding a transitional quicklist.c module to reduce work.
 2017-01-26 06:00:08 +01:00
Enno Rehling
bcd5d4584b Merge pull request #641 from ennorehling/develop 
cleanup
 2017-01-25 21:31:14 +01:00
Enno Rehling
78e43bd62e hack compress to not use /home/enno/bin script 2017-01-25 21:26:30 +01:00
Enno Rehling
fb653d6dcf Merge branch 'bug2274' into develop 2017-01-25 21:15:35 +01:00
Enno Rehling
f921a14ab6 Merge pull request #640 from ennorehling/bug2274 
BUG 2274: Bestimmung des Regionsbesitz bei BENENNE
 2017-01-25 21:14:13 +01:00
Enno Rehling
30fc6f3e91 BESCHREIBE REGION ist jeder Einheit des Regionsbesitzers erlaubt 2017-01-25 21:03:08 +01:00
Enno Rehling
77cbd04cfa BENENNE REGION ist jeder Einheit des Regionsbesitzers erlaubt 2017-01-25 20:57:54 +01:00
Enno Rehling
b170a30faa add a function to compare size of occupied castles 2017-01-25 18:17:19 +01:00
Enno Rehling
d4e8a43048 Merge pull request #639 from ennorehling/develop 
BUG 2273: runtests.bat fails when config is auto-loaded.
 2017-01-24 11:52:32 +01:00
Enno Rehling
404ac546fa BUG 2273: runtests.bat fails when config is auto-loaded. 
run rules tests with the correct configuration, ignore .ini file
setting.
still not enabling auto-load again, use custom.lua instead.
 2017-01-24 10:36:27 +01:00
Enno Rehling
9cea70afe8 Merge pull request #638 from ennorehling/develop 
disable config.lua auto-laod
 2017-01-23 21:40:57 +01:00
Enno Rehling
99274e3ab1 make runtests.bat not crash. 
disable auto-load of config.lua (sob).
free messages and config in config.reset().
 2017-01-23 21:35:01 +01:00
Enno Rehling
6d9d920f81 fix issue #477 (intermittent volcano) 2017-01-23 11:45:05 +01:00
Enno Rehling
2185e7d5e5 Merge remote-tracking branch 'upstream/develop' into develop 2017-01-23 11:44:05 +01:00
Enno Rehling
bce2afac12 Merge pull request #636 from ennorehling/develop 
issue #633 & #477
 2017-01-23 11:42:31 +01:00
Enno Rehling
646e6f7197 refactor and annotate volcano outbreaks. 
add configuration options to control volcano behavior.
 2017-01-23 11:21:48 +01:00
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