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

8679 Commits

Author SHA1 Message Date
Enno Rehling 822292c99a do not seed factions when creating islands with 'B'. 2017-07-27 16:16:54 +02:00
Enno Rehling 475c9f8cd8 seed a single faction from newplayers file. 2017-07-23 15:18:16 +02:00
Enno Rehling bdb30f1b82 first unit should get money and wood 2017-07-23 15:18:16 +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 ea457ca292 Merge pull request #711 from ennorehling/develop 
BUG 2331: also allow GIVE PERSON for the "undead" race
 2017-07-22 12:39:24 +02:00
Enno Rehling 3445e376e0 allow GIVE PERSON for undead race, too 2017-07-22 12:36:01 +02:00
Enno Rehling 572073f084 Merge remote-tracking branch 'upstream/develop' into develop 2017-07-22 12:31:22 +02:00
Enno Rehling 485019ce7e Merge pull request #710 from ennorehling/feature/2337-lighthouse-capacity 
BUG 2337: new lighthouse capacity calculation
 2017-07-22 07:56:49 +02:00
Enno Rehling aa2c13cffa gcc ist pingelig 2017-07-17 17:22:01 +02:00
Enno Rehling 233ea9dce4 BUG 2337: lighthouse capacity is # of units, not people. 2017-07-17 17:08:27 +02:00
Enno Rehling f8de1bf29e remove default values from XML (capacity=1) 2017-07-17 16:11:00 +02:00
Enno Rehling 5f463fbc4c btype->cons->maxsize does not matter if it's not a multi-stage building (castle, watch). 2017-07-17 14:06:25 +02:00
Enno Rehling 3c2754071d this test fails when btype->maxsize isn't used as a limit for building. 2017-07-17 14:01:08 +02:00
Enno Rehling 0bf003cdc4 add a test for btype.maxsize 2017-07-17 13:37:40 +02:00
Enno Rehling 64783d0e96 Merge pull request #709 from ennorehling/develop 
code cleanup: ECF_ flags removed and renamed.
 2017-07-17 12:40:44 +02:00
Enno Rehling b79db40f41 retrofit a test for buildingcapacity. 2017-07-17 12:39:41 +02:00
Enno Rehling eb1dc731cb consistently rename ec_flags constants (ECF_*) 2017-07-17 12:33:55 +02:00
Enno Rehling f934e4d5e3 remove unused ECF_KEEP_ITEM flag. 2017-07-17 12:31:47 +02:00
Enno Rehling ed4cb5324b Merge branch 'master' into develop 2017-07-16 11:24:38 +02:00
Enno Rehling b6f40148d7 off-by-one in NMR count 2017-07-16 11:24:16 +02:00
Enno Rehling 1f996f1b04 Merge remote-tracking branch 'upstream/develop' into develop 2017-07-15 12:46:16 +02:00
Enno Rehling 427d32c9d2 Merge pull request #708 from ennorehling/2331-undead-give 
BUG 2331: allow GIVE for undead.
 2017-07-15 12:44:47 +02:00
Enno Rehling 8344f41a70 allow GIVE for juju, ghast, skelord, too. 
make the tests nicer.
 2017-07-15 12:28:26 +02:00
Enno Rehling a0afa1f225 Merge pull request #707 from ennorehling/develop 
BUG 2256: kill the FFL_NEWID flag
 2017-07-09 15:50:07 +02:00
Enno Rehling de9d73bd5a fix test to match new flag values 2017-07-09 15:43:37 +02:00
Enno Rehling 518db87015 eliminate unused message 2017-07-09 15:41:11 +02:00
Enno Rehling 72a1877d26 Merge pull request #706 from ennorehling/2331-undead-give 
BUG 2331: allow GIVE PERSON for undead units
 2017-07-09 15:38:04 +02:00
Enno Rehling 6d1f4f06de BUG 2256: kill the FFL_NEWID flag 2017-07-09 15:37:42 +02:00
Enno Rehling 2107a84b0d also allow GIVE for ghouls and skeletons. 2017-07-09 15:25:33 +02:00
Enno Rehling 60efb12d70 Zombies koennen Personen gebn 2017-07-09 13:37:46 +02:00
Enno Rehling d717c6a43a Merge pull request #705 from ennorehling/develop 
bring develop branch up to date.
 2017-07-09 10:50:45 +02:00
Enno Rehling de1e0ae916 fix indentation 2017-07-09 10:43:53 +02:00
Enno Rehling 6fa471bb97 merge conflicts from the 13.2.3 release 2017-07-09 10:42:10 +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 beecc0e323 BUG 2343: fix clone_men (hitpoints), add test. 2017-06-25 14:07:50 +02:00
Enno Rehling 2dab88b118 cmistake no return value, no mistakes 2017-06-25 08:21:14 +02:00
Enno Rehling efd826c0a2 Merge remote-tracking branch 'upstream/develop' into develop 2017-06-24 22:10:39 +02:00
Enno Rehling 0593378df0 Merge branch 'master' into develop 2017-06-24 22:10: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 5f2d1347ae Merge remote-tracking branch 'upstream/develop' into develop 2017-06-24 14:51:48 +02:00
Enno Rehling 0ebb9dfcce Merge pull request #702 from ennorehling/2342-plant 
BUG 2342: PFLANZE vs ZUECHTE Trennung
 2017-06-24 13:47:52 +02:00
Enno Rehling 1273abb967 Getrennte Befehle fuer PFLANZE und ZUECHTE 2017-06-24 13:36:18 +02:00
Enno Rehling 60c939289c Merge pull request #701 from ennorehling/develop 
merge hotfixes back into develop
 2017-06-18 22:12:39 +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