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

5247 Commits

Author SHA1 Message Date
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
Enno Rehling e8650b5b4a test good and bad dreams, fix magicstreet test. 2015-01-12 18:22:59 +01:00
Steffen Mecke 27da082cc6 corrected good dreams message 2015-01-12 18:22:00 +01:00
Steffen Mecke fdac137c0c magic path warning was wrong way round 2015-01-12 18:21:41 +01:00
Enno Rehling 6159311e70 Merge pull request #104 from badgerman/tests-magicpath 
Tests for magicpath (currently failing)
 2015-01-12 18:02:51 +01:00
Enno Rehling 0bd1a8d6f4 add a utility function to test for message types. 2015-01-12 17:50:10 +01:00
CTD d403afc7fc Einfacher Test 
Plus Bugfix für Gebäude ohne Improvement, damit diese auch die gleiche
Funktionalität aus der XML nutzen können.
 2015-01-12 16:57:05 +01:00
CTD 34fc1b3d34 Variablen leserlicher gemacht 2015-01-12 10:55:07 +01:00
Enno Rehling 798b3d6ad6 Implement tests for magicpath. They are failing (Bug 2066). 
Also move spell and race initialization code from being server-only into game_init, where tests can use it.
 2015-01-12 08:18:41 +01:00
Enno Rehling e937749475 Merge branch 'version-3-3' 
Conflicts:
	src/build.h
	src/kernel/faction.c
 2015-01-11 01:25:10 +01:00
Enno Rehling 95d0b2a413 add current version of processing scripts 
fix a crash in checkpasswd
 2015-01-11 01:23:47 +01:00
Enno Rehling b6ff715e54 Merge pull request #102 from badgerman/master 
improve project build times by making server and unit tests share a library
 2015-01-10 18:02:37 +01:00
Enno Rehling 4b6d65fb16 separate the game into a static library shared by server and tests. 2015-01-10 17:27:18 +01:00
Enno Rehling 3d4fefcf7c Some additional TODO comments for things I want to tackle eventually. #comment-only 2015-01-10 17:05:10 +01:00
Enno Rehling 9ce9cddd1f I have no idea why this worked, since my eressea/git is a symlink, 
and that means ../git is not equal to cwd.
 2015-01-09 21:53:06 +01:00
Enno Rehling 60e2e23414 Merge branch 'master' of github.com:eressea/server 
Conflicts:
	s/cron/previews.sh
 2015-01-09 20:50:43 +01:00
Enno Rehling fd0f3fa351 Merge pull request #101 from badgerman/master 
build preparations for version 3.4
 2015-01-09 20:48:39 +01:00
Enno Rehling ba71728a64 preview build script checks for a branch to build from (in build/.preview) 
fix int to bool conversions
 2015-01-09 20:42:17 +01:00