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

5962 Commits

Author SHA1 Message Date
Enno Rehling 5bc4f7f144 add some simple tests for writing travelthru information to the report, fix test that sets errno as a side effect (thanks, Microsoft!) 2015-08-18 17:08:02 +02:00
Enno Rehling a91e4c6e71 Merge pull request #277 from ennorehling/feature/bug-2128-travelthru-length 
refactoring: wrptr takes an int, not a size_t
 2015-08-18 10:26:56 +02:00
Enno Rehling c8cbeea660 STRLCPY macro redefinition and fixes for gcc. work for monkeys. 2015-08-17 22:48:21 +02:00
Enno Rehling 681697fd47 gcc still more picky than clang. 2015-08-17 20:32:02 +02:00
Enno Rehling e621b97465 Easy pratfall: Visual Studio includes limits.h through stdlib.h, but gcc/clang do not. 2015-08-17 20:22:02 +02:00
Enno Rehling 1042c94fd9 quickly fix gcc conversion warnings. lots of DRY. 2015-08-17 20:17:02 +02:00
Enno Rehling b999e3c963 replace strlcpy/wrptr pairs with new STRLCPY macro. 2015-08-17 19:37:02 +02:00
Enno Rehling 7e64f3177d refactoring: rewrite tests to use test_find_messagetype instead of assert_messages. 
tests: add cleanup of message_types to reduce global state.
 2015-08-17 19:36:28 +02:00
Enno Rehling 1806030baa new all-in-one strlcpy and wrptr function 2015-08-17 19:28:05 +02:00
Enno Rehling dcececf4fa Debug: move errno testing closer to the report-writing, so we know which report caused the error. 
Fix: wrptr gets the result from _snprintf, which is int, not size_t.
 2015-08-17 16:17:08 +02:00
Enno Rehling df5eaa6ef2 eliminate warning (unused variable) 2015-08-16 19:55:11 +02:00
Enno Rehling 09dc31f986 Merge pull request #276 from ennorehling/feature/bug-2007-report-final-battle 
Bug 2007: show battles in final report
 2015-08-16 12:20:42 +02:00
Enno Rehling 3fe0e62105 do not remove battles from dead faction before writing the report. 2015-08-16 12:06:05 +02:00
Enno Rehling 9dbcbe4e65 Merge pull request #275 from ennorehling/feature/bug-2073-duplicate-section 
bug 2073: duplicate message sections in the report
 2015-08-16 11:36:40 +02:00
Enno Rehling 27b5588e8f Merge region messages and individual messages before writing them into the report. 
This fixes https://bugs.eressea.de/view.php?id=2073
 2015-08-16 11:30:44 +02:00
Enno Rehling 711bd81cc7 Merge pull request #274 from ennorehling/feature/bug-2116-password-message 
Bug 2116: Make sure Magellan can read the password from the first report
 2015-08-15 20:31:05 +02:00
Enno Rehling 47dccc667b Add a message that contains the password in the first report, so Magellan can pick it up. 
Fix a bad type conversion when setting skills.
 2015-08-15 20:25:36 +02:00
Enno Rehling 16e922c334 Merge pull request #273 from ennorehling/feature/fix-bad-spell-tests 
managed to commit some broken tests, and travis let them pass.
 2015-08-07 18:36:34 +02:00
Enno Rehling 0af5df470b managed to commit some broken tests, and travis let them pass. something is wrong with the CI tests. 2015-08-07 18:30:02 +02:00
Enno Rehling a634b115a7 Merge pull request #272 from ennorehling/feature/bug-2121-homestone-messages 
Bug 2121: wrong messages for homestone spell effects
 2015-08-07 16:34:13 +02:00
Enno Rehling 398579c293 remove duplication, fix a stray blank space in the NR. 2015-08-07 16:17:11 +02:00
Enno Rehling 816243d2d7 magicians can always identify their own curse-effects. 
magic-resistance on a building is always visible to anybody, just like it is on units.
 2015-08-07 15:52:10 +02:00
Enno Rehling 93f3a85d48 Merge pull request #270 from ennorehling/feature/bug-2118-ship-max-range 
feature 2118: high skills can give a higher maximum range
 2015-08-07 13:34:11 +02:00
Enno Rehling 00423a746b clarify the good/bad dreams tests 2015-08-07 13:26:41 +02:00
Enno Rehling 12a2a1f412 get_captain is wrong, the rules say the captain is the FIRST unit in the ship, which I believe means ship_owner, not best skill. 
clean up shipspeed tests a little (WIP, missing edge cases).
ignore some temporary files.
 2015-08-07 13:07:45 +02:00
