Enno Rehling
|
386588083c
|
add a script to pull a branch and update submodules
|
2014-12-12 13:45:50 +01:00 |
Enno Rehling
|
e1d5033b76
|
make tests more valgrind-friendly by not leaking memory
|
2014-12-12 11:13:25 +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
|
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 |
Enno Rehling
|
2c077c25e8
|
space savings: update data files, remove names from NPC units where their name is their race.
|
2014-12-09 07:44:26 +01:00 |
Enno Rehling
|
0fead39b41
|
added a function that sets a monster's name to NULL if it is the name of its race.
deprecate old rc_name function (renamed to rc_name_s) because it used a static return string.
|
2014-12-09 07:20:36 +01:00 |
Enno Rehling
|
bde56aa1f8
|
eliminate unused variables, fix CI build.
|
2014-12-09 06:46:45 +01:00 |
Enno Rehling
|
9394c4324e
|
units without a name will use their race as a default name.
|
2014-12-09 06:45:21 +01:00 |
Enno Rehling
|
3428f40f81
|
load inifile in main, it is only used by the server.
this should fix the broken CI build.
|
2014-12-09 06:01:10 +01:00 |
Enno Rehling
|
b551edbdb3
|
refactoring: moving unitname to unit.c.
also removing static-string some cruft from config.c.
|
2014-12-09 05:55:16 +01:00 |
Enno Rehling
|
669712f04f
|
rename race_ to _race, to follow the style guide.
|
2014-12-08 22:06:05 +01:00 |
Enno Rehling
|
7bf395e7fb
|
Merge pull request #59 from badgerman/master
report volcano outbreaks in affected regions.
|
2014-12-08 21:31:12 +01:00 |
Enno Rehling
|
b30de914aa
|
report volcano outbreaks in affected regions.
https://bugs.eressea.de/view.php?id=2049
|
2014-12-08 21:19:18 +01:00 |
Enno Rehling
|
87eb2061f8
|
fix permissions on build script
|
2014-12-08 20:11:10 +01:00 |
Enno Rehling
|
06d5175030
|
add travis build script to branch
|
2014-12-08 20:03:04 +01:00 |
Enno Rehling
|
c0460197b1
|
add travis configuration to branch
|
2014-12-08 19:37:02 +01:00 |
Enno Rehling
|
7d5280196a
|
prevent an error when empty units get zombified to protect magic item loss
|
2014-12-07 11:14:41 +01:00 |
Enno Rehling
|
3dd3761acd
|
prevent an invalid assert when undead heroes are magical
|
2014-12-07 11:14:14 +01:00 |
Enno Rehling
|
66f733e105
|
Merge pull request #58 from badgerman/master
Accepting Don's changes to the setup script, adding tests.
|
2014-11-26 18:38:03 +01:00 |
Enno Rehling
|
6438d6807e
|
accepting Don's changes to the setup script.
back-filling test for faction.get and get_faction.
|
2014-11-26 18:37:07 +01:00 |
Enno Rehling
|
8553d9e610
|
Merge pull request #57 from badgerman/master
fix missing get_faction binding, add faction.get()
|
2014-11-26 17:48:46 +01:00 |
Enno Rehling
|
4d329b8bf8
|
fix missing get_faction binding, add faction.get()
|
2014-11-26 17:44:02 +01:00 |