Commit Graph

5019 Commits

Author SHA1 Message Date
Enno Rehling dd87907566 bugfix: making clones help with upkeep.
https://bugs.eressea.de/view.php?id=1560
2014-12-13 23:37:42 +01:00
Enno Rehling 9ac90dd6a5 bugfix: USE snowman did not check that the unit actually owned a snowman, causing a unit to have negative snowmen in turn 629 (exploit). 2014-12-13 23:20:10 +01:00
Enno Rehling 455b3dc90e ignore obsolete "lua" attributes in ancient data files.
fix a small bug in the mechanism for reading deprecated attrib_types.
2014-12-13 22:08:57 +01:00
Enno Rehling 1ae44db7ca Bugfix: Untote Helden bekamen keine Beute.
https://bugs.eressea.de/view.php?id=1962
2014-12-13 20:16:25 +01:00
Enno Rehling 3a1e4ab7f5 fix crash when a GIVE order has no arguments. 2014-12-13 18:40:15 +01:00
Enno Rehling a12958dac0 Merge pull request #70 from badgerman/master
fix broken chaoscount attributes loading
2014-12-13 18:23:45 +01:00
Enno Rehling f8136530ef fix the loading of chaoscount attributes that I broke in the refactoring. 2014-12-13 17:31:55 +01:00
Enno Rehling a2c98778fd Merge pull request #69 from badgerman/chaos-module
Moving the E2 chaos-region code into a separate module
2014-12-13 15:54:13 +01:00
Enno Rehling 5751a9b3a9 Merge pull request #66 from badgerman/getunit-refactor
refactoring getunit
2014-12-13 13:26:32 +01:00
Enno Rehling fcffb3d8e1 Merge pull request #67 from badgerman/version-cleanup
eliminating support for old datafile versions, prior to binary formats
2014-12-13 13:26:23 +01:00
Enno Rehling 0e7d0cc91d Merge pull request #68 from badgerman/remove-dungeons
Remove the obsolete dungeons module
2014-12-13 13:26:04 +01:00
Enno Rehling c4b898e968 remove some inactive #define macros and the code that goes with them.
mostly rules that were experimental, but have made it into common use (not worth the effort of making them configurable).
2014-12-13 11:53:16 +01:00
Enno Rehling 2da1d11277 move chaos to a separate module (it is an old E2 feature) 2014-12-13 11:44:14 +01:00
Enno Rehling 1c96c626b6 merge failure, try again. 2014-12-13 00:13:08 +01:00
Enno Rehling a8849f2b91 remove the obsolete dungeons module.
I don't think this has ever been used, and it has fallen victim to entropy since it was first written. good riddance!
2014-12-13 00:03:24 +01:00
Enno Rehling 0967ccaac6 remove even more obsolete datafile version support. 2014-12-12 23:00:30 +01:00
Enno Rehling d492487a5b remove support for versions prior to turn 572 (INTPAK_VERSION).
reading anything prior stopped working some time ago, let's not kid ourselves.
nobody needs to read those datafiles, they are more than 7 years old.
less code is better.
if access to these files is needed, check out an old version from source control.
2014-12-12 22:52:23 +01:00
Enno Rehling 3d24764e08 Merge remote-tracking branch 'eressea/master' 2014-12-12 22:49:20 +01:00
Enno Rehling 63f69ec1cf add the test coverage for getunit.
fix a bug where NULL was not returned when unit is in the wrong region.
2014-12-12 21:55:44 +01:00
Enno Rehling 98994f233d remove the deprecated getunit function.
fix the build, missing return value from give_control_cmd.
2014-12-12 21:06:47 +01:00
Enno Rehling 481275aef1 refactor: eliminate the getunitpeasants global variable.
bugfix: it was possible to uncover stealth units with GIVE CONTROL.
2014-12-12 20:53:39 +01:00
Enno Rehling c02b6b0d35 Merge branch 'version-3-3' 2014-12-12 18:15:24 +01:00
Enno Rehling 1a888b4c87 fix lockfile handling by the cron 2014-12-12 18:15:06 +01:00
Enno Rehling 3d0f8d0101 Merge remote-tracking branch 'eressea/master'
Conflicts:
	.travis.yml
	critbit
	src/buildno.h
	src/test_eressea.c
