Enno Rehling
|
9d328a07f2
|
Merge branch 'order_id' of https://github.com/ennorehling/eressea.git
|
2017-11-16 18:41:18 +01:00 |
Enno Rehling
|
9a8d0e07cc
|
Merge branch 'berkeley' into order_id
|
2017-11-16 18:40:48 +01:00 |
Enno Rehling
|
dbe835e485
|
add cmake directives to build with Berkeley DB
|
2017-11-16 18:30:18 +01:00 |
Enno Rehling
|
290a07e763
|
Merge branch 'develop'
|
2017-11-15 20:39:20 +01:00 |
Enno Rehling
|
54b016a735
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2017-11-15 20:37:46 +01:00 |
Enno Rehling
|
09cf29a75c
|
Merge pull request #739 from stm2/easy_fix
allow empty faction email
|
2017-11-15 12:54:50 +01:00 |
Steffen Mecke
|
0aa5a64c63
|
allow empty faction email
|
2017-11-15 12:12:42 +01:00 |
Steffen Mecke
|
2f35feee3e
|
minor, obvious fixes
|
2017-11-14 12:51:04 +01:00 |
Enno Rehling
|
3b6d7a4055
|
Merge branch 'develop'
|
2017-11-12 22:15:47 +01:00 |
Enno Rehling
|
dae2ca2b5b
|
buildings should have all the same name-tests as ships.
|
2017-11-12 15:12:45 +01:00 |
Enno Rehling
|
ac8ca5f728
|
Also test that I can rename a ship that I myself own, of course.
|
2017-11-12 15:09:57 +01:00 |
Enno Rehling
|
db3feeedcc
|
combine ship naming tests.
|
2017-11-12 15:05:17 +01:00 |
Enno Rehling
|
2703b01ade
|
units can rename the ship they are on if their faction owns it.
this fixes bug 2384.
|
2017-11-12 15:01:58 +01:00 |
Enno Rehling
|
4a73db1f67
|
add a test that proves bug 2384 exists.
|
2017-11-12 14:59:44 +01:00 |
Enno Rehling
|
d2356d9e4f
|
fix name of config variables.
|
2017-11-12 14:32:08 +01:00 |
Enno Rehling
|
48a58fc907
|
sqlite optimizations: transactions, journal_mode, synchronous.
|
2017-11-11 21:46:16 +01:00 |
Enno Rehling
|
f08640453f
|
fix small typo
|
2017-11-10 17:50:19 +01:00 |
Enno Rehling
|
79b397e07f
|
fix config_get, has no default.
|
2017-11-10 16:32:20 +01:00 |
Enno Rehling
|
6923fe5c53
|
fix lua dbupdate
write sqlite data to a temporary db by default (configurable).
|
2017-11-10 16:29:48 +01:00 |
Enno Rehling
|
f8e552ab6e
|
gcc and clang want function pointers to be cast.
|
2017-11-10 08:02:52 +01:00 |
Enno Rehling
|
05b7837070
|
fix parser to keep a reference to the order it is parsing.
make push/popstate not crash. pass unit tests.
|
2017-11-10 07:56:56 +01:00 |
Enno Rehling
|
df4cc70abf
|
add nul terminator to loaded string.
|
2017-11-10 07:45:41 +01:00 |
Enno Rehling
|
add9d24f52
|
convert needs sqlite3 now (because libgame does).
|
2017-11-10 07:45:15 +01:00 |
Enno Rehling
|
89bf17cdca
|
almost have sqlite storage working (in memory, not file).
but test_teach_magic crashes.
|
2017-11-09 21:33:42 +01:00 |
Enno Rehling
|
0cd9651690
|
fix sqlite linking for tests.
implement save_order for sqlite.
|
2017-11-09 21:12:25 +01:00 |
Enno Rehling
|
9f778c0ae9
|
fix symetric db_open and db_close calls.
|
2017-11-09 20:17:06 +01:00 |
Enno Rehling
|
fee9b6d0a8
|
separate database logic from order_data.
laying groundwork for different database backends.
|
2017-11-09 19:55:28 +01:00 |
Enno Rehling
|
34808a25c5
|
Merge branch 'develop'
|
2017-11-09 18:04:41 +01:00 |
Enno Rehling
|
5a0a1f495b
|
BUG 2383: Delete an invalid assertion.
https://bugs.eressea.de/view.php?id=2383
|
2017-11-07 19:42:00 +01:00 |
Enno Rehling
|
98be298d72
|
reduce monster spawning with configuration settings.
|
2017-11-07 19:35:21 +01:00 |
Enno Rehling
|
fa42423f3c
|
oops.
|
2017-11-06 21:10:37 +01:00 |
Enno Rehling
|
eccf6bef7a
|
consistent naming of module configurations (singular).
add module switch for volcano.
|
2017-11-06 21:04:30 +01:00 |
Enno Rehling
|
31d15550ed
|
Add test coverage for NAME ALLIANCE.
|
2017-11-06 20:38:28 +01:00 |
Enno Rehling
|
7196f799e6
|
add a terrain_changed function for use with static terrain variables.
|
2017-11-06 20:29:26 +01:00 |
Enno Rehling
|
c597bebb8b
|
fix drowning (it's not dependeing on icebergs).
|
2017-11-05 20:52:04 +01:00 |
Enno Rehling
|
5b70d605ce
|
gcc is annoying about switch statements
|
2017-11-05 19:38:42 +01:00 |
Enno Rehling
|
373d738084
|
add a modules.icebergs configuration variable.
|
2017-11-05 19:35:06 +01:00 |
Enno Rehling
|
4b1b98f5ec
|
Merge branch 'develop' of https://github.com/ennorehling/eressea.git
|
2017-11-05 19:16:35 +01:00 |
Enno Rehling
|
96ff0815c4
|
newterrain sucks.
|
2017-11-05 19:15:43 +01:00 |
Enno Rehling
|
440679da87
|
code that uses newterrain needs to set up terrains in tests.
|
2017-11-05 17:00:40 +01:00 |
Enno Rehling
|
2b81334ba2
|
use the correct swamp terrain, still failing. newterrain is a plague.
|
2017-11-05 16:43:01 +01:00 |
Enno Rehling
|
3fdde8a4aa
|
refactor original trade test to use shared setup function.
|
2017-11-05 15:14:54 +01:00 |
Enno Rehling
|
12646f726a
|
Add a failing test for bug 2379.
|
2017-11-05 15:11:02 +01:00 |
Enno Rehling
|
a17c8ada71
|
Add a test for the happy case of the BUY command.
|
2017-11-04 20:10:05 +01:00 |
Enno Rehling
|
9c24fe4b07
|
fix gcc build
|
2017-10-30 18:12:24 +01:00 |
Enno Rehling
|
35742e8870
|
BUG 2376: Abtreiben zeigt immer Nordwesten an.
|
2017-10-30 18:01:33 +01:00 |
Enno Rehling
|
fa01b6fa04
|
Merge pull request #738 from ennorehling/master
BUG 2381: parse_token overrun.
|
2017-10-29 19:07:14 +01:00 |
Enno Rehling
|
ec4aae61ef
|
Merge branch 'master' into develop
|
2017-10-29 19:02:13 +01:00 |
Enno Rehling
|
0277e10c8d
|
BUG 2381: parse_token overrun.
|
2017-10-29 19:00:18 +01:00 |
Enno Rehling
|
5af5daa355
|
BUG 2378: Fix magic armor resistance calculation.
Use frac_one constant where applicable.
|
2017-10-29 18:55:43 +01:00 |