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

5241 Commits

Author SHA1 Message Date
Enno Rehling 39806eaef5 disable broken test_luck_message for now. 2015-02-08 13:37:44 +01:00
Enno Rehling a2e071d35b Fix broken syntax in message about effects on units. 
Add some missing descriptions.
Bump version number.
 2015-02-08 13:09:04 +01:00
Enno Rehling 954a649d3f version number bump 2015-02-08 10:41:05 +01:00
Enno Rehling f9bced467d fix a crash in rename_cmd 2015-02-08 10:33:45 +01:00
Enno Rehling db79eb2f28 Merge pull request #129 from badgerman/master 
hotfix for 3.4: stork
 2015-02-02 21:48:30 +01:00
Enno Rehling 5c975655b1 remove french messages that are not french 2015-02-02 21:45:47 +01:00
Enno Rehling 44e1159984 Merge branch 'hotfix-3.4.1' 2015-02-02 21:33:58 +01:00
Steffen Mecke d288c74aaf fix stork message (mantis 2027), add tests 2015-02-02 21:32:29 +01:00
Enno Rehling 0955dd7f05 Merge branch 'version-3-3' 
Conflicts:
	src/build.h
 2015-02-02 18:49:00 +01:00
Enno Rehling 4935582d6a Merge branch 'version-3-2' 
Conflicts:
	s/cron/previews.sh
	s/preview
	src/economy.c
	src/items.c
	src/kernel/build.c
	src/kernel/config.c
	src/laws.c
	src/study.c
 2015-02-02 18:48:14 +01:00
Enno Rehling eaaffffb43 Merge branch 'version-3-1' 
Conflicts:
	src/laws.c
 2015-02-02 18:45:53 +01:00
Enno Rehling a905c786ca Merge branch 'master' of github.com:eressea/server 2015-02-02 18:42:39 +01:00
Enno Rehling 136230f51b Merge pull request #124 from badgerman/master 
add a configuration switch to disable force_leave (bug 2059) for now.
 2015-02-01 13:01:04 +01:00
Enno Rehling 01b46b143b add a configuration switch to disable force_leave (bug 2059) for now. 2015-02-01 12:57:54 +01:00
Enno Rehling 89598dd987 Merge pull request #110 from stm2/bug1973 
cr_report should also check if region messages can be heard (bug #1973)
 2015-02-01 12:28:17 +01:00
Enno Rehling ba26897872 Merge branch 'master' of github.com:eressea/server 2015-02-01 12:25:35 +01:00
Enno Rehling 4929ee1e5f Merge branch 'stm2-nr_localization_fix' 2015-02-01 12:24:38 +01:00
Enno Rehling 9a395127ac Merge branch 'nr_localization_fix' of https://github.com/stm2/server into stm2-nr_localization_fix 
Conflicts:
	src/report.c
 2015-02-01 12:24:19 +01:00
Enno Rehling c75012b61d Merge pull request #119 from stm2/giant_message_typo_fix 
translated English messages and fixed a ton of typos
 2015-02-01 11:44:18 +01:00
Enno Rehling 92c6e1382d Merge pull request #123 from badgerman/master 
small problems found in the last preview before the 3.4 release
 2015-02-01 10:50:03 +01:00
Enno Rehling 025998fa0d Merge branch 'master' of github.com:eressea/server 2015-02-01 10:40:17 +01:00
Enno Rehling 03cddee6b7 Small plural/singular fix in German message. 2015-02-01 10:39:36 +01:00
Enno Rehling 3fc434e1b9 bug 2072: make peasant growth not spam messages. 2015-02-01 10:27:00 +01:00
Enno Rehling da9c33268c fix preview crash in embassies.lua. 
the "objects" dictionary is no longer of type hashtable, that usertype has been renamed to dict.
 2015-02-01 10:03:30 +01:00
Enno Rehling b06efdfa75 I cannot get this to work, hacking it 2015-02-01 08:37:04 +01:00
Enno Rehling a567fe9ed0 function is a bash-ism 2015-02-01 08:29:21 +01:00
Enno Rehling 6b1285a784 fix preview script so it can checkout and build from tags 2015-02-01 08:21:07 +01:00
Enno Rehling 5e0c934c6f indentation fixes for this new file 2015-01-30 22:30:11 +01:00
Enno Rehling 02f92f7932 Merge branch 'stm2-peasantgrowth_acceleration' 2015-01-30 22:25:21 +01:00
Enno Rehling df5ab02689 Merge branch 'peasantgrowth_acceleration' of https://github.com/stm2/server into stm2-peasantgrowth_acceleration 2015-01-30 22:11:10 +01:00
Enno Rehling c54cbfd472 fix copyright notice 2015-01-30 22:10:29 +01:00
Enno Rehling a97a7bbf1d Merge branch 'master' of github.com:eressea/server 
Conflicts:
	src/kernel/item.test.c
 2015-01-30 20:44:42 +01:00
Steffen Mecke 5e4ea5a145 fixed formatting errors 2015-01-30 20:43:40 +01:00
Enno Rehling 195f259a30 Merge branch 'badgerman-master' 2015-01-30 20:42:19 +01:00
Enno Rehling abca25d1d5 fix indentation in every file 
fix copyright date
remove vi ts=2 code
remove a couple of superfluous extern declarations
 2015-01-30 20:37:14 +01:00
Enno Rehling 45ebe35681 Merge branch 'master' of github.com:badgerman/eressea 2015-01-30 19:57:46 +01:00
Steffen Mecke a97b211e70 bit of testing, code improvements, formatting 2015-01-30 18:25:56 +01:00
Steffen Mecke 4c391ae6f6 implemented Enno's suggestions for peasant growth 2015-01-29 23:55:02 +01:00
Enno Rehling 633a356928 Merge pull request #117 from stm2/mallorncursemessage 
mallorn spell used wrong error message
 2015-01-29 21:58:43 +01:00
Enno Rehling 87735c6c8e Merge pull request #121 from badgerman/version-3-4 
Version 3.4 final preparations before launch
 2015-01-29 18:08:58 +01:00
Enno Rehling fb2200f79f Merge branch 'badgerman-version-3-4' into version-3-4 2015-01-29 18:04:09 +01:00
Enno Rehling c3ed521d4f Merge branch 'version-3-4' of https://github.com/badgerman/eressea into badgerman-version-3-4 
Conflicts:
	src/laws.c
 2015-01-29 18:03:21 +01:00
Enno Rehling c8b9e67e95 Merge branch 'master' of github.com:badgerman/eressea 2015-01-29 17:02:05 +01:00
Enno Rehling 372e8ff20f remove old configuration files, they are confusing and no longer valid. 2015-01-29 17:00:38 +01:00
Enno Rehling 7527e6e903 disable silver weight for the initial rollout of version 3.4 
two weeks after launch, revert this commit
 2015-01-29 16:56:21 +01:00
Enno Rehling c7b28e7b39 disable ORIGIN at the source, prevent gcc warnings. 2015-01-29 16:46:03 +01:00
Enno Rehling 2260a19d50 disable ORIGIN command because of E4 crash 2015-01-26 07:24:18 +01:00
Enno Rehling 7bfb14b4e6 Resolve naming confusion, rename object and bind_hashtable. 
They implement a dict-style thing, so let's call it that.
 2015-01-17 13:34:48 +01:00
Enno Rehling ee0e159ad9 Merge pull request #118 from stm2/bug1506 
fixed message for metals requiring a building (bug #1506)
 2015-01-16 07:47:50 +01:00
Enno Rehling dadf7734a5 set defaults in the race constructor, add test. 2015-01-15 17:17:58 +01:00