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

5454 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
CTD
1cce4927a0 Bauern in leeren Regionen 
Eine recht einfache Funktion die ein paar zusätzliche Bauern in leeren
Regionen erschafft.
 2014-12-12 15:50:02 +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
Enno Rehling
252d7d697b Merge branch 'master' of github.com:eressea/server 2014-12-11 09:06:43 +00: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
eca081e093 fix reading old data files that had the backup password in them (storage submodule update). 2014-12-11 09:24:59 +01:00
Enno Rehling
9c6b7af27f fix a bug in the eternath quest gates (re-running old turn sometimes needs this). 2014-12-11 09:15:19 +01:00
Enno Rehling
ef415c66d0 Fix GIVE 0 behavior on oceans. 2014-12-11 08:51:03 +01:00
Enno Rehling
ee4eb61811 Merge branch 'master' of github.com:badgerman/eressea 2014-12-10 22:09:45 +00: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
ba23a8bb06 Merge pull request #61 from badgerman/master 
miscellaneous refactoring
 2014-12-10 20:14:25 +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
Enno Rehling
9b56ccf53c cleaning up some alliance code, killing bitrot from WDW. 2014-12-09 14:14:35 +01:00
Enno Rehling
4b9d4ac1cb Merge pull request #60 from badgerman/master 
NPC units that use their race as the name (Hirntöter, Seeschalnge) can use NULL as their name.
 2014-12-09 08:04:16 +01:00