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

9100 Commits

Author SHA1 Message Date
Enno Rehling d37b92dca1 Merge remote-tracking branch 'upstream/develop' into develop 2017-12-31 16:39:34 +01:00
Enno Rehling 01dd489b7a BUG 2403: endless loop (variable rename gone wrong). 2017-12-31 16:36:59 +01:00
Enno Rehling 643c989cf9 BUG 2401: fix attacker list, move code to reports.c 2017-12-31 15:05:49 +01:00
Enno Rehling 0440fcc11c bug 2400: magicbag preservation 2017-12-31 13:14:44 +01:00
Enno Rehling 0686e6ceba bug 2399: %% typo. 2017-12-31 11:57:57 +01:00
Enno Rehling 141941b760
Merge pull request #753 from ennorehling/master 
bug 2402: xmas fix
 2017-12-31 11:51:21 +01:00
Enno Rehling da81537c92 bug 2402: xmas fix 
Conflicts:
	scripts/eressea/xmas.lua
 2017-12-31 11:39:44 +01:00
Enno Rehling fc570d2ec7 bug 2402: xmas fix 2017-12-31 11:36:47 +01:00
Enno Rehling 057a19d7bf
Merge pull request #752 from ennorehling/develop 
header file shenanigans
 2017-12-30 21:16:44 +01:00
Enno Rehling a6c2a878e0 remov bsdstring tests and include 2017-12-30 20:11:02 +01:00
Enno Rehling 83149de26a remove bsdstring.h where possible. 2017-12-30 20:09:48 +01:00
Enno Rehling 54572fe40e add missing include 2017-12-30 19:50:37 +01:00
Enno Rehling a8140f1dc9 rename strlcpy->str_strlcpy, etc. 2017-12-30 19:49:21 +01:00
Enno Rehling 23ff404d2e move strlcat and strlcpy to strings.h 2017-12-30 13:04:00 +01:00
Enno Rehling 57b161132d fix conversion warnings (MSVC) 2017-12-30 11:51:57 +01:00
Enno Rehling d45141255e Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-12-30 11:42:41 +01:00
Enno Rehling 07b25fbed1 missing include, thanks mac 2017-12-30 11:09:09 +01:00
Enno Rehling c8ee0db02d stop using MIN and MAX 2017-12-30 08:58:50 +01:00
Enno Rehling ea0acc49d9 iwyu 2017-12-30 07:22:09 +01:00
Enno Rehling a6ae5a9e93 no more MINMAX 2017-12-30 00:06:07 +01:00
Enno Rehling 687f88d66e Merge branch 'master' into develop 2017-12-29 21:03:09 +01:00
Enno Rehling d47bee5572 christmas 2017 2017-12-29 21:01:50 +01:00
Enno Rehling f1a6203f3e Not yet ready to give up on the MIN/MAX macros 2017-12-29 19:26:20 +01:00
Enno Rehling 095148ab50 move va_copy macro closer to where it is used. 2017-12-29 17:00:16 +01:00
Enno Rehling c3a812123f fix use of static configuration in study_cost. 2017-12-29 16:07:48 +01:00
Enno Rehling c23e7bf9b9 add a unit test for academy_can_teach. 2017-12-29 13:37:17 +01:00
Enno Rehling 79b5464aab posix systems have PATH_MAX in limits.h 2017-12-29 11:58:39 +01:00
Enno Rehling 50173d5be3 PATH_MAX and MAX_PATH are crazy. 2017-12-29 11:44:14 +01:00
Enno Rehling f98eab56c4 platform.h is only for WIN32 now. 
replace MIN and MAX macros, they are BAD.
 2017-12-29 06:13:28 +01:00
Enno Rehling f82fe6e963 more frequent use util/macros.h instead of platform.h 2017-12-28 18:55:45 +01:00
Enno Rehling 5d45b0f99b move some platform defines to a macros header 2017-12-28 18:41:33 +01:00
Enno Rehling 5b1d27542a reduce dependence on platform.h. 
gradually stop using MAX and MIN (mistakes were made).
 2017-12-28 18:29:40 +01:00
Enno Rehling 3c16267246 prevent this mallorn problem for all future tests, too. 2017-12-28 00:10:05 +01:00
Enno Rehling 48b33d31dd prevent intermittent crash when region has mallorn: 2017-12-28 00:05:13 +01:00
Enno Rehling 4018850499 wtf is up with the travis build now? 2017-12-27 23:47:59 +01:00
Enno Rehling 5c790e024c The "Neue Spieler" statistics were never correct. 2017-12-27 22:59:50 +01:00
Enno Rehling 3c1addf2ba avoid using test_create_world. 2017-12-27 22:38:14 +01:00
Enno Rehling f6753261cd do not use test_create_world, please. 2017-12-27 22:30:07 +01:00
Enno Rehling bf86c4e043 backfill missing manacrystal test. 2017-12-27 22:26:50 +01:00
Enno Rehling 198f084f5d implement speedy ships, with unit tests and edge testing. 2017-12-27 21:54:09 +01:00
Enno Rehling c2167c963e add a (failing) acceptance test for speedy dragonships. fix the old ship tests. 2017-12-27 20:29:49 +01:00
Enno Rehling fbcebbd2ca we cannot check the non-existence of a report. 2017-12-27 20:29:05 +01:00
Enno Rehling cff4e12fbd celan up tests, rename test_cleanup -> test_teardown. 2017-12-27 19:58:39 +01:00
Enno Rehling 250faefff4 fix potion test, use only one 2017-12-27 07:11:21 +01:00
Enno Rehling 28252fda7b bug 2197: fix E3 potion text. 2017-12-26 16:09:15 +01:00
Enno Rehling 8e823c9403 Tests require regular trees, not mallorn. 2017-12-26 15:57:59 +01:00
Enno Rehling c78fe1ac0a move "do not accidentally terrafomr" logic to gmtool. 2017-12-26 13:29:19 +01:00
Enno Rehling f4388f4429 free equipments, fewer leaks. 2017-12-26 13:26:40 +01:00
Enno Rehling 4397c67d1c bug 2197: add acceptance test for Wasser des Lebens 2017-12-26 13:23:14 +01:00
Enno Rehling 3911217fb5 eliminate some TODO comments. 2017-12-26 07:25:42 +01:00