Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
5029 commits 10 branches 0 tags 41 MiB
Commit graph

698 commits

Author SHA1 Message Date
Enno Rehling
595dc35fb0 bugfix: monster races that cannot learn skills, will not try to study. 
This fixes https://bugs.eressea.de/view.php?id=2054
 2014-12-14 15:59:20 +01:00
Enno Rehling
b506bed4d9 fix a crash in the parser for USE orders when no item name was given. 2014-12-14 12:56:36 +01:00
Enno Rehling
dca9d7e9cb bugfixe give_cmd (cannot give more persons than the unit has). 2014-12-14 06:02:08 +01:00
Enno Rehling
4ac7258f96 Merge remote-tracking branch 'eressea/master' 2014-12-13 23:40:37 +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
968304db96 Merge pull request #72 from badgerman/master 
fix two crashes, and undead heroes
 2014-12-13 20:42:16 +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
a3099ed507 Merge pull request #71 from badgerman/module-rename 
Update wormholes to the module naming convention.
 2014-12-13 18:56:02 +01:00
Enno Rehling
3a1e4ab7f5 fix crash when a GIVE order has no arguments. 2014-12-13 18:40:15 +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
522633a2de Update wormholes to the module naming convention. 
- register = called before game is loaded
- init = called after game is loaded
- update = called after the turn, before reports are written
 2014-12-13 16:43:35 +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
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
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
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
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
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
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
1a1ffd06b0 build number update 2014-12-11 11:14:54 +01: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
3324ced2b1 Print the full version number in the CR. 2014-12-11 10:06:28 +01:00
Enno Rehling
237f055237 Print the full version number in the CR. 2014-12-11 10:05:50 +01:00
Enno Rehling
a16f63fc06 PROMOTE earlier in the turn, after GIVE and before PAY. 
https://bugs.eressea.de/view.php?id=1659
 2014-12-11 09:58:23 +01:00
Enno Rehling
ef415c66d0 Fix GIVE 0 behavior on oceans. 2014-12-11 08:51:03 +01:00
Enno Rehling
215136465b refactoring: getunitpeasants is an awful global hack, and I am pushing it out of give_men so I can eliminate it more easily. 2014-12-10 23:05:29 +01:00
Enno Rehling
f1662077c3 test giving too many and too few units. 
start moving give-to-peasants logic into its own function.
 2014-12-10 22:35:35 +01:00
Enno Rehling
33a5e0aa9d test giving men to other faction. 
refactor give_men to return a message.
major milestone reached: 200 unit tests.
 2014-12-10 21:17:00 +01:00
Enno Rehling
2a61dc4d11 prepare for give_men refactoring by writing some basic tests. 2014-12-10 20:44:33 +01:00
Enno Rehling
1024dd5c81 Refactoring morale into a separate module. 
Not all of it yet, because it is inconveniently part of kernel/region.
 2014-12-10 19:04:02 +01:00
Enno Rehling
01877f5169 cleanup, fix a TODO, eliminate dead code. 2014-12-10 09:39:11 +01:00
Enno Rehling
0c54c7e32d always nice to eliminate a few TODO's and kill some bitrot. 2014-12-09 23:27:05 +01:00
Enno Rehling
188e003f7c retrofit tests for alliances. 2014-12-09 14:43:11 +01:00