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

803 commits

Author SHA1 Message Date
Steffen Mecke
3433ffd1bc cr_report should also check if region messages can be heard (bug #1973) 2015-01-14 16:24:22 +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
2ddd5d242a Merge branch 'master' of github.com:badgerman/eressea 2015-01-12 20:25:09 +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
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
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
60e2e23414 Merge branch 'master' of github.com:eressea/server 
Conflicts:
	s/cron/previews.sh
 2015-01-09 20:50:43 +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
CTD
5b82e7709d Beim Aufräumen was vergessen. 2015-01-09 16:00:11 +01:00
CTD
ac3195851a Erstmal nur der Burgenbonus 
Das mit der Größe kommt noch mal extra, der Übersicht wegen.
Sinvoller weise kann man den Bonus jetzt in der castle.xml einstellen.
Mit neuen Defaultwerten in den XML Dateien.
 2015-01-09 15:53:14 +01:00
Enno Rehling
23b8f2bc8a call init_locales after parse_json from Lua, downgrade missing string warnings during that to DEBUG (because it's quite common not to have them). 
also, these int to bool conversion warnings made a good point, even if I could not reproduce them.
 2015-01-08 20:55:29 +01:00
Enno Rehling
d968aa2ed5 do not eject units from a ship when on the ocean. 2015-01-05 22:09:08 +01:00
Enno Rehling
73da256461 Bug 2059: building owners kick out anyone they don't HELP GUARD. 2015-01-05 18:14:55 +01:00
Enno Rehling
04bbec2b89 turns out that set_param with null should remove the setting. 2015-01-04 16:41:59 +01:00
Enno Rehling
3db403d7fd functional test for GROW/BREED horses (Bug 1886) 2015-01-04 15:42:36 +01:00
Enno Rehling
90dd700487 BREED/PLANT/GROW are technically the same command, merge them. 
The new parser makes this easy.
 2015-01-04 15:11:49 +01:00
Enno Rehling
4ed469c126 do not try setting luxury demand on oceans. 
add some old E3 tests, disable those that have rotted.
 2015-01-01 10:12:03 +01:00
Enno Rehling
b713f650e6 Merge branch 'master' of github.com:badgerman/eressea 2014-12-31 21:14:43 +01:00
Enno Rehling
b29a99f9ce memory leak in special_directions. 2014-12-31 21:14:21 +01:00
Enno Rehling
f1c6d35fdf unused variable, gcc complains 2014-12-31 21:08:59 +01:00
Enno Rehling
9453aff7f5 fix running game-specific tests for E3, add them to the test suite. 2014-12-31 21:07:42 +01:00
Enno Rehling
db083389c7 avoid fix_demand hitting an endless loop, kill bad use of static variables. 2014-12-31 20:01:01 +01:00
Enno Rehling
5e10bc4093 wait, no. tests did not pass when that change was made (for good reason, I assume). 2014-12-31 13:19:44 +01:00
Enno Rehling
f524f23cd4 superfluous semicolons and other small stuff. 
missing strings are an error, not a warning.
 2014-12-31 13:17:54 +01:00
Enno Rehling
e8ad542430 more thorough cleanup of tokens. 2014-12-31 01:50:54 +01:00
Enno Rehling
3b5653b353 all good tests cleanup after themselves. 2014-12-31 01:40:46 +01:00
Enno Rehling
6abe180f68 free spellbooks correctly. 2014-12-31 01:38:49 +01:00
Enno Rehling
e9c3a00f7d it sucks that get_translations sometimes returns tokens, and sometimes critbit_trees. How is anyone supposed to free that correctly? 2014-12-31 01:29:10 +01:00
Enno Rehling
2fbb04140c at_deprecated was causing a small memory leak. 2014-12-31 01:17:49 +01:00
Enno Rehling
c39be8d599 more casual leak removal. 2014-12-31 01:00:10 +01:00
Enno Rehling
80be0a8e89 I broke the Lua tests, must initialize resources in eressea.free_game binding 2014-12-31 00:20:19 +01:00
Enno Rehling
e04a541167 do not initialize resources in test_cleanup, that makes no sense. 2014-12-31 00:16:24 +01:00
Enno Rehling
0566dca971 Merge branch 'master' of github.com:badgerman/eressea 2014-12-30 23:50:01 +01:00
Enno Rehling
228983202d properly free items at cleanup. 2014-12-30 23:49:50 +01:00