Commit Graph

5141 Commits

Author SHA1 Message Date
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
Enno Rehling 88fed0b418 build previews from the 3.4 branch 2015-01-09 20:27:18 +01:00
Enno Rehling 90f4ed9753 Merge pull request #98 from badgerman/master
init_locales changes and minor things
2015-01-08 21:44:07 +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 d3524b9eab do not write reports from tests 2015-01-04 16:43:47 +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 eb5c912805 Merge pull request #96 from badgerman/bug-1882
functional tests for orders with more than one name
2015-01-04 15:48:45 +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 0aa002a6d2 Functional test for bug 1882: Verify that COMBAT/FIGHT/KÄMPFE have the desired effect. 2015-01-04 13:20:11 +01:00
Enno Rehling eed26eddd4 Merge pull request #95 from badgerman/master
when tests are modifying important global state, they should reset it.
2015-01-03 16:53:11 +01:00
Enno Rehling 14b1a164ed when tests are modifying important global state, they should reset it in teardown.
TODO: actually, they probably should not modify state in the first place.
2015-01-03 16:11:33 +01:00
Enno Rehling be6d2c5668 Merge pull request #94 from badgerman/master
Spelling (bug 2061) and setting luxuries
2015-01-02 13:45:30 +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 66ba288bae type in spell description (bug 2061).
https://bugs.eressea.de/view.php?id=2061
2014-12-31 22:43:08 +01:00
Enno Rehling 64ac0ae5e4 Merge pull request #93 from badgerman/master
E3 Lua Tests & memory leaks removed
2014-12-31 21:26:48 +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
Enno Rehling 9f09b9b915 fixed memory leaks in tests, thanks to valgrind 2014-12-30 23:34:24 +01:00
Enno Rehling a55cb13924 make valgrind happy when running tests (cleanup) 2014-12-30 02:02:10 +01:00
Enno Rehling 49a77cdcde plug some more memory leaks. 2014-12-30 01:44:28 +01:00
Enno Rehling 89ce04a6c3 this obviously cannot be const, then. fix the build. 2014-12-30 00:02:27 +01:00
Enno Rehling 077a0aeeef plug some new memory leaks 2014-12-30 00:00:57 +01:00
Enno Rehling 95ab2826ec avoid running over the array of locales in order.c when re-creating locales for tests. 2014-12-29 23:53:00 +01:00
Enno Rehling 43351e03cd parsing needs to return a static buffer if it has no argument 2014-12-29 07:44:00 +01:00
Enno Rehling 6ffec7017c Merge branch 'master' of github.com:eressea/server 2014-12-29 07:33:49 +01:00
Enno Rehling f8fd0bed39 Merge pull request #92 from badgerman/master
miscellaneous refactoring
2014-12-29 07:33:16 +01:00
Enno Rehling 335f37a9ec clarify some parsing code that valgrind complains about. 2014-12-28 22:07:53 +01:00
Enno Rehling 880b965c54 Merge branch 'version-3-3'
Conflicts:
	src/build.h
2014-12-28 17:29:34 +01:00
Enno Rehling 50aa3cc444 backup with orders after the turn is done 2014-12-28 17:27:49 +01:00
Enno Rehling 975b930f44 Merge branch 'version-3-3'
Conflicts:
	src/build.h
2014-12-27 23:57:16 +01:00
Enno Rehling df3ce116a7 limit eternath gates to 1-person units, avoid crash 2014-12-27 23:51:48 +01:00
Enno Rehling f1008fa231 fix floating point exception. 2014-12-26 01:41:19 +01:00