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

8253 Commits

Author SHA1 Message Date
Enno Rehling 742fa423b3 do not log an ERROR when a familiar as no equipment 2017-04-16 12:36:59 +02:00
Enno Rehling b82bc0bb9c Merge pull request #684 from ennorehling/develop 
Ponnuki and Farsi
 2017-04-15 20:30:26 +02:00
Enno Rehling 0b226ba75e fix farsi names containing nzwj symbol. 2017-04-10 17:32:32 +02:00
Enno Rehling aeeb13bb53 BUG 2318: Go, Ponnuki, Go! 
https://bugs.eressea.de/view.php?id=2318
 2017-04-09 13:35:55 +02:00
Enno Rehling 1c509485f7 Merge pull request #682 from ennorehling/develop 
cmake changes, skillmod rewrite
 2017-04-08 22:14:53 +02:00
Enno Rehling 989ff65ca9 BUG 2318: disable ponnuki 2017-04-08 22:08:19 +02:00
Enno Rehling c6a8a76e31 strip skillmod down to the essentials. 2017-04-02 20:17:39 +02:00
Enno Rehling 7dd79a1e79 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-04-02 19:21:44 +02:00
Enno Rehling d7f69dfa27 enum type clarification 2017-04-02 19:21:37 +02:00
Enno Rehling 50eb35edf6 unused variable 2017-04-02 15:50:29 +02:00
Enno Rehling 7c680481de iron golems can build dwarf armor in E3. 2017-04-02 15:43:14 +02:00
Enno Rehling 8bb7cf8878 WIP: this error has a new message. 2017-04-02 15:39:50 +02:00
Enno Rehling e72155a563 WIP: reimplemented production modifiers. 
The system itself seems to work, but some Lua tests are still failing.
 2017-04-02 14:43:53 +02:00
Enno Rehling 4aa26343f6 the LOMEM define has never been used, kill it. 2017-04-01 20:08:04 +02:00
Enno Rehling 329ab2be2a update to cmake-fixed submodules 2017-04-01 11:42:48 +02:00
Enno Rehling 0ff9f1601c de-clutter header file. 2017-04-01 11:39:50 +02:00
Enno Rehling 967e70a4e1 SMF_RIDING is unused. 2017-04-01 11:39:41 +02:00
Enno Rehling ed99f60186 decluttering settings.h 2017-03-31 21:37:30 +02:00
Enno Rehling d99090ac67 remove additional unused macro constants 2017-03-31 21:29:37 +02:00
Enno Rehling 57ae21a823 remove an obsolete always-true constant 2017-03-31 21:26:07 +02:00
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