Commit Graph

1224 Commits

Author SHA1 Message Date
Enno Rehling 3fc3660152 ignore PVS=-Studio files 2015-07-12 14:17:18 +02:00
Enno Rehling c0c3400f21 remove junk files, thank you windows 2015-07-12 11:01:59 +02:00
Enno Rehling 7087c0e0ab Update to latest submodules, fix iniparser and critbit.
I did this before, must have lost it in the merge. Crazy.
2015-07-12 10:38:01 +02:00
Enno Rehling 083c848db1 merge with latest hotfix 2015-07-12 04:53:10 +02:00
Enno Rehling 11e1fab0d0 Merge branch 'hotfix-3.4.1' into feature/travis-migration
Conflicts:
	.travis.yml
	s/build
	s/cmake-init
	s/runtests
	s/travis-build
	src/kernel/region.c
2015-07-12 04:12:32 +02:00
Enno Rehling cfb1812f24 fix building on RasPi 2015-07-12 03:08:29 +02:00
Enno Rehling a3a2e3074d uninitialized variable 2015-07-12 01:38:22 +02:00
Enno Rehling c6da0c2189 fix tolua, I guess 2015-07-11 23:45:59 +02:00
Enno Rehling bf4bad92db disable broken test, try new travis infrastructure 2015-07-11 16:02:51 +02:00
Enno Rehling 27835dc4e1 unit tests for STUDY and TEACH commands. 2015-07-09 13:24:21 +02:00
Enno Rehling 034d1d5433 Merge branch 'feature/rename-cerddor' into develop 2015-07-08 19:03:45 +02:00
Enno Rehling 434923ec67 Merge pull request #257 from badgerman/feature/rename-cerddor
Bug 2115: fix the name of Cerddor everywhere.
2015-07-08 18:57:08 +02:00
Enno Rehling b8e17839a7 eliminate some spammy warnings. 2015-07-08 18:27:27 +02:00
Enno Rehling 05f444bab1 Merge branch 'feature/rename-cerddor' into develop 2015-07-08 17:53:09 +02:00
Enno Rehling efe2185b13 fix build, eliminate unused variables/functions. 2015-07-08 05:17:10 +02:00
Enno Rehling 6abf8f7adb bug 1692: rewrite of magicresistance curse-info, especially for buildings (homestome spell). 2015-07-08 05:12:26 +02:00
Enno Rehling d7f4fbe05d remove enum constants for curses that are no longer referred to by them (deprecated style). 2015-07-07 21:10:18 +02:00
Enno Rehling c8ffe8da7a Bug 2115: fix cerrdor -> cerddor spelling errors. 2015-07-07 20:30:34 +02:00
Enno Rehling cc3c5580d4 rewrite and unit tests 2015-07-07 20:23:24 +02:00
Enno Rehling 76a9dd6741 Merge remote-tracking branch 'upstream/develop' into develop 2015-07-07 15:34:42 +02:00
Enno Rehling 391a123a3e test that correct messages are sent to correct factions. 2015-07-07 14:42:07 +02:00
Enno Rehling f9130fcb38 some more easy tests for sabotage. 2015-07-07 13:38:14 +02:00
Enno Rehling d7e5876c62 fix build, missing limits.h include 2015-07-07 09:44:24 +02:00
Enno Rehling 1e669472a6 add a test and fix potential crashes in SABOTAGE command.
sometimes even a simple test will uncover a ton of small errors.
2015-07-07 09:29:43 +02:00
Enno Rehling e25d3c8ed1 Fix a bug reporting DETROY messages to the correct unit.
Add missing not-null assertions before accessing function parameters.
Eliminate all of the PVS-Studio warnings.
2015-07-07 00:49:12 +02:00
Enno Rehling 05ec74f9ec annotate with finds from PVS Studio trial static analysis 2015-07-06 21:31:27 +02:00
Enno Rehling 09db2fe278 jsreport: return error if file not open. add scan-build to travis 2015-07-06 20:49:13 +02:00
Enno Rehling ef4052b0f6 the outcome of a casual static analysis session. 2015-07-06 19:53:09 +02:00
Enno Rehling 17fb05b167 Merge pull request #253 from badgerman/feature/bug-1692-magicresistance-visibility
bug 1692: magicresistance visibility
2015-07-06 17:59:16 +02:00
Enno Rehling 960e0f8024 do not show magic resistance effects to other than the unit's own faction.
https://bugs.eressea.de/view.php?id=1692
2015-07-06 16:13:22 +02:00
Enno Rehling 7906d4469d return to old mechanism of equipping the first unit, and give some basic necessities to special races. 2015-07-05 16:40:49 +02:00
Enno Rehling 4e67c4ac3f do not remove new players for missing their first turn. 2015-07-05 15:24:46 +02:00
Enno Rehling 6df1e3eeb0 Merge pull request #250 from badgerman/feature/newplayer-fixes
some fixes for new players
2015-07-05 15:21:54 +02:00
Enno Rehling a28ca695fd start new hotfix branch 2015-07-05 15:19:38 +02:00
Enno Rehling ae8c448698 do not remove new players for missing their first turn. 2015-07-05 14:07:59 +02:00
Enno Rehling fab3f0a8c0 Merge pull request #249 from badgerman/feature/bug-1596-flee-tactics-round
Bug 1596: Schwer verwundete fliehen auch nach der Taktik-Runde.
2015-07-04 18:12:59 +02:00
Enno Rehling 1e9e3a3b6a Bug 1596: Schwer verwundete fliehen auch nach der Taktik-Runde.
https://bugs.eressea.de/view.php?id=1596
remove an unnecessary (and wrong) check.
2015-07-04 17:54:00 +02:00
Enno Rehling 40cd6b3bc4 Merge pull request #248 from badgerman/feature/bug-1838-deathcloud-duration
Bug 1838: deathcloud duration and messages
2015-07-03 18:32:25 +02:00
Enno Rehling af004bb27b individual poison damage messages 2015-07-03 18:27:10 +02:00
Enno Rehling c42227c9e4 Bug 1838: Giftwolken dauern nur eine Woche, erscheinen nicht im Report.
https://bugs.eressea.de/view.php?id=1838
- fix dc_age return value
- speed up curse reporting a little
2015-07-03 17:36:37 +02:00
Enno Rehling 59745c7ed0 parentheses to fix operator precedence. 2015-07-03 16:13:24 +02:00
Enno Rehling 979f3460d6 Bug 1805: re-enable NMR warnings
https://bugs.eressea.de/view.php?id=1805
move warnings to the top of the list of errors in the NR
2015-07-03 15:31:57 +02:00
Enno Rehling b2d981e577 improved tests for DESTROY, fix destroy-after-attack 2015-07-03 13:08:06 +02:00
Enno Rehling 13ed70f2fd Merge pull request #245 from badgerman/feature/bug-1950-flee-and-guard
Bug 1950: fleeing units can guard the same turn.
2015-07-02 18:12:03 +02:00
Enno Rehling a2376290d8 Bug 1950: fleeing units can guard the same turn.
checking for UFL_FLEEING in can_start_guarding should make that impossible now.
https://bugs.eressea.de/view.php?id=1950
2015-07-02 17:52:22 +02:00
Enno Rehling 98c161869f Merge pull request #244 from badgerman/develop
Bug 1861 (MAXTEACHERS) and misc fixes
2015-07-02 16:32:25 +02:00
Enno Rehling f054ea114b Bug 1861: increase MAXTEACHERS, warn if it is still too small. 2015-07-02 16:23:38 +02:00
Enno Rehling bfd93c68b2 remove bogus assert 2015-07-02 15:44:21 +02:00
Enno Rehling a975073c0d fix an issue when reading pre-spellbook datafiles for E3. 2015-07-02 14:39:13 +02:00
Enno Rehling 31ca0ce052 fix a parser crash in the USE command. 2015-07-02 13:42:15 +02:00
Enno Rehling 37eb189cd0 Merge pull request #242 from badgerman/feature/bug-2080-move-after-destroy
bug 2080: long actions after DESTROY
2015-07-02 11:58:12 +02:00
Enno Rehling fc2b8f3471 bug 2080: long actions after DESTROY
https://bugs.eressea.de/view.php?id=2080
we forgot to set the flags. also added a test for the future.
2015-07-02 11:42:18 +02:00
Enno Rehling 78857d8aa3 Merge pull request #240 from badgerman/feature/bug-2069-familiar-races
bug 2069: familiar races
2015-07-02 11:23:25 +02:00
Enno Rehling b53d01eb18 Bug 1890: monsters do not respect the rules when giving excess weight to peasants.
https://bugs.eressea.de/view.php?id=1890
fixed by creating a give order instead of calling give_item directly.
2015-07-02 11:08:38 +02:00
Enno Rehling 414f6d3210 bug 2069: not all E3 magic schools have a familiar.
https://bugs.eressea.de/view.php?id=2069
quick fix: defaulting all additional schools to the illaun familiar.
2015-07-02 09:49:51 +02:00
Enno Rehling 15e9c5962c merge feature/test-cleanup
removing old test files
merging old tests into current system
fixing some internal bugs (i.e. adjust_coordinates)
2015-07-01 21:24:44 +02:00
Enno Rehling 0ee76ea8dd Bug 2113: player-owned dragons did not get movement bonuses.
https://bugs.eressea.de/view.php?id=2113
2015-06-26 20:12:01 +02:00
Enno Rehling 94ec39d7bb Bug 2114: broken army listing during combat.
https://bugs.eressea.de/view.php?id=2114
2015-06-26 14:44:28 +02:00
Enno Rehling 3ba2b3d4d7 indentation fixes (tab->spaces) 2015-06-26 14:31:21 +02:00
Enno Rehling 9b42824a5e Bug 2112: volcano stops smoking after it has erupted.
https://bugs.eressea.de/view.php?id=2112
2015-06-26 14:26:42 +02:00
Enno Rehling 6a42b6231e Merge branch 'master' into develop
Conflicts:
	src/buildno.h
