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

8816 Commits

Author SHA1 Message Date
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
Enno Rehling 3ceeb54006 Merge branch 'master' into develop 2017-06-18 22:05:20 +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 69ef2c7ce7 Merge branch 'master' into develop 
Conflicts:
	src/magic.c
 2017-06-18 01:11:40 +02:00
Enno Rehling 843fbbc5f0 Merge remote-tracking branch 'upstream/master' 2017-06-18 01:10:57 +02:00
Enno Rehling 802dfbe124 Merge remote-tracking branch 'upstream/develop' into develop 2017-06-18 01:10:35 +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