Enno Rehling
|
ea783da45c
|
Merge pull request #6 from ennorehling/feature/travis-valgrind-cr
additional valgrind-check stuff
|
2015-08-05 18:26:59 +02:00 |
Enno Rehling
|
47ff4ca9dd
|
use suppression file for old ubuntu
|
2015-08-05 18:19:17 +02:00 |
Enno Rehling
|
487aaede16
|
install valgrind (can we?) and check for it when runnign tests
|
2015-08-05 18:14:57 +02:00 |
Enno Rehling
|
75235a11fc
|
update test data to include ships and buildings
|
2015-08-05 18:03:59 +02:00 |
Enno Rehling
|
2e099ad3a6
|
Merge pull request #5 from ennorehling/feature/travis-valgrind-cr
check that the CR contains reasonable entries
|
2015-08-05 17:49:02 +02:00 |
Enno Rehling
|
76740192f8
|
check that the CR contains reasonable entries
|
2015-08-05 17:42:36 +02:00 |
Enno Rehling
|
db391513b8
|
Merge branch 'develop' of github.com:eressea/server into develop
|
2015-08-05 16:54:24 +02:00 |
Enno Rehling
|
5964240899
|
Merge branch 'develop' of github.com:badgerman/eressea into develop
|
2015-08-05 16:51:36 +02:00 |
Enno Rehling
|
cfe9426820
|
Merge branch 'hotfix-3.4.1x' into develop
|
2015-08-05 16:51:00 +02:00 |
Enno Rehling
|
c99bea20f9
|
Merge branch 'develop' into hotfix-3.4.1x
|
2015-08-05 16:50:44 +02:00 |
Enno Rehling
|
ffd4c865f2
|
Merge pull request #264 from ennorehling/feature/bug-2124-units-missing-from-cr
bug 2124: units missing from CR
|
2015-08-05 16:48:36 +02:00 |
Enno Rehling
|
5ba6f6f836
|
Merge pull request #263 from ennorehling/feature/bug-2125-test-ally-cmd
bug 2125: tests for ally_cmd
|
2015-08-05 16:48:11 +02:00 |
Enno Rehling
|
fedf150720
|
Merge pull request #4 from ennorehling/feature/bug-2124-units-missing-from-cr
bug 2124: units missing from CR
|
2015-08-05 16:47:47 +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
|
b7e41ea17e
|
Merge pull request #3 from ennorehling/feature/bug-2125-test-ally-cmd
backfill missing tests for ally_cmd
|
2015-08-05 12:46:50 +02:00 |
Enno Rehling
|
8efc874952
|
backfill missing tests for ally_cmd
|
2015-08-05 12:19:17 +02:00 |
Enno Rehling
|
91efc30afd
|
Merge pull request #2 from ennorehling/feature/bug-2080-destroy-and-thisorder
merge bug 2080: destroy and thisorder
|
2015-08-05 11:08:00 +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
|
00d8994918
|
Merge branch 'master' into develop
Conflicts:
.gitmodules
|
2015-08-04 10:50:43 +02:00 |
Enno Rehling
|
57bb4a49f1
|
fix git submodule urls (badgerman->ennorehling) and iniparser
|
2015-08-04 10:25:57 +02:00 |
Enno Rehling
|
4649a0861d
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
src/buildno.h
|
2015-08-03 19:49:50 +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
|
6727b0cbe4
|
Merge pull request #261 from ennorehling/hotfix/bug-2123-gbdream-no-mage
Hotfix 3.5.4 (against master)
|
2015-08-02 23:22:28 +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
|
802f8b08d6
|
try setting origin manually
|
2015-07-31 14:10:30 +02:00 |
Enno Rehling
|
dbabb94632
|
first new unit gets five WdL
|
2015-07-28 10:53:48 +02:00 |
Enno Rehling
|
51fc6680dd
|
require trees for new player regions
|
2015-07-28 10:51:14 +02:00 |
Enno Rehling
|
d9e7ff69eb
|
fix xml config xinclude links
|
2015-07-26 14:20:28 +02:00 |
Enno Rehling
|
009993f2f4
|
address some PVS comments
|
2015-07-21 09:01:11 +02:00 |
Enno Rehling
|
a31dd95de0
|
give the first unit a sword, set skills from the equipment-config, not script
make the preview link use a soft-link, not calculate the build-directory again.
|
2015-07-19 20:07:08 +02:00 |
Enno Rehling
|
38ecf783c2
|
ignore comments
|
2015-07-12 16:16:57 +02:00 |
Enno Rehling
|
18d82b38ea
|
Merge branch 'feature/travis-migration' into develop
|
2015-07-12 15:04:57 +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
|
dfeae86af5
|
Merge branch 'develop' of github.com:badgerman/eressea into develop
|
2015-07-12 14:43:05 +02:00 |
Enno Rehling
|
ffa4a01f1c
|
Merge branch 'ennorehling-feature/travis-migration' into develop
|
2015-07-12 14:42:37 +02:00 |
Enno Rehling
|
4682a4ec62
|
Merge branch 'feature/travis-migration' of https://github.com/ennorehling/eressea into ennorehling-feature/travis-migration
|
2015-07-12 14:42:01 +02:00 |
Enno Rehling
|
21a81bd307
|
cleanup: struct declaration, more static.
|
2015-07-12 14:24:46 +02:00 |
Enno Rehling
|
cc263ed6c8
|
Merge branch 'feature/travis-migration' into develop
|
2015-07-12 14:18:27 +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 |