2014-12-12 17:28:20 +01:00
Enno Rehling ab71860224 Merge branch 'version-3-3'
Conflicts:
	src/build.h
	src/vortex.test.c
2014-12-12 17:24:00 +01:00
Enno Rehling b4e13b7cbd segmentation fault caused by free'ing battles twice 2014-12-12 17:21:04 +01:00
Enno Rehling 386588083c add a script to pull a branch and update submodules 2014-12-12 13:45:50 +01:00
Enno Rehling f7205251a3 add a script to pull a branch and update submodules 2014-12-12 13:45:17 +01:00
Enno Rehling 440d78596c Add missing keywords, fix disappearing units.
https://bugs.eressea.de/view.php?id=2051
. The orders PASSWORT, FAHRE, KÄMPFE were not recognized (new imperative syntax).
. Added backwards compatibility for FIGHT (now COMBAT).

https://bugs.eressea.de/view.php?id=2050
. units were always giving away ALL persons, not the number in their GIVE command.
2014-12-12 13:32:21 +01:00
Enno Rehling 78f4dfac1d Rewrite the test framwework to report individual suites.
Stop leaking CuTestSuite objects.
2014-12-12 12:19:21 +01:00
Enno Rehling 9334677d81 make tests more valgrind-friendly by not leaking memory 2014-12-12 11:32:12 +01:00
Enno Rehling cd70b8684d fix escape_string mmeory corruption error.
fix a number of small stuff that happens when loading very old data files (like 572).
2014-12-12 11:28:37 +01:00
Enno Rehling e1d5033b76 make tests more valgrind-friendly by not leaking memory 2014-12-12 11:13:25 +01:00
Enno Rehling 4c5f4c5e20 test compiling on OSX 2014-12-12 00:36:33 +01:00
Enno Rehling e48b60a308 fixing my local critbit checkout. 2014-12-11 23:37:59 +01:00
Enno Rehling d7c2fc2b04 remove the R_UNIT resource.
https://bugs.eressea.de/view.php?id=1945
assert that only items can be reserved.
2014-12-11 23:24:00 +01:00
Enno Rehling 20c0dfbb47 fix null-pointer crash (EMAIL order without arguments) 2014-12-11 23:23:11 +01:00
Enno Rehling aa01d9f21a fix clone effect message. 2014-12-11 23:22:35 +01:00
Enno Rehling e9e29500bb fix extended merge problems 2014-12-11 13:10:02 +01:00
Enno Rehling 2a8a233c8b remove accidental build.h file 2014-12-11 13:04:09 +01:00
Enno Rehling cfc0972912 Merge branch 'version-3-3'
Conflicts:
	.travis.yml
	src/build.h
2014-12-11 13:03:31 +01:00
Enno Rehling 1864d1fc86 backup correctly after each turn 2014-12-11 13:02:20 +01:00
Enno Rehling e5d53769df lock files to prevent accidents.
preview will only run if the turn worked out.
cannot accidentally run in the game directory.
2014-12-11 12:19:31 +01:00
Enno Rehling 20234ca27a lock files to prevent accidents.
preview will only run if the turn worked out.
cannot accidentally run in the game directory.
2014-12-11 12:19:04 +01:00
Enno Rehling c76ff2b9c7 create link to an eressea.ini before runnign tests 2014-12-11 10:22:14 +00:00
Enno Rehling 1a1ffd06b0 build number update 2014-12-11 11:14:54 +01:00
Enno Rehling d91cf538cf Merge branch 'master' of github.com:eressea/server 2014-12-11 10:13:59 +00:00
Enno Rehling f7e9a2df09 build number update, because version 3.3 had a new release.
really though, build numbers need a different system.
2014-12-11 11:11:19 +01:00
Enno Rehling 01a5c1944a Merge pull request #63 from badgerman/version-3-3
Print the full version number in the CR.
2014-12-11 10:15:36 +01:00
Enno Rehling eb457a01ac Merge pull request #62 from badgerman/master
GIVE fixes.
2014-12-11 10:13:53 +01:00