Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,020 Commits 10 Branches 0 Tags 41 MiB
Commit Graph

6020 Commits

Author SHA1 Message Date
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 f86314c55a Merge pull request #254 from badgerman/develop 
static analysis bugfixes
 2015-07-07 15:42:59 +02:00
Enno Rehling 35c60eb0de Revert "do not notify slack from my personal fork (this is crazy hard)." 
This reverts commit 7400f614a6.
I have an open PR that I made from my develop branch, which is terrible, so this change accidentally got into it. have to fix...
 2015-07-07 15:42:36 +02:00
Enno Rehling 7400f614a6 do not notify slack from my personal fork (this is crazy hard). 2015-07-07 15:36:21 +02:00
Enno Rehling 76a9dd6741 Merge remote-tracking branch 'upstream/develop' into develop 2015-07-07 15:34:42 +02:00
Enno Rehling 7912418b1f Revert "test travis/slack integration" 
This reverts commit 3a0504a72d.
 2015-07-07 15:34:11 +02:00
Enno Rehling b36c1c76f8 send signals from travis to slack 2015-07-07 15:33:15 +02:00
Enno Rehling 730996bedf send signals from travis to slack 2015-07-07 15:32:24 +02:00
Enno Rehling 221c83365d Merge branch 'develop' of github.com:badgerman/eressea into develop 2015-07-07 15:13:16 +02:00
Enno Rehling 3a0504a72d test travis/slack integration 2015-07-07 15:13:06 +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 5175c209f8 Merge pull request #252 from badgerman/hotfix-3-5-3 
add a holy ground curse to all new starting regions.
 2015-07-05 18:53:28 +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 c37974eaf4 Merge pull request #251 from badgerman/hotfix-3-5-3 
return to old mechanism of equipping the first unit, and give some ba…
 2015-07-05 17:49:08 +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 4e67c4ac3f do not remove new players for missing their first turn. 2015-07-05 15:24:46 +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 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 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 ae8c448698 do not remove new players for missing their first turn. 2015-07-05 14:07:59 +02:00
Enno Rehling 004d6c61d4 avoid monsters: only seed new factions in hexes that have no units nearby. 2015-07-04 23:42:41 +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 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