Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
9076 commits 10 branches 0 tags 41 MiB
Commit graph

9076 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
7b2531a8ae writing orders to the CR no longer copies them into a buffer when it can be avoided. 2017-12-06 20:00:32 +01:00
Enno Rehling
7867eb6962 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-12-04 20:01:35 +01:00
Enno Rehling
3864a00482 remove stealing from economy.c (that file is too big). 2017-12-04 20:01:08 +01:00
Enno Rehling
05425b5101 pull economy requests into header, rename the struct. 2017-12-04 19:20:48 +01:00
Enno Rehling
88f698df6e fix the error in create-orders 2017-12-03 17:30:41 +01:00
Enno Rehling
a02c80cf76 Check exit code directly 2017-12-03 16:42:14 +01:00
Enno Rehling
0857e363e5 fix travis shellcheck 2017-12-03 16:26:02 +01:00
Enno Rehling
4619f77af9 add a shellcheck test, fix some scripts 2017-12-03 16:12:48 +01:00
Enno Rehling
844920257c Merge branch 'master' into develop 2017-12-02 21:17:49 +01:00
Enno Rehling
55db0d98c8 syntax error 2017-12-02 21:17:34 +01:00
Enno Rehling
b078015e85 prefer sqlite over berkeley 2017-11-26 18:16:34 +01:00
Enno Rehling
223b00fd2d
Merge pull request #744 from ennorehling/develop 
Store orders in a temporary database instead of memory.
 2017-11-26 17:24:08 +01:00
Enno Rehling
c124702ffe merge order_id branch 2017-11-26 15:20:38 +01:00
Enno Rehling
537166eadf Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-11-26 15:17:59 +01:00
Enno Rehling
40bbb48e94 umlaute sind doof. 2017-11-26 15:17:46 +01:00
Enno Rehling
a67b2fa68d stop using random numbers to scale units. 2017-11-26 15:15:25 +01:00
Enno Rehling
9188f6fbb6 scale_number test revised 2017-11-26 15:13:40 +01:00
Enno Rehling
599efb2e76 remove lomem code, it was a bad idea 2017-11-25 20:24:57 +01:00
Enno Rehling
85306165d6 on the Rapsberry Pi, long is only 32 bit 2017-11-25 11:31:24 +01:00
Enno Rehling
38922d9205 on the Rapsberry Pi, long is only 32 bit 2017-11-25 11:29:52 +01:00
Enno Rehling
d13a0de0f9 Merge branch 'develop' into order_id 2017-11-25 11:24:03 +01:00
Enno Rehling
f8f8f8f43f Merge branch 'master' into develop 2017-11-21 08:47:49 +01:00
Enno Rehling
29a6c0ae86 gmtool, highlight and clear chaos 2017-11-21 08:47:35 +01:00
Enno Rehling
67318950d5 Merge branch 'develop' into order_id 2017-11-20 18:23:33 +01:00
Enno Rehling
ff2f83c371 order leak in recruit_dracoids, do not build a study order 2017-11-20 17:03:12 +01:00
Enno Rehling
36809d1f9a fix coverity resource leaks 2017-11-20 16:49:35 +01:00
Enno Rehling
4fa9e041bf fix cppcheck report (missing curly race) 2017-11-20 14:57:04 +01:00
Enno Rehling
7c69bfa410 snprintf usage 2017-11-20 14:50:19 +01:00
Enno Rehling
e0bd5c2c7b abort on OOM 2017-11-20 14:44:02 +01:00
Enno Rehling
e6c11e2223 workaround for cppcheck false-positive 2017-11-20 08:51:06 +01:00
Enno Rehling
af9f263266 add cppcheck to travis build 2017-11-20 08:41:17 +01:00
Enno Rehling
8a638859fd fix memory access in rc_setoption 2017-11-20 08:24:56 +01:00
Enno Rehling
923f01190c sscanf format was too big 2017-11-20 07:52:56 +01:00
Enno Rehling
fdd28835b5 Shifting signed 32-bit value by 31 bits is undefined behaviour 2017-11-20 07:51:31 +01:00
Enno Rehling
793de9f82a no special apple ifdef required 2017-11-19 16:32:20 +01:00
Enno Rehling
41f20c02b2 fix bdb load/save, use recno db 2017-11-19 16:30:20 +01:00
Enno Rehling
2ff820d1b4 implement get/put for db 2017-11-19 12:50:24 +01:00
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