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

8211 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Enno Rehling
733c754e0f rename some configuration options. 
add them to the valid keys for eressea.ini, too.
 2017-03-25 14:15:01 +01:00
Enno Rehling
868f4e6cef also apply noerror rules to msg_feedback. 2017-03-25 11:36:29 +01:00
Enno Rehling
b44c5e54bf Neuer Befehlespräfix: ! zur Unterdrückung von Fehlern. 2017-03-25 11:18:48 +01:00
Enno Rehling
f941c5552f remove RF_SELECT code from split_allocations. 
the flag was only ever written, never read.
 2017-03-23 19:32:17 +01:00
Enno Rehling
485e8f0ce4 Revert "add failing test for skill bonus from mine, start work" 
This reverts commit ab87b1da85.
 2017-03-23 19:28:56 +01:00
Enno Rehling
ab87b1da85 add failing test for skill bonus from mine, start work 2017-03-23 18:51:30 +01:00
Enno Rehling
68e36e9252 test that adamantium requires a mine 2017-03-23 08:29:24 +01:00
Enno Rehling
0c8a9354db rmt_find no longer used. 
handle old data files with rm_iron, etc.
 2017-03-22 20:46:29 +01:00
Enno Rehling
17145eaf10 make region:set_resource do the right thing 
also for adamantium
 2017-03-22 20:37:09 +01:00
Enno Rehling
27d66adc74 eliminate duplicate keyword warning 2017-03-18 21:33:47 +01:00
Enno Rehling
bdf7411954 backfill a test for smithies 2017-03-18 10:33:52 +01:00
Enno Rehling
ae6d9f0e1a Zwergenbonus gibt es nur in E2 2017-03-18 08:00:35 +01:00
Enno Rehling
4c67e0603b remove attribs from rtype (it's only in rtype->construction that we use it?) 
test to verify that mine bonus for iron works as advertised.
change the oder of arguments for faction.create (race is the only thing not optional).
 2017-03-17 22:46:10 +01:00
Enno Rehling
49140f131e allow PROMOTION and PROMOTE alternatives. 
German already allows this, and my ECheck change made it necessary for English, too:
https://bugs.eressea.de/view.php?id=2280
 2017-03-17 20:30:07 +01:00
Enno Rehling
beb498d70c remove leftover code/data for artrewards. 2017-03-16 19:40:51 +01:00
Enno Rehling
ac12cb966d implement fixed wage functions, select by constant value 2017-03-16 16:07:52 +01:00
Enno Rehling
67a566d728 remove CRTAG_LOCLE define and lookups 2017-03-16 08:13:36 +01:00