Philipp Dreher
|
663d947b2a
|
New behaviour in case of low skill during building
Insufficient skill after hitting the next improvement stage is now
handled by leaving the for-loop and skipping to after-build-processing.
|
2015-11-06 21:04:35 +01:00 |
|
Philipp Dreher
|
4f5a02a1a3
|
new lua-test for castle-stages
(Messed up the previous commit)
New lua-test for the behaviour concerning the castle-stages and their
min-skills. (Bug 1859)
|
2015-11-06 20:59:45 +01:00 |
|
Philipp Dreher
|
b0a986e155
|
Revert "added a lua-test"
This reverts commit a452ad1517.
|
2015-11-06 20:57:19 +01:00 |
|
Philipp Dreher
|
a452ad1517
|
added a lua-test
New lua-test for the bug concerning the minskill for castle-stages.
(#1859)
|
2015-11-06 20:53:10 +01:00 |
|
Philipp Dreher
|
be5d81acd1
|
Revert "new test"
This reverts commit cb16315e7c.
|
2015-11-06 20:51:38 +01:00 |
|
Philipp Dreher
|
cb16315e7c
|
new test
Added test for the handling of castles' buildstages and their individual
skillcaps.
|
2015-11-06 13:14:19 +01:00 |
|
Enno Rehling
|
7e81b98fa4
|
Merge pull request #339 from TurnerSE/improvement/CID22481
Improvement/cid22481
|
2015-11-03 13:08:03 +01:00 |
|
Enno Rehling
|
4052f52472
|
Merge pull request #345 from TurnerSE/bug/#2145
Bug/#2145
|
2015-11-03 13:04:28 +01:00 |
|
Enno Rehling
|
c371454a0a
|
Merge branch 'TurnerSE-enhancement/airship_refactoring' into develop
|
2015-11-03 13:02:56 +01:00 |
|
Enno Rehling
|
ae28cbd7c3
|
Merge branch 'enhancement/airship_refactoring' of https://github.com/TurnerSE/server into TurnerSE-enhancement/airship_refactoring
Conflicts:
src/spells/shipcurse.c
|
2015-11-03 13:02:42 +01:00 |
|
Enno Rehling
|
5bcc0699a1
|
Merge branch 'master' into develop
Conflicts:
src/buildno.h
|
2015-11-03 12:29:55 +01:00 |
|
Enno Rehling
|
ee6db51068
|
release version 3.6.6
|
2015-11-03 12:27:51 +01:00 |
|
Enno Rehling
|
b5ce026d6d
|
Merge pull request #346 from ennorehling/master
autoseed module for new players
|
2015-11-03 12:17:43 +01:00 |
|
Enno Rehling
|
bd46d08446
|
Merge branch 'master' of https://github.com/ennorehling/eressea
|
2015-11-03 11:56:47 +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 |
|
Philipp Dreher
|
5178bbd674
|
moved application of armor-penetration
halfed armor now includes the effect of natural armor, but not the
effect of magic armor
|
2015-11-03 00:05:55 +01:00 |
|
Philipp Dreher
|
bf42143b11
|
Revert "WIP new test for armor penetration"
This reverts commit dab8bdf7ef.
|
2015-11-03 00:01:10 +01:00 |
|
Philipp Dreher
|
0e83cc69d3
|
missed a spot...
|
2015-11-02 18:27:07 +01:00 |
|
Philipp Dreher
|
c2a8c32be0
|
forgot fwd-declaration of structs...
|
2015-11-02 18:08:35 +01:00 |
|
Philipp Dreher
|
07fd3dc970
|
formal correction
|
2015-11-02 18:06:19 +01:00 |
|
Philipp Dreher
|
30dce18697
|
small formal corrections
|
2015-11-02 17:58:14 +01:00 |
|
Philipp Dreher
|
96ccb046ab
|
added test-suite for flyingship.c
some general testing of the spells functionality for future maintenance
purposes
|
2015-11-02 17:54:23 +01:00 |
|
Enno Rehling
|
63541dcc5d
|
Merge pull request #338 from TurnerSE/improvement/test_skillpotion
Improvement/test skillpotion
|
2015-11-02 17:38:47 +01:00 |
|
Philipp Dreher
|
29173887b6
|
test_create_castorder can take spelllparameters now too
|
2015-11-02 17:09:16 +01:00 |
|
Enno Rehling
|
01078460bb
|
Merge pull request #343 from ennorehling/feature/bug-2143-monsters-attack-buildings
bug 2143: monsters attack buildings
|
2015-11-02 16:40:32 +01:00 |
|
Philipp Dreher
|
0e8365c802
|
moved convenience function for convenience
the formerly static function test_create_castorder is now available for
general usage via tests.h/.c
|
2015-11-02 16:12:56 +01:00 |
|
Philipp Dreher
|
f550431118
|
small documentation correction
|
2015-11-02 15:59:29 +01:00 |
|
Enno Rehling
|
0b00bfecdf
|
Merge pull request #342 from TurnerSE/bug/CID22449
Bug/cid22449
|
2015-11-02 15:55:44 +01:00 |
|
Philipp Dreher
|
8200fdb6c2
|
moved files for flyingship to subdir "spells"
|
2015-11-02 15:40:26 +01:00 |
|
Enno Rehling
|
f70b385bef
|
clean up plan_monsters and make it a bit more readable
|
2015-11-02 15:27:01 +01:00 |
|
Enno Rehling
|
072bfd3912
|
testin building_is_active
testing multiple units in one building
|
2015-11-02 15:06:30 +01:00 |
|
Enno Rehling
|
4bf2509fb3
|
test inside_building vs. overflow
fix default building capacity (should be 1 per size)
|
2015-11-02 14:56:58 +01:00 |
|
Enno Rehling
|
42ae086def
|
unit is inisde a building also when it was not paid for
|
2015-11-02 14:49:48 +01:00 |
|
Enno Rehling
|
24ff4c301d
|
refactor: separate building_is_active from inside_building
|
2015-11-02 14:18:50 +01:00 |
|
Philipp Dreher
|
098abcc144
|
internal restructuring in flyingship
|
2015-11-02 14:01:38 +01:00 |
|
Philipp Dreher
|
abd6be475f
|
that just slipped in the commit by accident...
|
2015-11-02 13:55:28 +01:00 |
|
Philipp Dreher
|
fe0d038bf3
|
moved more related functionality from shipcurse.c to flyingship.c
|
2015-11-02 13:39:06 +01:00 |
|
Philipp Dreher
|
2fe95f3d61
|
integration of the separate if-conditions and simplification of the loop
|
2015-11-02 13:12:19 +01:00 |
|
Philipp Dreher
|
153db447de
|
removed obsolete messages
|
2015-11-02 13:09:45 +01:00 |
|
Philipp Dreher
|
bf779fc810
|
removed obsolete code
|
2015-11-02 13:06:14 +01:00 |
|
Philipp Dreher
|
d93305b180
|
moved flying ship functionality from move.c to flyingship.c
|
2015-11-02 00:35:32 +01:00 |
|
Philipp Dreher
|
6e7510b7e9
|
moved flying ship functionality from spells.c and shipcurse.c to flyingship.c
|
2015-11-02 00:32:56 +01:00 |
|
Philipp Dreher
|
3fa4c18e87
|
added files for new module "flyingship"
|
2015-11-02 00:26:23 +01:00 |
|
Philipp Dreher
|
b107ddadf5
|
added assert to check the faction-pointer
|
2015-11-01 21:43:18 +01:00 |
|
Philipp Dreher
|
491e5faed9
|
Revert "general check for sf->faction's validity"
This reverts commit f18b5ea7d2.
|
2015-11-01 21:40:06 +01:00 |
|
Enno Rehling
|
0f6c89f068
|
Merge pull request #340 from TurnerSE/bug/#1971
Bug/#1971
|
2015-11-01 20:36:19 +01:00 |
|
Philipp Dreher
|
de970b4ba9
|
changed the description for the spell "airship" in DE and EN
|
2015-11-01 19:12:14 +01:00 |
|
Philipp Dreher
|
f18b5ea7d2
|
general check for sf->faction's validity
The handling of an ally without a valid faction-pointer is now skipped
in favor of a logged error.
|
2015-11-01 18:54:29 +01:00 |
|
Philipp Dreher
|
91155f509c
|
formatting: tabs --> spaces
|
2015-11-01 17:38:12 +01:00 |
|
Philipp Dreher
|
dab8bdf7ef
|
WIP new test for armor penetration
|
2015-11-01 17:15:11 +01:00 |
|