Enno Rehling 5537f0ac68 simple and basic tests for ships 2015-08-07 13:03:19 +02:00
Enno Rehling 3bfc05c3b0 test bonus for new ship-speed rules (WIP). 2015-08-07 13:03:19 +02:00
Enno Rehling b72f48c044 enhanced ship speed for selected ships (currently none). 2015-08-07 12:51:20 +02:00
Enno Rehling c322fbffd5 rename ship_sailors to crew_skill, it's more descriptive 2015-08-07 12:46:32 +02:00
Enno Rehling afbc4c816b refactoring ship speed, extract total skills of sailors into a function. 2015-08-07 12:43:18 +02:00
Enno Rehling eb1d3e4664 Merge pull request #269 from ennorehling/feature/bug-2126-ship-damage 
Bug 2126: ship damage effect on speed
 2015-08-07 12:08:21 +02:00
Enno Rehling bfdef37808 fix the test and the formula for damaged ships' speeds. 2015-08-07 12:03:33 +02:00
Enno Rehling 8636aabe8a tests for existing shipspeed features, failing ship for ship-damage. 2015-08-07 11:50:49 +02:00
Enno Rehling b3a8a95a24 cherry-picking ship tests from range_max code 2015-08-07 11:48:46 +02:00
Enno Rehling da2b116ea9 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2015-08-07 00:17:36 +02:00
Enno Rehling 45ecd8099b Merge branch 'ennorehling-feature/test-world' into develop 2015-08-07 00:16:42 +02:00
Enno Rehling d1b638f9b1 Merge branch 'feature/test-world' of https://github.com/ennorehling/eressea into ennorehling-feature/test-world 
Conflicts:
	scripts/tests/e2/init.lua
	scripts/tests/e3/init.lua
 2015-08-07 00:16:32 +02:00
Enno Rehling af8a24e214 I'm pretty sure this is already fixed in develop, but who knows. 2015-08-07 00:09:18 +02:00
Enno Rehling 0e1f318a0c Merge remote-tracking branch 'upstream/develop' into develop 
Conflicts:
	scripts/tests/e2/init.lua
	src/battle.c
	src/magic.c
	src/magic.h
 2015-08-06 20:56:06 +02:00
Enno Rehling 04db291c8b disable random study in test to make it not intermittent 2015-08-06 20:48:14 +02:00
Enno Rehling c0a760a645 Merge branch 'develop' of github.com:eressea/server into develop 2015-08-06 19:54:51 +02:00
Enno Rehling 2305466853 Merge branch 'ennorehling-feature/bug-1588-magicpower-limit' into develop 
normalize use of MagicPower, only use it when setting castorder.force
 2015-08-06 19:53:53 +02:00
Enno Rehling 6c8300a47e Merge branch 'feature/bug-1588-magicpower-limit' of https://github.com/ennorehling/eressea into ennorehling-feature/bug-1588-magicpower-limit 
Conflicts:
	scripts/tests/e2/init.lua
	src/battle.c
	src/bind_unit.c
	src/kernel/spellid.h
	src/magic.c
	src/magic.h
 2015-08-06 19:53:24 +02:00
Enno Rehling 3081a89f1c Merge branch 'develop' of github.com:ennorehling/eressea into develop 2015-08-06 19:17:00 +02:00
Enno Rehling 447ea318d1 Merge branch 'feature/bug-1588-magicpower-limit' into develop 2015-08-06 19:16:32 +02:00
Enno Rehling 397a157fdc Merge branch 'develop' into feature/bug-1588-magicpower-limit 
Conflicts:
	scripts/tests/e2/init.lua
	src/battle.c
	src/bind_unit.c
	src/kernel/spellid.h
	src/magic.c
	src/magic.h
 2015-08-06 19:16:05 +02:00
Enno Rehling 4c877288d3 remove spellid.h, it represents an outdated way of doing things. 
merge the enum into combatspells, and reduce it to the spells actually used here.
 2015-08-06 17:57:51 +02:00
Enno Rehling 01649ce682 Merge pull request #266 from ennorehling/feature/bug-2101-study-teach-testing 
bug 2101: increase max printed length of orders
 2015-08-06 17:12:41 +02:00
Enno Rehling b8a2b9d0b7 Merge pull request #7 from ennorehling/feature/bug-2101-study-teach-testing 
bug 2101: increase max printed length of orders
 2015-08-06 17:05:32 +02:00
Enno Rehling 1e6a83f357 resize buffer in eval_command, it was too small for many commands. 
increase MAXTEACHERS.
eliminate oldterrain warning in json_report.
 2015-08-06 16:52:24 +02:00