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

8417 Commits

Author SHA1 Message Date
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
Enno Rehling eed93b7470 BUG 2334 and 2339: fix script update and init calls 
Ponnuki and Portals scripts are working.
Ponnuki may still attack? More testing required.
 2017-06-18 12:23:19 +02:00
Enno Rehling 7c5427d4cc Merge pull request #699 from ennorehling/master 
BUG 2322, 2332, 2333
 2017-06-11 20:51:26 +02:00
Enno Rehling 3ec1476da2 improve the mailcmd test 2017-06-11 17:13:31 +02:00
Enno Rehling f6ba5b6a53 BUG 2333 NMR-Anzahl im WB falsch 
https://bugs.eressea.de/view.php?id=2333
 2017-06-11 17:06:13 +02:00
Enno Rehling bcf103f581 fix raindance_effect message in E2 2017-06-11 15:17:04 +02:00
Enno Rehling 2c9c4c23f0 convert warning to debug output 2017-06-11 14:47:33 +02:00
Enno Rehling 025a04a5e9 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	scripts/tests/common.lua
 2017-05-28 12:47:54 +02:00
Enno Rehling b266509746 Einheitenlimit anheben (3000 und 500) 2017-05-27 20:07:36 +02:00
Enno Rehling 9e213d3bcd minor optimization and using fraction code 2017-05-26 19:05:46 +02:00
Enno Rehling a3ebddeae4 update cron to check environment for switches 
use server/bin instead of ~/bin
 2017-05-26 13:52:55 +02:00
Enno Rehling 4efe6f6a71 Merge pull request #696 from ennorehling/develop 
BUG 2328: absolutely final changes for 3.12
 2017-05-26 06:35:22 +02:00
Enno Rehling b0b9eec05d Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-05-26 06:27:31 +02:00
Enno Rehling 8e15487a1e BUG 2328: wrong calendar seasons. 2017-05-26 06:27:25 +02:00
Enno Rehling a3f655f322 fix bogus warnings 2017-05-22 21:35:25 +02:00
Enno Rehling 37aded9b1d remove unused function 2017-05-21 16:12:13 +02:00
Enno Rehling 9525c8790c Merge branch 'stm2-bug2211_addendum' into develop 2017-05-21 14:53:14 +02:00
Enno Rehling bc0726da18 remove duplicate test 2017-05-21 14:52:46 +02:00
Enno Rehling c8e777c6d4 Merge branch 'bug2211_addendum' of https://github.com/stm2/server into stm2-bug2211_addendum 2017-05-21 14:51:13 +02:00
Enno Rehling efb0501b20 additional testing 2017-05-21 13:10:53 +02:00
Enno Rehling 7b0ec466fa only enable certain pragmas for MSVC 2015 and later 2017-05-21 13:09:54 +02:00
Enno Rehling f0fc37bd69 Merge pull request #693 from ennorehling/develop 
callback refactoring
 2017-05-12 22:22:43 +02:00
Enno Rehling 1bc23beccc remove btypr->name funcptr and btype->attribs. 
why weren't these already gone?
 2017-05-12 22:12:22 +02:00
Enno Rehling 11d9afc62e BUG 2322: Test and bugfix for castle names. 2017-05-12 22:05:14 +02:00
Enno Rehling 34d51d9e6c BUG 2322: Test and bugfix for castle names. 2017-05-12 22:03:27 +02:00
Enno Rehling c7f8b16c07 remove unused r->land->items list. 2017-05-09 18:49:10 +02:00