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
|
04d609fb5d
|
Merge pull request #247 from badgerman/feature/bug-1805-nmr-warnings
Bug 1805: re-enable NMR warnings
|
2015-07-03 16:04:18 +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
|
9a9efe305d
|
Merge pull request #246 from badgerman/develop
Bug 2080: improved tests for DESTROY, fix destroy-after-attack
|
2015-07-03 14:06:24 +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
|
bdbab14332
|
Merge pull request #243 from badgerman/feature/bug-1896-disable-besiege
Disable SIEGE in E2. The feature is bad and broken.
|
2015-07-02 12:14:14 +02:00 |
Enno Rehling
|
aee4fb4570
|
disable SIEGE in E2. The feature is bad and broken.
https://bugs.eressea.de/view.php?id=1896
|
2015-07-02 12:07:52 +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
|
a70b0d4902
|
Merge pull request #241 from badgerman/feature/bug-1890-monster-give-orders
bug 1890: make monsters give GIVE orders
|
2015-07-02 11:23:13 +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
|
258f3c37c0
|
add test coverage for bug report 2094 (prove that it is invalid)
|
2015-07-02 08:55:05 +02:00 |
Enno Rehling
|
b9f41526ef
|
Merge pull request #239 from badgerman/feature/bug-1949-magicbag
bug 1949: magicbag contents
|
2015-07-01 22:34:00 +02:00 |
Enno Rehling
|
e0a383aa24
|
test the upper limit of the bag, too.
|
2015-07-01 22:16:43 +02:00 |
Enno Rehling
|
c634a01a3f
|
Bug 1949: Zauberbeutelverhalten (magic bag tests & config changes)
https://bugs.eressea.de/view.php?id=1949
|
2015-07-01 22:13:24 +02:00 |
Enno Rehling
|
e59a23fae7
|
Merge pull request #238 from badgerman/develop
cleaning up tests, fixing a few internal bugs (squashed)
|
2015-07-01 21:55:47 +02:00 |
Enno Rehling
|
2f21f3c086
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2015-07-01 21:28:29 +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
|
85230f7d11
|
pull latest version before building develop
|
2015-06-28 13:38:38 +02:00 |
Enno Rehling
|
7934917607
|
pull latest version before building develop
|
2015-06-28 13:38:13 +02:00 |
Enno Rehling
|
59b0c7b957
|
Merge pull request #236 from badgerman/develop
Bug 2113: player-controlled dragon movement
|
2015-06-27 11:48:49 +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
|
f1e3bc7013
|
Merge pull request #235 from badgerman/develop
fixing some small non-critical bugs
|
2015-06-26 15:57:20 +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
|
b7b20bdec6
|
fewer units for new players, two players per region
|
2015-06-26 14:19:36 +02:00 |
Enno Rehling
|
5b2538b72d
|
increase build number
|
2015-06-21 18:32:57 +02:00 |
Enno Rehling
|
6a42b6231e
|
Merge branch 'master' into develop
Conflicts:
src/buildno.h
|
2015-06-21 18:32:10 +02:00 |
Enno Rehling
|
ecb2b9b3b3
|
Merge pull request #234 from badgerman/hotfix/issue-233-invalid-read
invalid read, dead factions must leave their alliance
|
2015-06-21 18:29:00 +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
|
7cf1062650
|
cmake changes from gruenbaer
|
2015-06-21 16:29:48 +02:00 |
Enno Rehling
|
6fa39da6f6
|
cmake submodule update
|
2015-06-21 16:27:35 +02:00 |
Enno Rehling
|
5667b6dc8c
|
Merge branch 'develop' of github.com:eressea/server into develop
|
2015-06-21 16:24:46 +02:00 |
Enno Rehling
|
d2037a5cd9
|
Merge pull request #232 from badgerman/develop
after combat, eject enemies only
|
2015-06-20 15:56:50 +02:00 |