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

8442 Commits

Author SHA1 Message Date
Enno Rehling fc4bde47f6 kill the old curses enum and oldcursename. 2017-08-21 20:48:00 +02:00
Enno Rehling 7985ebe511 replace ct_find calls with constants. 
reorder a lot of includes.
 2017-08-21 20:18:19 +02:00
Enno Rehling c99e92db20 kill curse cache logic, it was a bad idea. 
ct_find is almost never what we want to do.
 2017-08-21 19:43:35 +02:00
Enno Rehling 134ff982ba BUG 2358: Schiffbeschleunigung dauert laenger als eine Woche. 2017-08-20 19:07:52 +02:00
Enno Rehling 89d50e9b72 fix compile, wrong data version. 2017-08-18 21:05:26 +02:00
Enno Rehling e2578966e5 fix bad data caused by bug 2356 2017-08-18 21:02:23 +02:00
Enno Rehling dced8618dc Merge remote-tracking branch 'upstream/master' 2017-08-18 20:32:19 +02:00
Enno Rehling d13cd0d0df Merge pull request #721 from ennorehling/master 
BUG 2357: new players must be able to recruit
 2017-08-18 20:26:23 +02:00
Enno Rehling aa61860996 BUG 2357: make sure starting regions have enough recruits 2017-08-18 20:20:12 +02:00
Enno Rehling b8e755c023 Merge pull request #720 from ennorehling/hotfix/bug-2356-curse-flags 
BUG 2356: Mauern der Ewigkeit
 2017-08-18 19:54:05 +02:00
Enno Rehling 7a4a49160c unused variable 2017-08-18 19:48:34 +02:00
Enno Rehling c8b2ce7900 BUG 2356: fix curse read/write 
rename curse::flags to curse::mask, use c_flags.
fix some curse_type having CURSE_ISNEW fixed.
 2017-08-18 19:39:33 +02:00
Enno Rehling 293cb78de8 BUG 2356: add a failing test. 2017-08-18 19:36:17 +02:00
Enno Rehling b6dc3fd6f4 Merge remote-tracking branch 'upstream/master' 2017-08-16 21:50:26 +02:00
Enno Rehling a8e9da1c19 do not upgrade keys for later data versions 2017-08-16 21:48:04 +02:00
Enno Rehling 7f98fd9f22 Merge pull request #719 from ennorehling/master 
a_key conversion bugs
 2017-08-16 21:38:10 +02:00
Enno Rehling 6d050bb6c2 fix a_key attribute still being written. 
simplify (and slow down) key upgrades.
 2017-08-16 21:33:02 +02:00
Enno Rehling 2ba47a40d1 Merge remote-tracking branch 'upstream/master' 2017-08-16 20:48:39 +02:00
Enno Rehling 9d8e9cc00b at_keys is overflowing, add an assert to detect it 2017-08-16 20:48:03 +02:00
Enno Rehling aec994ec6f Merge pull request #718 from ennorehling/master 
fix bad test
 2017-08-11 18:34:55 +02:00
Enno Rehling 62d8024c49 fix dupe detection 2017-08-09 19:42:55 +02:00
Enno Rehling c4f7e36903 fix valgrind report in a test (bad rtype construction) 2017-08-09 19:39:29 +02:00
Enno Rehling bbeac66250 fix dupe detection 2017-08-09 19:18:45 +02:00
Enno Rehling 5b342f9b11 Merge pull request #717 from ennorehling/master 
gmtools
 2017-08-09 19:08:58 +02:00
Enno Rehling 1aa142d821 log warnings for duplicate new emails. 2017-08-09 19:04:49 +02:00
Enno Rehling c310249904 Merge pull request #716 from ennorehling/master 
gmtool improvements
 2017-08-07 19:07:23 +02:00
Enno Rehling 2aab736b59 try giving new factions a name 2017-08-07 18:58:39 +02:00
Enno Rehling aae1095c00 Merge remote-tracking branch 'upstream/master' 2017-08-07 18:47:05 +02:00
Enno Rehling c387e985b8 gmtool can clear regions 2017-08-07 18:38:10 +02:00
Enno Rehling e59ae05729 Merge branch 'master' of github.com:eressea/server 2017-08-07 18:37:33 +02:00
Enno Rehling 4675cf1d05 allow config to override first unit equipment 2017-07-30 14:05:33 +02:00
Enno Rehling 594cbc4a05 Neuer Email Body, mit Patreon Link. 2017-07-30 11:10:06 +02:00
Enno Rehling 133b49f087 Merge pull request #713 from ennorehling/master 
gmtool island building
 2017-07-27 16:48:06 +02:00
Enno Rehling 847e6f3e43 limit island size from configuration, deal with existing units. 2017-07-27 16:36:45 +02:00
Enno Rehling 822292c99a do not seed factions when creating islands with 'B'. 2017-07-27 16:16:54 +02:00
Enno Rehling cf2e7695e5 Merge remote-tracking branch 'upstream/master' 2017-07-23 10:09:57 +02:00
Enno Rehling 3151fe9f9b ignore comments in newfactions 2017-07-23 09:27:28 +02:00
Enno Rehling daca7b084d Merge pull request #712 from ennorehling/master 
GM tool improvement
 2017-07-23 09:21:37 +02:00
Enno Rehling a5d350fe3a seed a single faction from newplayers file. 2017-07-23 09:15:23 +02:00
Enno Rehling 12222c6562 first unit should get money and wood 2017-07-23 09:08:03 +02:00
Enno Rehling b6f40148d7 off-by-one in NMR count 2017-07-16 11:24:16 +02:00
Enno Rehling 2c356103e2 Merge pull request #704 from ennorehling/master 
Valenar crash: bad report interval when a faction has no units.
 2017-06-26 20:50:05 +02:00
Enno Rehling 7790ebd671 Valenar crash: bad report interval when a faction has no units. 2017-06-26 20:39:05 +02:00
Enno Rehling c856283aca Merge pull request #703 from ennorehling/master 
BUG 2344: GIB KOMMANDO und ! Präfix
 2017-06-24 22:08:14 +02:00
Enno Rehling 1e78414562 BUG 2344: GIB KOMMANDO und ! Präfix 2017-06-24 22:02:07 +02:00
Enno Rehling 82205f5ce3 Merge pull request #700 from ennorehling/master 
Version 3.12.2 - regression fixes
 2017-06-18 22:07:01 +02:00
Enno Rehling 2737f39029 Merge branch 'master' of https://github.com/ennorehling/eressea.git 2017-06-18 21:59:10 +02:00
Enno Rehling 75ae22e5b6 BUG 2340: endloser Sturmelementar 
CURSE_NOAGE is a weird thing.
 2017-06-18 21:48:47 +02:00
Enno Rehling 147af9ecda Merge remote-tracking branch 'upstream/master' 2017-06-18 16:44:58 +02:00
Enno Rehling 8178f3f1e6 BUG 2334: Nochmal Ponnuki 
Monsters cannot attack or guard when they are fleeing
 2017-06-18 14:20:01 +02:00