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

5993 Commits

Author SHA1 Message Date
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 b7b20bdec6 fewer units for new players, two players per region 2015-06-26 14:19:36 +02:00
Enno Rehling 5b2538b72d increase build number 2015-06-21 18:32:57 +02:00
Enno Rehling 6a42b6231e Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2015-06-21 18:32:10 +02:00
Enno Rehling ecb2b9b3b3 Merge pull request #234 from badgerman/hotfix/issue-233-invalid-read 
invalid read, dead factions must leave their alliance
 2015-06-21 18:29:00 +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 7cf1062650 cmake changes from gruenbaer 2015-06-21 16:29:48 +02:00
Enno Rehling 6fa39da6f6 cmake submodule update 2015-06-21 16:27:35 +02:00
Enno Rehling 5667b6dc8c Merge branch 'develop' of github.com:eressea/server into develop 2015-06-21 16:24:46 +02:00
Enno Rehling d2037a5cd9 Merge pull request #232 from badgerman/develop 
after combat, eject enemies only
 2015-06-20 15:56:50 +02:00
Enno Rehling 659aa6c973 after combat, eject enemies only 2015-06-20 14:28:16 +02:00
Enno Rehling ca7c4804da Merge pull request #231 from badgerman/develop 
Revert "disable force_leave code, it is too surprising"
 2015-06-19 15:04:07 +02:00
Enno Rehling 9d1eac2f6a Merge pull request #230 from badgerman/feature-force-leave-postcombat 
force leave after combat
 2015-06-19 15:03:30 +02:00
Enno Rehling 5afd58faff Revert "disable force_leave code, it is too surprising" 
This reverts commit f27d60e1b2.
 2015-06-19 13:37:15 +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 75f87494d2 Merge pull request #229 from badgerman/develop 
disable force_leave code, it is too surprising
 2015-06-18 08:13:07 +02:00
Enno Rehling f27d60e1b2 disable force_leave code, it is too surprising 2015-06-18 00:01:11 +02:00
Enno Rehling 6e4c7c12d5 disable force_leave code, it is too surprising 2015-06-17 23:58:18 +02:00
Enno Rehling d541e8b1e3 Merge pull request #228 from badgerman/develop 
fix open github issues
 2015-06-17 14:25:28 +02:00
Enno Rehling b630c9ee45 oops. the name of the server is gruenbaer, not eressea 2015-06-17 08:07:47 +02:00
Enno Rehling 5257848648 do not install crontab, except on eresseaserver. fixes issue #226 2015-06-17 08:06:01 +02:00
Enno Rehling e6b3a6da65 suppress valgrind warning form issue #227 2015-06-17 07:54:56 +02:00
Enno Rehling 32bd8c4353 make preview script valgrind use suppression file, closing issue #154 2015-06-17 07:50:35 +02:00
Enno Rehling ff3fdb62cd enable valgrind suppressions for QA previews 2015-06-17 07:30:06 +02:00
Enno Rehling 4fa3f81baa Merge pull request #225 from badgerman/develop 
bug 2057: fixing sea serpents with empty names, again.
 2015-06-12 18:08:32 +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 6306ed754b Merge pull request #224 from badgerman/feature/lua-5-3 
travis build now runs a full turn
 2015-06-09 08:48:08 +02:00
Enno Rehling 8080adcd2b travis build now runs a full turn for acceptance. 
* new cmake module (lus/tolua changes).
* valgrind suppression for glibc strtod problems.
 2015-06-09 08:39:22 +02:00
Enno Rehling 8ecf51b057 cmake will use LD_LUA and LD_TOLUA environment variables to search 2015-06-08 22:23:07 +02:00
Enno Rehling d5aae430a6 Merge pull request #223 from badgerman/develop 
score module changes and lua 5.3 prep
 2015-06-08 21:22:38 +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 69a23d58c9 Merge pull request #222 from badgerman/feature/bug-xinclude-catalog 
libxml 1.9.x problem, pickier about catalogs
 2015-06-08 17:35:45 +02:00
Enno Rehling 3e48b9b966 libxml 1.9.x seems to be a bit pickier about how XML catalogs are written. 2015-06-08 16:51:41 +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 7a881885c3 Merge branch 'badgerman-hotfix/bug-2109-give-unit' into develop 2015-06-08 09:43:46 +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 5fb8748132 Merge pull request #220 from badgerman/hotfix/bug-2109-give-unit 
bug 2109 (GIVE UNIT limits)
 2015-06-08 09:41:10 +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 bafc7f8237 Merge branch 'release-3-5' 2015-06-08 08:50:51 +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 5cf02e35e1 Merge branch 'release-3-5' of github.com:eressea/server into release-3-5 2015-06-08 08:49:14 +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