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

6728 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
899738a93c Merge pull request #446 from ennorehling/xmas 
xmas item 2015
 2015-12-26 11:49:37 +01:00
Enno Rehling
d9588fb7fb no snowglobe in E3 
include xmas tests in tests/e2, not in run-tests files
 2015-12-26 11:20:37 +01:00
Enno Rehling
92636cfcd9 put the new(ish) email subject line in the CR, 
as reported in https://bugs.eressea.de/view.php?id=2016
 2015-12-26 11:05:03 +01:00
Enno Rehling
b66b6f7f4c testing christmas items, removing old xmas scripts 2015-12-22 19:33:44 +01:00
Enno Rehling
e678c1bcce disable snowglobe test, because we are not ready yet 2015-12-22 18:49:11 +01:00
Enno Rehling
cf90f8cf93 it's beginning to look a lot like christmas 
Conflicts:
	scripts/eressea/xmas.lua
 2015-12-22 18:46:57 +01:00
Enno Rehling
80e0707cb2 snowglobe transformations for several trerrains. messages still TBD 2015-12-22 18:46:45 +01:00
Enno Rehling
3fd4884584 putting all of the pieces together for the snow globe, with final use implementation still TBD 
Conflicts:
	scripts/eressea/xmasitems.lua
	src/laws.c
 2015-12-22 18:46:42 +01:00
Enno Rehling
81888132e4 add a lua binding to convert user-language strings to directions 2015-12-22 18:45:27 +01:00
Enno Rehling
55c15c1905 add a lua binding to convert user-language strings to directions 2015-12-22 18:38:12 +01:00
Enno Rehling
1f080e2058 release version 3.7.6 2015-12-20 20:17:10 +01:00
Enno Rehling
274322c5b2 fix desert.road in E3 also for 3.7.x 2015-12-20 20:16:13 +01:00
Enno Rehling
c9d74ee6ca Merge branch 'master' of github.com:eressea/server 2015-12-20 20:13:15 +01:00
Enno Rehling
9712fcfdc8 Merge pull request #444 from ennorehling/develop 
suppress misc warnings in the log file
 2015-12-18 15:16:51 +01:00
Enno Rehling
810ad094af suppress misc warnings in the log file by reorganizing E3 strings and tuning down log levels 2015-12-18 15:13:15 +01:00
Enno Rehling
35e2e438e1 Merge pull request #443 from ennorehling/develop 
fix terrain in detectocean message
 2015-12-17 20:50:24 +01:00
Enno Rehling
acab4b3199 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2015-12-17 20:36:39 +01:00
Enno Rehling
30acc38d53 https://bugs.eressea.de/view.php?id=2174 
fix terrain type in detectocean message.
 2015-12-17 20:36:21 +01:00
Enno Rehling
a05ecb588d Merge pull request #442 from ennorehling/develop 
eliminate duplicate description
 2015-12-17 20:25:19 +01:00
Enno Rehling
b700cb5a2c Merge branch 'develop' of github.com:ennorehling/eressea into develop 2015-12-17 20:21:01 +01:00
Enno Rehling
02b2157fe5 move description from shared file to game-specific file 
https://bugs.eressea.de/view.php?id=2177
 2015-12-17 20:20:48 +01:00
Enno Rehling
18c0c235db Merge pull request #440 from ennorehling/feature/bug-2176-reduceproduction 
bug 2176, reduceproduction message im CR
 2015-12-17 13:17:00 +01:00
Enno Rehling
beb12372e0 remove wormhole_data struct now that it's nearly empty 2015-12-17 13:10:09 +01:00
Enno Rehling
9d1b5dccb8 resolve a TODO by reducing wormhole data size 2015-12-17 13:04:51 +01:00
Enno Rehling
74d8b53ba8 fix a TODO, reduce size of icastle_data 2015-12-17 12:59:12 +01:00
Enno Rehling
a02d71bfef https://bugs.eressea.de/view.php?id=2176 
generate the reduced production message before writing reports, so it shows in the CR.
 2015-12-17 12:40:22 +01:00
