Commit Graph

333 Commits

Author SHA1 Message Date
Enno Rehling c9f886078b CID 22452 'Constant' variable guards dead code
github issue #353 there is no a_fshidden attribute.
2015-11-04 19:08:45 +01:00
Enno Rehling d4ff807c20 Merge pull request #364 from ennorehling/coverity-fixes
several smaller coverity fixes
2015-11-04 11:04:32 +01:00
Enno Rehling 024e4c45ca fix a bug introduced by f78fe842 (CID 22443) 2015-11-04 10:40:53 +01:00
Enno Rehling c57668e6ee failing test for newly discovered storage problems 2015-11-04 09:48:51 +01:00
Enno Rehling 1993e5e384 Merge branch 'master' into develop 2015-11-04 09:05:04 +01:00
Enno Rehling 1c85f0e1de fix scripting bug in new autoseed module 2015-11-04 08:56:31 +01:00
Enno Rehling 5bcc0699a1 Merge branch 'master' into develop
Conflicts:
	src/buildno.h
2015-11-03 12:29:55 +01:00
Enno Rehling 451303d7d3 autoseed as a module for E2
made from pieces of newplayer.lua and populate.lua
2015-11-03 11:54:08 +01:00
Enno Rehling 936c201d0b Merge pull request #312 from eressea/master
pull latest changes from master into develop
2015-10-11 16:47:29 +02:00
Enno Rehling a3c843f90d clean up after tests
update runtests.bat script for windows development in VS2015
2015-10-11 14:57:35 +02:00
Enno Rehling a795226368 just a script for fixing broken familiar links between releases 2015-09-15 17:43:22 +02:00
Enno Rehling 47c48d2985 Merge branch 'master' into develop 2015-09-12 22:27:14 +02:00
Enno Rehling 871373a0e5 be less verbose about cursing 2015-09-12 22:26:54 +02:00
Enno Rehling a01955e06a disable features by name that are not keywords 2015-09-12 17:37:29 +02:00
Enno Rehling bd1b568da2 Präfix Erz 2015-09-12 14:13:45 +02:00
Enno Rehling 42f1030251 separate test script for E4:
even though it has mostly the same rules, it does not have xmastrees, and loads a different config
remove dead `inactivefaction` function, we have no use for the file it creates.
2015-09-12 14:10:08 +02:00
Enno Rehling 3003b7fc61 remove prefixes from E3
move prefix test to common.lua
2015-09-12 13:37:43 +02:00
Enno Rehling 767ef13722 add a functional test for prefixes in E2 before refactoring any of that code. 2015-09-12 12:05:38 +02:00
Enno Rehling cf08cdf3fb configuration type-fixes: int to bool where appropriate (possibly incomplete)
rename some rules to make it more obvious that they are flags or other integer values.
2015-09-11 10:04:08 +02:00
Enno Rehling 1a9dd531c5 use boolean values in E2 config.
add a runtests.bat file for windows developers.
make some tests clean up after themselves (os.remove on files they create).
2015-09-11 09:34:38 +02:00
Enno Rehling 9bb2a625f9 fix xmlreader bug introduced by last commit (xpath->node not initialized) 2015-09-11 09:10:00 +02:00
Enno Rehling 34580ab9fa fix test requiring a data directory (sigsegv) 2015-09-06 20:07:15 +02:00
Enno Rehling b33babd316 fix cursed factions (broke it during bit32 changes) 2015-09-06 13:20:37 +02:00
Enno Rehling 552f32ff97 bugfix https://bugs.eressea.de/view.php?id=2133
era in the CR is wrong for E2
build in the CR should be a string (did not have quotes)
Lua < 5.2 does not have bit32 (and Windows build uses 5.1)
2015-09-04 14:39:44 +02:00
Enno Rehling f0a9cc8233 added a lua module that marks factions as cursed 2015-08-31 12:50:58 +02:00
Enno Rehling f12454870f fix segfault, disable intermittent test 2015-08-20 16:17:19 +02:00
Enno Rehling 5537f0ac68 simple and basic tests for ships 2015-08-07 13:03:19 +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 3081a89f1c Merge branch 'develop' of github.com:ennorehling/eressea into develop 2015-08-06 19:17:00 +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 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 420574c7e4 add unit-test for casting spells, fix spell-casting (was looking for thisorder), all E3 tests pass again 2015-08-05 10:25:25 +02:00
Enno Rehling 4d061d8592 repair update_long_order and K_DESTROY handling according to discussion in https://bugs.eressea.de/view.php?id=2080 2015-08-04 22:47:55 +02:00
Enno Rehling 802f8b08d6 try setting origin manually 2015-07-31 14:10:30 +02:00
Enno Rehling 51fc6680dd require trees for new player regions 2015-07-28 10:51:14 +02:00
Enno Rehling a31dd95de0 give the first unit a sword, set skills from the equipment-config, not script
make the preview link use a soft-link, not calculate the build-directory again.
2015-07-19 20:07:08 +02:00
Enno Rehling 38ecf783c2 ignore comments 2015-07-12 16:16:57 +02:00
Enno Rehling 083c848db1 merge with latest hotfix 2015-07-12 04:53:10 +02:00
Enno Rehling 6d4f05fad8 quicklist updates 2015-07-11 12:48:03 +02:00
Enno Rehling f1217ed7a9 Bug 1965: verify that buildings cannot be built on packice. 2015-07-08 16:11:25 +02:00
Enno Rehling cc3c5580d4 rewrite and unit tests 2015-07-07 20:23:24 +02:00
Enno Rehling c1ba6a99e3 add a holy ground curse to all new starting regions. 2015-07-05 18:45:15 +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 6672251b2d fewer units for new players, two players per region 2015-07-05 16:03:04 +02:00
Enno Rehling 3074a6077d avoid monsters: only seed new factions in hexes that have no units nearby. 2015-07-05 15:24:06 +02:00
Enno Rehling 9185b2af28 simplify test setup: as long as all games have nmr.removenewbie set to off by their config, no test should need to disable it. 2015-07-05 15:23:54 +02:00
Enno Rehling 89ea0b9946 simplify test setup: as long as all games have nmr.removenewbie set to off by their config, no test should need to disable it. 2015-07-05 14:16:17 +02:00
Enno Rehling 03a8c6a89f avoid monsters: only seed new factions in hexes that have no units nearby. 2015-07-05 14:08:06 +02:00
Enno Rehling b2d981e577 improved tests for DESTROY, fix destroy-after-attack 2015-07-03 13:08:06 +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