Enno Rehling
|
0af5df470b
|
managed to commit some broken tests, and travis let them pass. something is wrong with the CI tests.
|
2015-08-07 18:30:02 +02:00 |
Enno Rehling
|
398579c293
|
remove duplication, fix a stray blank space in the NR.
|
2015-08-07 16:17:11 +02:00 |
Enno Rehling
|
816243d2d7
|
magicians can always identify their own curse-effects.
magic-resistance on a building is always visible to anybody, just like it is on units.
|
2015-08-07 15:52:10 +02:00 |
Enno Rehling
|
00423a746b
|
clarify the good/bad dreams tests
|
2015-08-07 13:26:41 +02:00 |
Enno Rehling
|
12a2a1f412
|
get_captain is wrong, the rules say the captain is the FIRST unit in the ship, which I believe means ship_owner, not best skill.
clean up shipspeed tests a little (WIP, missing edge cases).
ignore some temporary files.
|
2015-08-07 13:07:45 +02:00 |
Enno Rehling
|
3bfc05c3b0
|
test bonus for new ship-speed rules (WIP).
|
2015-08-07 13:03:19 +02:00 |
Enno Rehling
|
b72f48c044
|
enhanced ship speed for selected ships (currently none).
|
2015-08-07 12:51:20 +02:00 |
Enno Rehling
|
c322fbffd5
|
rename ship_sailors to crew_skill, it's more descriptive
|
2015-08-07 12:46:32 +02:00 |
Enno Rehling
|
afbc4c816b
|
refactoring ship speed, extract total skills of sailors into a function.
|
2015-08-07 12:43:18 +02:00 |
Enno Rehling
|
bfdef37808
|
fix the test and the formula for damaged ships' speeds.
|
2015-08-07 12:03:33 +02:00 |
Enno Rehling
|
8636aabe8a
|
tests for existing shipspeed features, failing ship for ship-damage.
|
2015-08-07 11:50:49 +02:00 |
Enno Rehling
|
b3a8a95a24
|
cherry-picking ship tests from range_max code
|
2015-08-07 11:48:46 +02:00 |
Enno Rehling
|
04db291c8b
|
disable random study in test to make it not intermittent
|
2015-08-06 20:48:14 +02:00 |
Enno Rehling
|
c0a760a645
|
Merge branch 'develop' of github.com:eressea/server into develop
|
2015-08-06 19:54:51 +02:00 |
Enno Rehling
|
6c8300a47e
|
Merge branch 'feature/bug-1588-magicpower-limit' of https://github.com/ennorehling/eressea into ennorehling-feature/bug-1588-magicpower-limit
Conflicts:
scripts/tests/e2/init.lua
src/battle.c
src/bind_unit.c
src/kernel/spellid.h
src/magic.c
src/magic.h
|
2015-08-06 19:53:24 +02:00 |
Enno Rehling
|
4c877288d3
|
remove spellid.h, it represents an outdated way of doing things.
merge the enum into combatspells, and reduce it to the spells actually used here.
|
2015-08-06 17:57:51 +02:00 |
Enno Rehling
|
01649ce682
|
Merge pull request #266 from ennorehling/feature/bug-2101-study-teach-testing
bug 2101: increase max printed length of orders
|
2015-08-06 17:12:41 +02:00 |
Enno Rehling
|
1e6a83f357
|
resize buffer in eval_command, it was too small for many commands.
increase MAXTEACHERS.
eliminate oldterrain warning in json_report.
|
2015-08-06 16:52:24 +02:00 |
Enno Rehling
|
0f5567b7f8
|
fix missing include (gcc)
|
2015-08-05 16:02:15 +02:00 |
Enno Rehling
|
e9b1d6a0ae
|
fix gcc warning
|
2015-08-05 15:42:22 +02:00 |
Enno Rehling
|
8dc4e93e90
|
fix missing units from CR, add a test, partially convert from FILE* to stream
|
2015-08-05 14:45:46 +02:00 |
Enno Rehling
|
8efc874952
|
backfill missing tests for ally_cmd
|
2015-08-05 12:19:17 +02:00 |
Enno Rehling
|
420574c7e4
|
add unit-test for casting spells, fix spell-casting (was looking for thisorder), all E3 tests pass again
|
2015-08-05 10:25:25 +02:00 |
Enno Rehling
|
c22636ca13
|
unit tests for update_long_order. e3 tests are still broken.
|
2015-08-05 00:03:30 +02:00 |
Enno Rehling
|
928b9966d0
|
fix broken test (select DESTROY over MOVE), start writing unit tests for update_long_order
|
2015-08-04 23:04:00 +02:00 |
Enno Rehling
|
4d061d8592
|
repair update_long_order and K_DESTROY handling according to discussion in https://bugs.eressea.de/view.php?id=2080
|
2015-08-04 22:47:55 +02:00 |
Enno Rehling
|
2288b8fb27
|
Merge remote-tracking branch 'upstream/master' into develop
Conflicts:
.travis.yml
s/build
s/cmake-init
s/runtests
src/buildno.h
src/kernel/config.c
src/kernel/save.c
src/kernel/unit.c
src/laws.c
src/move.c
|
2015-08-03 19:43:26 +02:00 |
Enno Rehling
|
c19bed02fe
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2015-08-03 19:17:25 +02:00 |
Enno Rehling
|
9938b3fb66
|
eliminate update_gbdream completely, make code smaller and simpler.
simplify tests (no need to use create_spell if we don't use it)
increase build no for hotfix.
|
2015-08-02 23:16:41 +02:00 |
Enno Rehling
|
d99ffaf1ed
|
filter by curse-type before trying to call update_gbdreams.
|
2015-08-02 22:45:59 +02:00 |
Enno Rehling
|
b5ed7c562d
|
wait until curse->magician has been resolve()'s before calling effskill() to find f->max_spelllevel.
|
2015-08-02 22:08:35 +02:00 |
Enno Rehling
|
17f15b69ee
|
fix some of the unicode replacement symbol bullshit in comments
|
2015-08-02 21:37:12 +02:00 |
Enno Rehling
|
a119f7617f
|
add some assertions to make sure update_gbdream is not called without a magician
|
2015-08-02 21:17:21 +02:00 |
Enno Rehling
|
009993f2f4
|
address some PVS comments
|
2015-07-21 09:01:11 +02:00 |
Enno Rehling
|
602f254e22
|
Merge branch 'develop' of github.com:eressea/server into develop
Conflicts:
s/build
|
2015-07-12 14:43:48 +02:00 |
Enno Rehling
|
21a81bd307
|
cleanup: struct declaration, more static.
|
2015-07-12 14:24:46 +02:00 |
Enno Rehling
|
f1b0488a78
|
missing include
|
2015-07-12 14:17:35 +02:00 |
Enno Rehling
|
0a57933e30
|
minor optimizations, error checking (static analysis)
|
2015-07-12 14:17:27 +02:00 |
Enno Rehling
|
3fc3660152
|
ignore PVS=-Studio files
|
2015-07-12 14:17:18 +02:00 |
Enno Rehling
|
c0c3400f21
|
remove junk files, thank you windows
|
2015-07-12 11:01:59 +02:00 |
Enno Rehling
|
7087c0e0ab
|
Update to latest submodules, fix iniparser and critbit.
I did this before, must have lost it in the merge. Crazy.
|
2015-07-12 10:38:01 +02:00 |
Enno Rehling
|
083c848db1
|
merge with latest hotfix
|
2015-07-12 04:53:10 +02:00 |
Enno Rehling
|
11e1fab0d0
|
Merge branch 'hotfix-3.4.1' into feature/travis-migration
Conflicts:
.travis.yml
s/build
s/cmake-init
s/runtests
s/travis-build
src/kernel/region.c
|
2015-07-12 04:12:32 +02:00 |
Enno Rehling
|
cfb1812f24
|
fix building on RasPi
|
2015-07-12 03:08:29 +02:00 |
Enno Rehling
|
a3a2e3074d
|
uninitialized variable
|
2015-07-12 01:38:22 +02:00 |
Enno Rehling
|
c6da0c2189
|
fix tolua, I guess
|
2015-07-11 23:45:59 +02:00 |
Enno Rehling
|
bf4bad92db
|
disable broken test, try new travis infrastructure
|
2015-07-11 16:02:51 +02:00 |
Enno Rehling
|
27835dc4e1
|
unit tests for STUDY and TEACH commands.
|
2015-07-09 13:24:21 +02:00 |
Enno Rehling
|
034d1d5433
|
Merge branch 'feature/rename-cerddor' into develop
|
2015-07-08 19:03:45 +02:00 |
Enno Rehling
|
434923ec67
|
Merge pull request #257 from badgerman/feature/rename-cerddor
Bug 2115: fix the name of Cerddor everywhere.
|
2015-07-08 18:57:08 +02:00 |