2015-06-21 18:32:10 +02:00
Enno Rehling a085442b8f eliminate unused variable. 2015-06-21 17:54:39 +02:00
Enno Rehling 04bf7153f0 remove a faction from its alliance when it is dead. 2015-06-21 17:49:22 +02:00
Enno Rehling 659aa6c973 after combat, eject enemies only 2015-06-20 14:28:16 +02:00
Enno Rehling 9b7a4e813b functional test for forced leave configuration.
functional test for forced leave after combat.
functional test for MAKE TEMP.
error handling for Lua function building.create().
reduce some errors to warnings.
initialize race.battle_flags correctly (when not created through XML).
re-initialize processor in case config has changed.
handle missing translation of combat status, with error message.
2015-06-19 13:17:01 +02:00
Enno Rehling e7bffb7533 implement post-combat forced leave from ship/building 2015-06-19 07:53:11 +02:00
Enno Rehling e6b3a6da65 suppress valgrind warning form issue #227 2015-06-17 07:54:56 +02:00
Enno Rehling 272653f8ba fixing sea serpents with empty names, again. https://bugs.eressea.de/view.php?id=2057 2015-06-12 18:05:56 +02:00
Enno Rehling 4e33e59d64 more lua_pushinteger conversion for lua 5.3 2015-06-08 21:19:17 +02:00
Enno Rehling 84f8a9f746 calculate simple default scores for items that do not have one defined in XML. 2015-06-08 21:15:07 +02:00
Enno Rehling 2967cd59cf replace pushnumber with pushinteger where applicable (prep for Lua 5.3).
also kill an unreferenced string.
2015-06-08 20:53:40 +02:00
Enno Rehling 872721dc0f Merge branch 'master' of github.com:eressea/server 2015-06-08 09:46:55 +02:00
Enno Rehling 4a31bea3b9 increase build number, new version installed 2015-06-08 09:46:07 +02:00
Enno Rehling 563a08de97 Merge branch 'develop' of github.com:eressea/server into develop 2015-06-08 09:44:04 +02:00
Enno Rehling 266b019928 Merge branch 'hotfix/bug-2109-give-unit' of https://github.com/badgerman/eressea into badgerman-hotfix/bug-2109-give-unit
Conflicts:
	scripts/eressea/xmlconf.lua
