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

1033 Commits

Author SHA1 Message Date
Enno Rehling ae8c448698 do not remove new players for missing their first turn. 2015-07-05 14:07:59 +02:00
Enno Rehling 59745c7ed0 parentheses to fix operator precedence. 2015-07-03 16:13:24 +02:00
Enno Rehling b2d981e577 improved tests for DESTROY, fix destroy-after-attack 2015-07-03 13:08:06 +02:00
Enno Rehling 13ed70f2fd Merge pull request #245 from badgerman/feature/bug-1950-flee-and-guard 
Bug 1950: fleeing units can guard the same turn.
 2015-07-02 18:12:03 +02:00
Enno Rehling a2376290d8 Bug 1950: fleeing units can guard the same turn. 
checking for UFL_FLEEING in can_start_guarding should make that impossible now.
https://bugs.eressea.de/view.php?id=1950
 2015-07-02 17:52:22 +02:00
Enno Rehling 98c161869f Merge pull request #244 from badgerman/develop 
Bug 1861 (MAXTEACHERS) and misc fixes
 2015-07-02 16:32:25 +02:00
Enno Rehling f054ea114b Bug 1861: increase MAXTEACHERS, warn if it is still too small. 2015-07-02 16:23:38 +02:00
Enno Rehling bfd93c68b2 remove bogus assert 2015-07-02 15:44:21 +02:00
Enno Rehling a975073c0d fix an issue when reading pre-spellbook datafiles for E3. 2015-07-02 14:39:13 +02:00
Enno Rehling 31ca0ce052 fix a parser crash in the USE command. 2015-07-02 13:42:15 +02:00
Enno Rehling 37eb189cd0 Merge pull request #242 from badgerman/feature/bug-2080-move-after-destroy 
bug 2080: long actions after DESTROY
 2015-07-02 11:58:12 +02:00
Enno Rehling fc2b8f3471 bug 2080: long actions after DESTROY 
https://bugs.eressea.de/view.php?id=2080
we forgot to set the flags. also added a test for the future.
 2015-07-02 11:42:18 +02:00
Enno Rehling 78857d8aa3 Merge pull request #240 from badgerman/feature/bug-2069-familiar-races 
bug 2069: familiar races
 2015-07-02 11:23:25 +02:00
Enno Rehling b53d01eb18 Bug 1890: monsters do not respect the rules when giving excess weight to peasants. 
https://bugs.eressea.de/view.php?id=1890
fixed by creating a give order instead of calling give_item directly.
 2015-07-02 11:08:38 +02:00
Enno Rehling 414f6d3210 bug 2069: not all E3 magic schools have a familiar. 
https://bugs.eressea.de/view.php?id=2069
quick fix: defaulting all additional schools to the illaun familiar.
 2015-07-02 09:49:51 +02:00
Enno Rehling 15e9c5962c merge feature/test-cleanup 
removing old test files
merging old tests into current system
fixing some internal bugs (i.e. adjust_coordinates)
 2015-07-01 21:24:44 +02:00
Enno Rehling 0ee76ea8dd Bug 2113: player-owned dragons did not get movement bonuses. 
https://bugs.eressea.de/view.php?id=2113
 2015-06-26 20:12:01 +02:00
Enno Rehling 94ec39d7bb Bug 2114: broken army listing during combat. 
https://bugs.eressea.de/view.php?id=2114
 2015-06-26 14:44:28 +02:00
Enno Rehling 3ba2b3d4d7 indentation fixes (tab->spaces) 2015-06-26 14:31:21 +02:00
Enno Rehling 9b42824a5e Bug 2112: volcano stops smoking after it has erupted. 
https://bugs.eressea.de/view.php?id=2112
 2015-06-26 14:26:42 +02:00
Enno Rehling 6a42b6231e Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2015-06-21 18:32:10 +02:00
Enno Rehling a085442b8f eliminate unused variable. 2015-06-21 17:54:39 +02:00
Enno Rehling 04bf7153f0 remove a faction from its alliance when it is dead. 2015-06-21 17:49:22 +02:00
Enno Rehling 659aa6c973 after combat, eject enemies only 2015-06-20 14:28:16 +02:00
Enno Rehling 9b7a4e813b functional test for forced leave configuration. 
functional test for forced leave after combat.
functional test for MAKE TEMP.
error handling for Lua function building.create().
reduce some errors to warnings.
initialize race.battle_flags correctly (when not created through XML).
re-initialize processor in case config has changed.
handle missing translation of combat status, with error message.
 2015-06-19 13:17:01 +02:00
