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

8109 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
376fc0265c Merge branch 'master' of github.com:eressea/server 
Conflicts:
	s/build
 2017-04-22 19:05:14 +02:00
Enno Rehling
1eb189cf47 shell wants spaces around = for string compares? 2017-04-22 19:03:08 +02:00
Enno Rehling
bda395d374 shell wants ==, not = for string compares? 2017-04-22 18:57:57 +02:00
Enno Rehling
3682fb472e Merge pull request #685 from ennorehling/master 
Bugfixes for Ponnuki and Demon Stealth
 2017-04-22 18:47:57 +02:00
Enno Rehling
e530543022 demon stealth: cloak as other race. 
added a Lua test.
get_race oob fix (potential crash).
 2017-04-22 18:33:47 +02:00
Enno Rehling
e938350acd add cmake as part of main project 2017-04-22 18:07:09 +02:00
Enno Rehling
758af589e5 remove cmake as a submodule 2017-04-22 18:01:49 +02:00
Enno Rehling
7e4f55a1ac enable ponnuki 2017-04-22 13:53:06 +02:00
Enno Rehling
b9b1a71d89 Merge branch 'master' of github.com:eressea/server 2017-04-09 13:56:10 +02:00
Enno Rehling
057f676d2c Merge pull request #683 from ennorehling/master 
BUG 2318, 2315: Ponnuki, Plural
 2017-04-09 13:56:04 +02:00
Enno Rehling
aebc7d4cac BUG 2138: Ponnuki is dead, long live Ponnuki 
https://bugs.eressea.de/view.php?id=2318
 2017-04-09 13:40:42 +02:00
Enno Rehling
ff194967f2 BUG 2318: disable ponnuki 2017-04-08 22:07:59 +02:00
Enno Rehling
599b4a8311 BUG 2318: disable ponnuki 2017-04-08 22:07:12 +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
27d66adc74 eliminate duplicate keyword warning 2017-03-18 21:33:47 +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
d40a4372fc Merge pull request #674 from ennorehling/master 
BUG 2306, TRANSLATIONS
 2017-03-11 17:34:53 +01:00
Enno Rehling
94fe14769e Merge branch 'master' of https://github.com/ennorehling/eressea.git 2017-03-11 17:22:43 +01:00
Enno Rehling
a31de0da4f BUG 2306: TRANSLATIONS Plural/Singular mixup. 
https://bugs.eressea.de/view.php?id=2306
 2017-03-11 17:22:40 +01:00
Enno Rehling
18179a550d Merge remote-tracking branch 'upstream/master' 2017-03-11 14:48:48 +01:00
Enno Rehling
ec68f0a0ae Merge pull request #671 from ennorehling/master 
refactoring tests
 2017-03-11 14:34:54 +01:00
Enno Rehling
cdf13c9fec stop using test_create_world, use test_setup. 2017-03-11 14:22:21 +01:00
Enno Rehling
41c6793964 matching test_setup and test_cleanup calls. 2017-03-11 12:57:02 +01:00
Enno Rehling
de0a697ddb Merge branch 'master' of https://github.com/ennorehling/eressea.git 2017-03-11 12:25:56 +01:00
Enno Rehling
98a48edb9a I've got a 64-bit CMake on Windows now. 2017-03-11 12:25:49 +01:00
Enno Rehling
e96c8f017e Merge remote-tracking branch 'upstream/master' 2017-03-10 23:23:40 +01:00
Enno Rehling
8b9f0f0894 BUG 2307: report mallorn trees as Mallorn in the CR. 
for legacy compatibility, we cannot call them Mallornbaeume.
 2017-03-10 23:18:09 +01:00
Enno Rehling
fe95ddafa1 reduce "translation not found" warnings in tests. 2017-03-10 21:43:36 +01:00
Enno Rehling
be0b54494e clean up some tests. 
the test locale gets some extra strings.
test_create_world is bad, stop using it. unfinished.
 2017-03-10 21:29:37 +01:00
Enno Rehling
fe3a94a7e9 Merge pull request #669 from ennorehling/master 
BUG 2305, 2309: Parteitarnung
 2017-03-08 20:39:30 +01:00
Enno Rehling
f54165d4f1 BUG 2309: show true faction to allies. 
https://bugs.eressea.de/view.php?id=2309
 2017-03-08 20:30:32 +01:00
Enno Rehling
77abd703bd backfill test that demonstrates bug 2305. 2017-03-08 20:16:01 +01:00