Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
6448 commits 10 branches 0 tags 41 MiB
Commit graph

6448 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Philipp Dreher
b6443e40ba reanimated dead code 2015-11-01 17:14:51 +01:00
Enno Rehling
f7fbab1e46 Merge pull request #329 from ennorehling/feature/disabled-tests 
remove bad disabled tests
 2015-11-01 08:38:45 +01:00
Enno Rehling
0b098dede6 remove invalid tests. uninitialized locales do not have default words 2015-11-01 05:35:10 +01:00
Philipp Dreher
bebc92f82d expansion of the skillpotion-test 
test now checks the effect of the potion on the week-counter of
sufficiently high skills
 2015-10-31 19:03:15 +01:00
Enno Rehling
87ba4ef6dc Merge pull request #11 from eressea/develop 
coverity scan merge
 2015-10-31 18:24:26 +01:00
Enno Rehling
be8801f76f Merge pull request #327 from ennorehling/feature/coverity-scan 
Fix a ton of coverity scan issues, we're now down to 0.88 bugs per 1000 LOC
 2015-10-31 18:17:48 +01:00
Enno Rehling
e95701d653 Merge pull request #10 from eressea/develop 
skillpotion update
 2015-10-31 18:06:03 +01:00
Philipp Dreher
2f02c27659 Merge pull request #1 from eressea/develop 
resync
 2015-10-31 18:05:44 +01:00
Enno Rehling
293562fa98 Merge pull request #328 from TurnerSE/bug/#2119 
Bug/#2119
 2015-10-31 17:22:23 +01:00
Philipp Dreher
597aadbac3 small textual corrections 2015-10-31 17:09:39 +01:00
Philipp Dreher
bff5f82be2 Revert "expanded existing skillpotion-test to test for existence of description" 
This reverts commit e149d444c1.
 2015-10-31 16:56:04 +01:00
Philipp Dreher
486a4b8406 Revert "WIP rework of test for description regarding functionality of locales" 
This reverts commit c3add85739.
 2015-10-31 16:55:59 +01:00
TurnerSE
c3add85739 WIP rework of test for description regarding functionality of locales 2015-10-31 14:37:39 +01:00
TurnerSE
e149d444c1 expanded existing skillpotion-test to test for existence of description 2015-10-31 04:10:08 +01:00
TurnerSE
df92ed03cf added descriptions for skillpotion in EN and DE 2015-10-31 02:48:04 +01:00
Enno Rehling
fbf483fb4e CID 22518: Parse warning (PW.PARAM_SET_BUT_NOT_USED) 2015-10-30 15:21:06 +01:00
Enno Rehling
21a2313e2a CID 22517: Parse warning (PW.PARAM_SET_BUT_NOT_USED) 2015-10-30 15:20:06 +01:00