Enno Rehling e7bffb7533 implement post-combat forced leave from ship/building 2015-06-19 07:53:11 +02:00
Enno Rehling e6b3a6da65 suppress valgrind warning form issue #227 2015-06-17 07:54:56 +02:00
Enno Rehling 272653f8ba fixing sea serpents with empty names, again. https://bugs.eressea.de/view.php?id=2057 2015-06-12 18:05:56 +02:00
Enno Rehling 4e33e59d64 more lua_pushinteger conversion for lua 5.3 2015-06-08 21:19:17 +02:00
Enno Rehling 84f8a9f746 calculate simple default scores for items that do not have one defined in XML. 2015-06-08 21:15:07 +02:00
Enno Rehling 2967cd59cf replace pushnumber with pushinteger where applicable (prep for Lua 5.3). 
also kill an unreferenced string.
 2015-06-08 20:53:40 +02:00
Enno Rehling 872721dc0f Merge branch 'master' of github.com:eressea/server 2015-06-08 09:46:55 +02:00
Enno Rehling 4a31bea3b9 increase build number, new version installed 2015-06-08 09:46:07 +02:00
Enno Rehling 563a08de97 Merge branch 'develop' of github.com:eressea/server into develop 2015-06-08 09:44:04 +02:00
Enno Rehling 266b019928 Merge branch 'hotfix/bug-2109-give-unit' of https://github.com/badgerman/eressea into badgerman-hotfix/bug-2109-give-unit 
Conflicts:
	scripts/eressea/xmlconf.lua
 2015-06-08 09:43:36 +02:00
Enno Rehling 12946615e5 Bugfix 2109: Einheiten lassen sich nicht mehr zwischen Parteien übergeben 
https://bugs.eressea.de/view.php?id=2109
Wenn max_transfers < 0 war, wurde das nur in give_men richtig interpretiert, aber nicht in give_unit.
 2015-06-08 09:06:20 +02:00
Enno Rehling 0dd02dbf72 add a test for give_unit between two allied factions. 2015-06-08 08:57:05 +02:00
Enno Rehling 59ddbf9f11 fix broken merge conflict 2015-06-08 08:52:24 +02:00
Enno Rehling 29753985f7 Merge branch 'master' into release-3-5 
Conflicts:
	src/laws.test.c
 2015-06-08 08:50:18 +02:00
Enno Rehling 6e9f889e77 Merge branch 'master' of github.com:eressea/server 
Conflicts:
	src/laws.test.c
 2015-06-08 08:47:36 +02:00
Enno Rehling 0de5d698de Fix the 'B' island generation to use the newfactions file, for use by new GMs. 
configurable island size.
 2015-06-02 15:29:21 +02:00
Enno Rehling c90496e60b Merge pull request #217 from badgerman/develop 
enable clang warning for tautological comparisons
 2015-06-02 00:27:04 +02:00
Enno Rehling 70967fc041 Merge pull request #216 from badgerman/feature/issue-198 
issue #198: gmtool makes invalid demand
 2015-06-01 23:39:41 +02:00
Enno Rehling 6895195659 gmtool makes invalid regions (github issue #198). 
forgot to null a pointer after freeing it.
 2015-06-01 19:56:53 +02:00
Enno Rehling 80deef30b0 additional clang warning for tautological comparisons. 
added to catch a /Wall VS warning in Travis builds.
 2015-06-01 08:04:46 +02:00
Enno Rehling 88be8f670d Merge pull request #215 from badgerman/stm2-cursefix2 
testing curses with memstream
 2015-05-31 11:30:44 +02:00
Enno Rehling 13a358005f fix memstream-based tests, new storage submodule. 2015-05-31 11:03:44 +02:00
Enno Rehling 69821b2a32 cleanup battle.h header 
removed some unreferenced functions from battle.h, made them static in battle.c
 2015-05-30 17:29:01 +02:00
Enno Rehling 618902f723 eliminate Visual C++ warning about pointless range check 2015-05-27 22:44:12 +02:00
Enno Rehling e954b210d4 Merge remote-tracking branch 'upstream/develop' into develop 2015-05-24 16:25:10 +02:00