Enno Rehling
9e4344e3c3 resolve a TODO, make attribute (and data) a little bit smaller. 2015-12-17 12:23:07 +01:00
Steffen Mecke
09836ed249 make dragon movement more deterministic 2015-12-17 11:47:08 +01:00
Enno Rehling
5187788f3c pass the parent of an attribute into a_age and attrib_type::age 2015-12-16 22:18:44 +01:00
Enno Rehling
d85123fe8b Merge pull request #439 from ennorehling/develop 
MS Visual Studio 2015 update 1 breaking changes
 2015-12-16 17:06:04 +01:00
Enno Rehling
fadccb5bd6 MS Visual Studio 2015 update 1 breaking changes (relative include files) 2015-12-16 17:02:29 +01:00
Enno Rehling
c66d6c7457 Address MS Visual Studio 2015 update 1 breaking changes 2015-12-16 17:01:47 +01:00
Enno Rehling
5e3ab01f17 Merge pull request #438 from ennorehling/master 
Address MS Visual Studio 2015 update 1 breaking changes
 2015-12-16 17:00:39 +01:00
Enno Rehling
24f559b4ad Address MS Visual Studio 2015 update 1 breaking changes 2015-12-16 16:55:52 +01:00
Enno Rehling
a2e7e6476c Merge branch 'develop' of github.com:eressea/server into develop 2015-12-16 13:32:14 +01:00
Enno Rehling
fa55f84b41 remove unnecessary assert that prevents throwing away money on an ocean 
github issue #437
https://bugs.eressea.de/view.php?id=2173#c6411
 2015-12-16 13:32:02 +01:00
Enno Rehling
0767a42671 Merge pull request #436 from ennorehling/develop 
no optional argument in E3 either
 2015-12-15 22:56:36 +01:00
Enno Rehling
cc88f56a26 no optioinal argument 
http://bugs.eressea.de/view.php?id=2175#c6408
 2015-12-15 07:59:55 +01:00
Enno Rehling
60ea74ce50 Merge pull request #435 from ennorehling/develop 
bugfix dupe message
 2015-12-12 21:38:15 +01:00
Enno Rehling
78c13d3ca2 bugfix dupe message 
http://bugs.eressea.de/view.php?id=2178
 2015-12-12 21:34:56 +01:00
Enno Rehling
ad28b9ae94 Merge pull request #434 from ennorehling/develop 
Fixed PR for negative peasant growth, rand injection
 2015-12-11 18:09:02 +01:00
Enno Rehling
3fafb04b57 fix ahort to int converaion problems, fox PR 2015-12-11 18:03:55 +01:00
Enno Rehling
18bcf83d9b Merge pull request #432 from ennorehling/braineaters 
no natural ac for braineaters
 2015-12-10 22:12:38 +01:00
Enno Rehling
d26cd57934 no natural ac for braineaters 2015-12-10 21:59:14 +01:00
Steffen Mecke
ad74c0a25d fix rare bug that created negative peasants 
when a region had non-standard wage, immigration could cause negative peasants
 2015-12-08 17:57:23 +01:00
Steffen Mecke
1f4c521ac8 encapsulate r->land->peasants, money, horses, herbs, morale 2015-12-08 17:57:23 +01:00
Steffen Mecke
723c3df7b2 test for immigration 2015-12-08 17:57:23 +01:00
Steffen Mecke
703edb676c facility to inject a non-random random generator 
This should be handy for writing tests that make use of randomization.
 2015-12-08 17:57:23 +01:00
Enno Rehling
1a9e3db423 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2015-12-06 20:51:14 +01:00
Enno Rehling
44024878f9 Merge branch 'master' of github.com:eressea/server 2015-12-06 20:50:06 +01:00