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

8807 Commits

Author SHA1 Message Date
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 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 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