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

8888 Commits

Author SHA1 Message Date
Enno Rehling 37f3c02ceb do not write reports in tests. 2017-03-30 23:18:50 +02:00
Enno Rehling c49786d713 fix some memory leaks 2017-03-30 23:13:55 +02:00
Enno Rehling 4115b321b3 add tests for additional (race-related) production rules. 2017-03-30 21:00:35 +02:00
Enno Rehling e50d5a812e remove unused error message. 2017-03-30 20:41:17 +02:00
Enno Rehling 5479d94206 develop branch gives different error message for greatbow. 2017-03-30 20:40:03 +02:00
Enno Rehling 8187530794 disable a test that currently is not passing 2017-03-30 19:15:49 +02:00
Enno Rehling d7fa405dbe Merge branch 'test-races' into develop 2017-03-30 19:09:32 +02:00
Enno Rehling 570a25f6dd split production rules by games 2017-03-30 19:08:33 +02:00
Enno Rehling 29c2e0b8f4 additional testing for race-related production rules. 2017-03-29 17:59:39 +02:00
Enno Rehling 8d2687ab90 print version number at end of tests. 2017-03-29 04:30:54 +02:00
Enno Rehling a6518d87d1 very latest iniparser 2017-03-28 20:35:22 +02:00
Enno Rehling 693a6d9ce7 update submodules to a version that passes CI. 2017-03-28 20:26:28 +02:00
Enno Rehling 5db3bb0baa CMake changes in submodules 2017-03-28 16:55:18 +02:00
Enno Rehling 16910f8efd accidentally deleted the LibXml2 find_package call, oops. 2017-03-28 16:41:59 +02:00
Enno Rehling e8b7015c6c it seems CMAKE_INCLUDE_PATH is unused 2017-03-28 16:41:13 +02:00
Enno Rehling 6ded971c0c rename the MSVC module 2017-03-28 16:27:10 +02:00
Enno Rehling 2fd03a2489 fix string comparison for posix shell 2017-03-28 16:11:45 +02:00
Enno Rehling d959fe657c make --version exit immediately after (short) version info 2017-03-28 16:01:10 +02:00
Enno Rehling 75049d3bbc unit.has_attrib should not require the attribute to be registered. 2017-03-27 22:07:18 +02:00
Enno Rehling a59f321b44 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-03-27 22:00:50 +02:00
Enno Rehling c4e15fd5ba fix find_package call for Lua 2017-03-27 21:59:56 +02:00
Enno Rehling 3b3379ad4b work around bad version matchig in FindToLua.cmake 2017-03-27 21:30:46 +02:00
Enno Rehling a3cdfef668 Fix find_package calls for CMake < 3.0 2017-03-27 21:10:30 +02:00
Enno Rehling f8d49e07af remove outdated custom CMake Modules. 
only keep what is not in CMake 3.6.
 2017-03-27 20:25:27 +02:00
Enno Rehling 6b4a8e677f remove cmake submodule 2017-03-27 20:15:06 +02:00
Enno Rehling a1868ab00c Merge pull request #680 from ennorehling/develop 
Bug 2315, pdcurses 3.4
 2017-03-27 18:13:04 +02:00
Enno Rehling 03653a7338 fix two live warnings (unicode trim and fleechance registration) 2017-03-27 18:07:44 +02:00
Enno Rehling 7ee5a3624e allow game.start in ini file 2017-03-27 08:57:35 +02:00
Enno Rehling f2bb51b3ab Merge branch 'master' into develop 
Conflicts:
	res/adamantium.xml
	res/core/resources/laen.xml
	scripts/tests/common.lua
	scripts/tests/e2/adamantium.lua
	scripts/tests/e2/e2features.lua
	scripts/tests/e2/items.lua
	scripts/tests/items.lua
	src/bind_unit.c
	src/economy.test.c
	src/kernel/resources.c
	src/util/attrib.c
 2017-03-26 21:01:21 +02:00
Enno Rehling 47062da920 Merge branch 'master' of https://github.com/ennorehling/eressea 2017-03-26 20:49:02 +02:00
Enno Rehling 1c8a66982a Merge remote-tracking branch 'upstream/master' 2017-03-26 20:47:11 +02:00
Enno Rehling c90182ea3a Merge remote-tracking branch 'upstream/master' 2017-03-26 20:45:06 +02:00
Enno Rehling eaf9593182 Merge pull request #681 from ennorehling/test-production 
additional tests for production rules
 2017-03-26 20:40:07 +02:00
Enno Rehling 7c19746d84 adjust adamantium test to new rule. 2017-03-26 20:33:48 +02:00
Enno Rehling 923b3e26a4 fix duplicate _LP64 define 2017-03-26 20:32:59 +02:00
Enno Rehling c835c119ca BUG 2315: always use plural for resources 2017-03-26 20:32:46 +02:00
Enno Rehling e114aa2854 also add +1 when producing adamantium in mines 2017-03-26 20:32:09 +02:00
Enno Rehling 4b0b5e8215 fix duplicate _LP64 define 2017-03-26 20:26:14 +02:00
Enno Rehling 406f8ca3e6 BUG 2315: always use plural for resources 2017-03-26 20:25:01 +02:00
Enno Rehling 89a20824e3 backwards compat for old rm_iron etc. tokens in save 2017-03-26 17:46:55 +02:00
Enno Rehling 588914bc36 fix duplicate _LP64 define 2017-03-26 17:41:53 +02:00
Enno Rehling 39a5b55753 bugfix? mine grants +1 to laen production. 
not certain that this is actually a bug.
 2017-03-26 17:40:13 +02:00
Enno Rehling bd40de1142 additional testing for production rules. 2017-03-26 17:38:45 +02:00
Enno Rehling dcf1c7138b make region:set_resource do the right thing 
also for adamantium
 2017-03-26 14:33:14 +02:00
Enno Rehling 10edb1d3e9 enable process_orders to be done in steps. 
by checking before turn_end(), we can sense temporary attributes and curses on a unit before they age away.
 2017-03-26 13:10:23 +02:00
Enno Rehling ec375baa03 Zwergenbonus gibt es nur in E2 2017-03-26 12:48:44 +02:00
Enno Rehling afd1cb4039 cherry-pick test for mine and smithy 2017-03-26 12:45:38 +02:00
Enno Rehling 8b87eb608f pdcurses version 3.4 warning suppression. 2017-03-26 12:39:14 +02:00
Enno Rehling d238e18191 fix duplicate definition 2017-03-25 18:36:27 +01:00
Enno Rehling ce0c6a0d32 pdcurses version 3.4 warning suppression. 2017-03-25 18:35:00 +01:00