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

5264 Commits

Author SHA1 Message Date
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
Enno Rehling 9f542e081b fix last commit, broke the gcc travis build. 2015-01-15 17:17:32 +01:00
Enno Rehling 490782e750 add some simple tests for messages, prior to any refactorings. 2015-01-15 16:40:19 +01:00
Steffen Mecke 531ab0e7a2 add configuration parameters for peasant growth and peasant luck effect 2015-01-15 13:34:50 +01:00
Steffen Mecke ec6560a281 adding a nice region message 2015-01-15 03:48:19 +01:00
Steffen Mecke 863901d482 putting faster version into effect and removing pseudo-test 2015-01-15 02:53:15 +01:00
Steffen Mecke 51d52aaf7f implementing a much faster version of peasant growth calculation 2015-01-15 02:53:15 +01:00
Enno Rehling 6fb23af66a test that ships are encumbered by money. define money in XML, not just in code. 2015-01-14 17:56:12 +01:00
Steffen Mecke 3433ffd1bc cr_report should also check if region messages can be heard (bug #1973) 2015-01-14 16:24:22 +01:00
Steffen Mecke 039ee159cb a bunch of messages in the NR where not localized 2015-01-14 16:17:21 +01:00
Enno Rehling 468882f974 test that money has weight, add weight in init_resources (TODO: use the config files). 2015-01-14 07:46:42 +01:00
Steffen Mecke e727f9e9d4 translated English messages and fixed a ton of typos 2015-01-14 01:59:10 +01:00
Steffen Mecke 9142b79614 fixed message (bug #1506) 2015-01-14 01:58:26 +01:00
Steffen Mecke dff34f8e92 increase speed of peasant growth calculation 2015-01-14 01:55:04 +01:00
Steffen Mecke e6538439fb mallorn spell used wrong error message 2015-01-14 01:54:55 +01:00
Enno Rehling 9f9043e4dd Merge pull request #97 from badgerman/bug-2059-force-leave 
Bug 2059: force non-allies to leave ships and buildings
 2015-01-13 17:24:19 +01:00
Enno Rehling 73e1632dee Merge branch 'bug-2059-force-leave' of github.com:badgerman/eressea into bug-2059-force-leave 
Conflicts:
	src/laws.c
	src/laws.test.c
 2015-01-13 07:48:46 +01:00
Enno Rehling 4f2d9260d1 add a message to the unit that gets kicked, with tests 2015-01-13 07:43:30 +01:00
Enno Rehling f52e00d574 do not eject units from a ship when on the ocean. 2015-01-13 07:32:24 +01:00
Enno Rehling 698aa5e99a Bug 2059: building owners kick out anyone they don't HELP GUARD. 2015-01-13 07:32:23 +01:00
Enno Rehling 838cf3d938 try to allow visual studio to build with all warnings (/WAll) enabled. 2015-01-12 22:53:21 +01:00
Enno Rehling 690a174ffa Merge pull request #107 from badgerman/master 
building bonus fix for E3 and E4, again
 2015-01-12 20:38:07 +01:00
Enno Rehling 2ddd5d242a Merge branch 'master' of github.com:badgerman/eressea 2015-01-12 20:25:09 +01:00
Enno Rehling e6fb26c800 Merge branch 'CTD1-Burgen_Bonus_configurierbar' 2015-01-12 20:24:05 +01:00
Enno Rehling 2aac2daf56 fix the castle bonus PR so it can pass gcc. 2015-01-12 20:23:25 +01:00
Enno Rehling e897b667f6 Merge branch 'Burgen_Bonus_configurierbar' of https://github.com/CTD1/eressea-server-bugfixing into CTD1-Burgen_Bonus_configurierbar 2015-01-12 20:10:34 +01:00
Enno Rehling 9404afa4ea Merge pull request #106 from badgerman/master 
fix magicstreets (Bug 2066) and dreams (Bug 1511)
 2015-01-12 18:39:08 +01:00
Enno Rehling 34e7373be4 fix the CI build (struct declared inside parameter list). 2015-01-12 18:31:04 +01:00