Enno Rehling
|
e6f3dc8b85
|
Merge branch 'master' into develop
Conflicts:
scripts/run-turn.lua
src/buildno.h
src/kernel/group.c
src/kernel/save.c
src/kernel/save.test.c
src/kernel/version.h
src/util/password.c
src/util/password.test.c
tests/run-turn.sh
|
2016-02-23 10:47:33 +01:00 |
Enno Rehling
|
4f7e1cb80f
|
integration test update.
- have a faction that quits,
- try to reload the datafile we just wrote.
|
2016-02-22 20:47:06 +01:00 |
Enno Rehling
|
88f3a46142
|
generate htpasswd files, understand apr1 hashes in confirmation script
|
2016-02-10 14:12:38 +01:00 |
Enno Rehling
|
91ca77bc48
|
passwd is no longer written
|
2016-02-09 18:34:36 +01:00 |
Enno Rehling
|
50f22d7c2f
|
debug output
|
2016-02-09 18:20:01 +01:00 |
Enno Rehling
|
ca6448ec23
|
re-enable failing valgrind check with more flags
|
2016-02-09 17:18:09 +01:00 |
Enno Rehling
|
84aa0beee5
|
create a more complex integration test for a unit that sails with a
ship (and sees more regions along the way).
|
2015-09-07 16:11:58 +02:00 |
Enno Rehling
|
2e11994155
|
hard-code the expected number of entries in the CR for a tighter test.
|
2015-09-07 15:40:12 +02:00 |
Enno Rehling
|
bf86b1d66a
|
add missing .sh files to git (previously blocked by .gitignore)
add an integration test for run-turn.lua
|
2015-09-07 15:27:30 +02:00 |