2015-06-08 09:43:36 +02:00
Enno Rehling 12946615e5 Bugfix 2109: Einheiten lassen sich nicht mehr zwischen Parteien übergeben
https://bugs.eressea.de/view.php?id=2109
Wenn max_transfers < 0 war, wurde das nur in give_men richtig interpretiert, aber nicht in give_unit.
2015-06-08 09:06:20 +02:00
Enno Rehling 0dd02dbf72 add a test for give_unit between two allied factions. 2015-06-08 08:57:05 +02:00
Enno Rehling 59ddbf9f11 fix broken merge conflict 2015-06-08 08:52:24 +02:00
Enno Rehling 29753985f7 Merge branch 'master' into release-3-5
Conflicts:
	src/laws.test.c
2015-06-08 08:50:18 +02:00
Enno Rehling 6e9f889e77 Merge branch 'master' of github.com:eressea/server
Conflicts:
	src/laws.test.c
2015-06-08 08:47:36 +02:00
Enno Rehling 0de5d698de Fix the 'B' island generation to use the newfactions file, for use by new GMs.
configurable island size.
2015-06-02 15:29:21 +02:00
Enno Rehling c90496e60b Merge pull request #217 from badgerman/develop
enable clang warning for tautological comparisons
2015-06-02 00:27:04 +02:00
Enno Rehling 70967fc041 Merge pull request #216 from badgerman/feature/issue-198
issue #198: gmtool makes invalid demand
2015-06-01 23:39:41 +02:00
Enno Rehling 6895195659 gmtool makes invalid regions (github issue #198).
forgot to null a pointer after freeing it.
2015-06-01 19:56:53 +02:00
Enno Rehling 80deef30b0 additional clang warning for tautological comparisons.
added to catch a /Wall VS warning in Travis builds.
2015-06-01 08:04:46 +02:00
Enno Rehling 88be8f670d Merge pull request #215 from badgerman/stm2-cursefix2
testing curses with memstream
2015-05-31 11:30:44 +02:00
Enno Rehling 13a358005f fix memstream-based tests, new storage submodule. 2015-05-31 11:03:44 +02:00
Enno Rehling 69821b2a32 cleanup battle.h header
removed some unreferenced functions from battle.h, made them static in battle.c
2015-05-30 17:29:01 +02:00
Enno Rehling 618902f723 eliminate Visual C++ warning about pointless range check 2015-05-27 22:44:12 +02:00
Enno Rehling e954b210d4 Merge remote-tracking branch 'upstream/develop' into develop 2015-05-24 16:25:10 +02:00
Enno Rehling 59400b1e27 Merge branch 'release-3-5' into develop
Conflicts:
	s/runtests
	src/buildno.h
2015-05-24 14:10:42 +02:00
Enno Rehling 24fc66ad1e update build no, re-enable test 2015-05-24 14:05:03 +02:00
Enno Rehling a5f056b4b6 re-enable an assertion that was commented out.
fix a size_t range warning, change error code for wrptr().
2015-05-24 14:01:37 +02:00
Enno Rehling 4971795be1 Merge pull request #211 from badgerman/master
test_peasant_luck_effect failure on x86
2015-05-24 13:49:57 +02:00
Enno Rehling 9695b49f40 fix floating point inconsistency on 32-bit x86 CPUs 2015-05-24 13:12:23 +02:00
Enno Rehling 0c3e310e39 working around floating point inconsistencies on 32 bit x86s 2015-05-24 13:06:20 +02:00
Enno Rehling 1371985776 working around a possible bug in gcc 4.9.2-10ubuntu13 2015-05-24 12:20:24 +02:00
Enno Rehling 6260a45be5 running the test 1000 times should not change the result.
if it does, that is because it depends on state (of the random number generator), which is bad and needs to be fixed if it makes the test intermittent.
2015-05-24 11:32:16 +02:00
Enno Rehling 4b721e074d diable test_peasantluck, it fails on master
do not load any config for run-tests.lua
2015-05-24 10:31:11 +02:00
Enno Rehling 34b1ead0ac Make GiveRestriction default to 0, do not cache the value in a static variable. 2015-05-24 07:44:02 +02:00
Enno Rehling 6f50027088 use_item can return positive values now 2015-05-24 07:43:11 +02:00
Enno Rehling e99db198eb bugfix use_item (use_skillpotion did not use pool).
from here on, all use_* functions return the number of items used, and
use_item handles removing them from the unit (or the pool).
2015-05-24 07:17:23 +02:00
Enno Rehling 2ddabc1477 Merge branch 'cursefix2' of https://github.com/stm2/server into stm2-cursefix2 2015-05-22 17:27:51 +02:00
Enno Rehling 3e93ebfcb7 Merge pull request #206 from badgerman/feature-giverestriction-default
Make GiveRestriction default to 0, do not cache
2015-05-22 17:25:15 +02:00
Enno Rehling 73fa9a276d Make GiveRestriction default to 0, do not cache the value in a static variable. 2015-05-22 16:23:18 +02:00
Enno Rehling 1a8c95dc61 Merge pull request #205 from badgerman/bug-2103-missing-translation
Bug 2103: Fehlende Zauberbeschreibung im englischen CR
2015-05-22 15:45:00 +02:00
Enno Rehling 0ea0936156 Use default locale when missing a translation, only warn once.
https://bugs.eressea.de/view.php?id=2103
remove locale::fallback, it was never set anyhow (also, we have no good fallbacks).
2015-05-22 14:14:02 +02:00
Enno Rehling eb6215e018 https://github.com/eressea/server/issues/203 terrain_t check was exactly wrong, causing log spam.
remove obsolete line from E4 config.
2015-05-22 13:52:45 +02:00
Enno Rehling dde139f784 Merge remote-tracking branch 'upstream/develop' into develop 2015-05-21 12:04:13 +02:00
Enno Rehling cf88280595 fix build_building tests, require an order argument.
test current replace_order behavior.
2015-05-21 11:52:31 +02:00
Enno Rehling 22ae1b63de Merge pull request #201 from badgerman/issue-199-sparagraph
bugfix sparagraph (github issue #199).
2015-05-20 22:54:53 +02:00
Enno Rehling 465dcf4e1c bugfix sparagraph (github issue #199).
adding tests.
2015-05-20 18:05:25 +02:00
Enno Rehling 5af69f1821 re-enable test_peasant_luck_effect, add testing for adjust_coordinates 2015-05-20 08:15:12 +02:00
Enno Rehling 32298bd50d gcc: do not error on warnings that Visual Studio doesn't know about. 2015-05-20 07:30:59 +02:00
Enno Rehling 250880f067 fix gcc warning (unused variable) 2015-05-20 07:19:50 +02:00
Enno Rehling 3a03579a65 rename set_origin/get_origin into faction.c, remove argument from adjust_coordinates. add test for bug 2070. 2015-05-19 08:27:16 +02:00
Enno Rehling e7661434e3 fix an out-of-bounds error in the new stream-based report code when centering very short headlines, refactor indentation code, add tests. 2015-05-19 08:26:44 +02:00
Enno Rehling d0f8825240 use the syntax_error function where appropriate.
fix bug w. releasing message too soon.
2015-05-18 11:34:52 +02:00
Enno Rehling dbf022b757 fix loop termination, sparagraph 2015-05-18 09:37:31 +02:00
Enno Rehling c6b4c51b0d fix endless loop bug. 2015-05-18 09:21:41 +02:00
Enno Rehling 72e041dd32 fix missing include 2015-05-18 09:04:05 +02:00
Enno Rehling 8e5fc28bfc refactoring more of goodies.h into strings.h 2015-05-18 08:59:38 +02:00
Enno Rehling 820cdccf32 prettier syntax: C does not require taking an address (&) of a function. 2015-05-18 08:42:35 +02:00
Enno Rehling 43b2f0da9b fix -Wtautological-compare warnings from clang, again 2015-05-18 08:03:00 +02:00
Enno Rehling dfa45acd68 fix -Wtautological-compare warnings from clang 2015-05-18 07:46:45 +02:00
Enno Rehling 053adda3b4 Merge pull request #193 from badgerman/feature-gmtool-upgrades
misc gmtool upgrades
2015-05-17 17:57:46 +02:00
Enno Rehling 70eda58604 Merge branch 'develop' of github.com:eressea/server into develop
Conflicts:
	src/CMakeLists.txt
2015-05-17 17:52:41 +02:00
Enno Rehling 177d1c701f Merge branch 'lua-test-framework' of https://github.com/badgerman/eressea into badgerman-lua-test-framework
Conflicts:
	src/kernel/region.c
	src/util/log.h
2015-05-17 17:39:10 +02:00
Enno Rehling 9418051cd3 make gcc warn about signed/unsigned comparisons, just like Visual Studio does 2015-05-16 22:35:07 +02:00
Enno Rehling c4d1482250 signed/unsigned comparisons (VC warning only) 2015-05-15 20:56:43 +02:00
Enno Rehling 9d7a9cbe6a add missing new header 2015-05-15 20:47:27 +02:00
Enno Rehling df325b243a enable stricter conversion checking for gcc < 4.9, fix code 2015-05-15 20:35:36 +02:00
Enno Rehling dd8449783a converting float->double in a lot of the code to prevent -Wconversion messages 2015-05-15 19:08:44 +02:00
Enno Rehling 062237b0d1 let CMake test for gcc 4.9 before enabling -Wfloat-conversion 2015-05-15 17:15:54 +02:00
Enno Rehling eac4ef7ddc reduce conversion warning to float only 2015-05-15 13:32:22 +02:00
Enno Rehling 94f373e43a fix -Wconversion in creport.c 2015-05-15 11:20:37 +02:00
Enno Rehling c5a6f5bd03 fix -Wconversion in reports.c, json.c 2015-05-15 11:19:26 +02:00
Enno Rehling ca585de332 fix -Wconversion in battle.c 2015-05-15 08:03:10 +02:00
Enno Rehling 1dc516ab50 reduce warning level on oldterrain() log, warn from caller (json_report) instead. 2015-05-15 07:59:06 +02:00
Enno Rehling d2af6a2f88 fix -Wconversion in spells.c 2015-05-15 07:07:21 +02:00
Enno Rehling fe29e29c31 fix -Wconversion for move.c 2015-05-15 06:43:47 +02:00
Enno Rehling 9c7fe1d7cc fix gcc compilation and missing argument 2015-05-13 13:12:46 +02:00
Enno Rehling a46d60aa97 enable -Wconversion on gcc/clang builds
fix some of the warnings coming out of that for battle.c
2015-05-13 03:17:30 -07:00
Steffen Mecke ab1376d212 trying to test curse_write/read 2015-05-13 12:05:45 +02:00
Enno Rehling 06ff88e783 use filestream for report_template, too. 2015-05-12 20:51:17 -07:00
Enno Rehling 53a452e4ba more conversions to filestream 2015-05-12 20:08:34 -07:00
Enno Rehling e048b82ad2 very messy first steps towards making report_plaintext use filestream instead of FILE (lots of hacks) 2015-05-12 19:41:43 -07:00
Enno Rehling 9b9e038438 press F3 to save game in editor. 2015-05-12 17:18:51 -07:00
Enno Rehling 3574d4a0b9 fix a Visual Studio /Wall warning 2015-05-12 00:12:58 -07:00
Enno Rehling bf5fae2ef5 Fix visual studio compilation for Solthar's curse changes (float/int conversions, uninitialized variable). 2015-05-11 23:54:21 -07:00
Enno Rehling a4de46dab5 Merge pull request #181 from stm2/missing_curse_name
fix crash of Analyze Magic (mantis bug 2099)
2015-05-10 19:49:57 -07:00
Enno Rehling 7f1ee527d9 Merge pull request #186 from badgerman/develop
newplayer script updates, small gmtool fixes
2015-05-10 14:05:39 -07:00
Enno Rehling dc0897b122 fix gmtool and setup script to match the GM guide document. 2015-05-10 13:41:48 -07:00
Enno Rehling 628af4f6ad Merge pull request #182 from stm2/dreams_fix
refactoring + tests for good/bad dreams
2015-05-08 09:37:22 -07:00
Steffen Mecke 2d27442681 apply possible number of racial attacks consequently 2015-05-08 13:02:54 +02:00
Steffen Mecke d9f8479055 removed duplication in good/bad dreams code 2015-05-07 17:54:59 +02:00
Steffen Mecke dedf9f2009 clear CURSE_ISNEW explicitly in age(), not implicitly in write/read 2015-05-07 17:51:43 +02:00
Steffen Mecke 553cf23e9e crash more gracefully on missing description 2015-05-07 17:51:38 +02:00
Steffen Mecke 231f9bb39a check for existence of spell descriptions 2015-05-07 13:31:19 +02:00
Steffen Mecke b41049da53 test good/bad dreams 2015-05-06 18:15:10 +02:00
Enno Rehling 03084a7ee7 set_origin: renaming German function name to English, add a simple test for it. 2015-05-05 09:47:44 -07:00
Enno Rehling 42783ff02c binding a magician's spellbook to Lua, with test. 2015-05-05 08:44:58 -07:00
Enno Rehling 0db74d1c09 re-enable unit spells binding to Lua, remove some TODOs from the code. 2015-05-05 08:07:20 -07:00
Steffen Mecke 0fc7364533 fixed errors introduced by rebase 2015-05-04 14:46:32 +02:00
Steffen Mecke 79d2c76c3f refining spy tests 2015-05-04 14:30:59 +02:00
Steffen Mecke d4aa6e834e check for number of arguments as good as possible and cleaning up test 2015-05-04 14:30:59 +02:00
Steffen Mecke e28222c5be fix missing kampfstatus 2015-05-04 14:30:59 +02:00
Steffen Mecke 2cc8c1f871 trying to solve spy message bug #1604
Conflicts:
	src/kernel/CMakeLists.txt
2015-05-04 14:30:59 +02:00
Enno Rehling fe3d96517e Merge pull request #178 from stm2/typ
Tippfehler und englische Texte für Health.
2015-05-03 23:12:01 +02:00
Enno Rehling b00d7b6d5a increase magic power for low levels in E3 (instead of divide by 2 sometimes giving powers of < 1.0, cap it below at 1)
several spells have now had problems with powers lower than they were ever designed for, including shapeshift
also added a test and some framework for shapeshift spell (in E2).
https://bugs.eressea.de/view.php?id=1588
2015-04-30 15:59:52 +02:00
Steffen Mecke a9a14a79d0 fixed messed up english strings for wounds 2015-04-30 15:47:29 +02:00
Enno Rehling ce94c9805d rules.give.max_men == -1 für unlimitierte Übergaben in E2 2015-04-28 17:40:41 +02:00
Enno Rehling 30e4dc6cdc Fix keepitem flag in XML ("Menschen geben nichts ab") 2015-04-22 12:33:55 +02:00
Enno Rehling 88d370a7b8 fixing sea serpent names
https://bugs.eressea.de/view.php?id=2057
2015-04-21 12:35:39 +02:00
Enno Rehling d2fbdec831 re-enable disabled tests for E2, add test for FOLLOW. 2015-04-20 15:07:10 +02:00
Enno Rehling f06e3371a0 Bug 2089 again. rename giveitem flag to keepitem, because races should default to not holding on to their stuff. 2015-04-19 12:49:39 +02:00
Enno Rehling 71d0558403 Bug 2089: remove the giveitem restriction from all races.
https://bugs.eressea.de/view.php?id=2089
2015-04-19 09:49:52 +02:00
Enno Rehling 6e9fca5e2f allow version.h to declare a future version that is compatible with the current code as MAX_VERSION that save.c will accept. 2015-04-19 08:36:15 +02:00
Enno Rehling 3e1ae5e0f2 allow reading of JSON_REPORT_VERSION from future source release 2015-04-19 08:13:40 +02:00
Enno Rehling 93e79fcf8f Merge remote-tracking branch 'upstream/develop' into develop 2015-04-17 16:33:30 +02:00
Enno Rehling 961f5e8445 Merge branch 'develop' of github.com:badgerman/eressea into develop 2015-04-17 16:32:53 +02:00
Enno Rehling 743ea02331 test_peasantluck_effect fails on my atom netbook 2015-04-14 03:09:52 +02:00
Enno Rehling ae9fb399f3 unit tests walkingcapacity, configurable trollbelt effect 2015-04-14 02:32:01 +02:00
Enno Rehling a5da77c376 Merge pull request #168 from badgerman/hotfix-3-4-5
tests for volcanooutbreak and spyreport messages
2015-04-10 11:13:44 +02:00
Enno Rehling d2eac946f1 ALLY command crashes when incomplete. 2015-04-09 17:16:34 +02:00
Enno Rehling b9a41bc39f fixing the trollbelt multiplier.
it was multiplying the weight of the unit, too, leading to far too big bonuses.
https://bugs.eressea.de/view.php?id=1510
2015-04-09 15:59:00 +02:00
Enno Rehling f68be23f69 damage taken in the first round of combat does not cause ships to get flagged for damage. 2015-04-09 14:30:49 +02:00
Enno Rehling ad0a753c52 CLAIM command did not like that tokens could be NULL. 2015-04-09 12:33:23 +02:00
Enno Rehling 224a9af33c Test "guarding makes ATTACK a short command"
https://bugs.eressea.de/view.php?id=1493
expose unit.guard values to Lua
2015-04-09 12:19:17 +02:00
Enno Rehling 82926318c0 fix creating factions with invalid race (return nil) 2015-04-04 15:08:35 +02:00
Enno Rehling 9664f2b191 Implement an optional JSON report writer. Currently writes readable maps for Tiled. 2015-03-29 14:03:56 +02:00
Enno Rehling d802b297e9 Merge branch 'develop' of github.com:eressea/server into develop 2015-03-19 15:31:33 +01:00
Enno Rehling 9b64269b6d fix auto-study plus-equal typo 2015-03-19 15:31:25 +01:00
Enno Rehling a2a0bbad6a bug 2068: select familiars by race of mage, not faction.
https://bugs.eressea.de/view.php?id=2068
2015-03-13 22:14:01 +01:00
Enno Rehling 4d18fe68f8 gcc language purity complaint. 2015-03-13 21:56:18 +01:00
Enno Rehling 293190703f make maximum number of people transferred to a faction configurable
make E2 transfers basically unlimited.
2015-03-13 21:10:39 +01:00
Enno Rehling 8edafa19c5 fix faction.create locale handling 2015-03-13 20:39:36 +01:00
Enno Rehling 0b3190605a increase build number: silver weight enabled again, fix keyword crash 2015-03-07 14:15:25 +01:00
Enno Rehling eb282eecb1 fix keyword-buffer overflow 2015-03-07 14:15:12 +01:00
Enno Rehling 4ce2429276 fix keyword-buffer overflow 2015-03-04 22:19:11 +01:00