Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,539 Commits 10 Branches 0 Tags 41 MiB
Commit Graph

10539 Commits

Author SHA1 Message Date
Enno Rehling 2f5f685e55 add berkeley db, rename some files 2017-11-19 12:31:50 +01:00
Enno Rehling 9c44c1ce63 Merge branch 'develop' into order_id 2017-11-19 03:21:02 +01:00
Enno Rehling c39708f40c BUG 2362: clone_men hitpoint calculation was wrong. 2017-11-19 03:20:00 +01:00
Enno Rehling b0ce88631e fix bug 2386, int overflow 2017-11-19 03:19:59 +01:00
Enno Rehling 01f0b99b64 Merge remote-tracking branch 'upstream/master' 2017-11-19 03:18:06 +01:00
Enno Rehling 0117749971 Merge branch 'develop' of github.com:eressea/server into develop 2017-11-19 03:14:02 +01:00
Enno Rehling d670d04ef8 Merge branch 'master' into develop 2017-11-19 03:13:46 +01:00
Enno Rehling 97b4806deb Merge branch 'release-13.3' 
Conflicts:
	src/kernel/unit.c
	src/kernel/unit.test.c
 2017-11-19 03:13:16 +01:00
Enno Rehling 1c24628d62 BUG 2362: clone_men hitpoint calculation was wrong. 2017-11-19 03:00:18 +01:00
Enno Rehling 7e1f3dbdc5 fix bug 2386, int overflow 2017-11-19 02:56:13 +01:00
Enno Rehling 921dcf5348
Merge pull request #741 from ennorehling/master 
BUG 2383 remove irace assert
 2017-11-18 18:31:38 +01:00
Steffen Mecke 2f449e686b addendum to BUG 2383 (5a0a1f): read irace correctly 2017-11-18 18:30:19 +01:00
Enno Rehling 3f3cdad390 BUG 2383: Delete an invalid assertion. 
https://bugs.eressea.de/view.php?id=2383
 2017-11-18 18:30:19 +01:00
Enno Rehling 73c1478b87 Merge remote-tracking branch 'upstream/develop' into develop 2017-11-18 18:26:37 +01:00
Enno Rehling 2014a23212
Merge pull request #740 from stm2/add_2383 
remove irace assumptions
 2017-11-18 18:25:50 +01:00
Steffen Mecke 6e53f15a1c addendum to BUG 2383 (5a0a1f): read irace correctly 2017-11-18 18:10:49 +01:00
Enno Rehling 396705f492 BUG 2383: Delete an invalid assertion. 
https://bugs.eressea.de/view.php?id=2383
 2017-11-18 18:10:45 +01:00
Enno Rehling 50e242b810 fix include of renamed header 2017-11-18 13:02:12 +01:00
Enno Rehling 2224b59ff9 organize database drivers in their own directory 2017-11-18 12:55:07 +01:00
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