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

5740 Commits

Author SHA1 Message Date
Enno Rehling c6da0c2189 fix tolua, I guess 2015-07-11 23:45:59 +02:00
Enno Rehling 252d8b8d88 trying to fix tolua build 2015-07-11 23:25:09 +02:00
Enno Rehling 90d428f67a use local copy of tolua if it isn't installed in the system 2015-07-11 21:52:59 +02:00
Enno Rehling 4c79962729 add tolua submodule, kill all references to tolua++ 2015-07-11 17:48:35 +02:00
Enno Rehling e10086b8fe tolua not required? 2015-07-11 16:09:44 +02:00
Enno Rehling 1092147d79 fix travis conversion 2015-07-11 16:07:40 +02:00
Enno Rehling bf4bad92db disable broken test, try new travis infrastructure 2015-07-11 16:02:51 +02:00
Enno Rehling 13e50cd403 updte submoduiles before building 2015-07-11 14:37:38 +02:00
Enno Rehling d9008d0525 Merge branch 'hotfix-3-5-3' of github.com:eressea/server into hotfix-3-5-3 2015-07-11 14:35:51 +02:00
Enno Rehling 2630b6203d updte submoduiles before building 2015-07-11 14:33:56 +02:00
Enno Rehling a2b41eda63 updte submoduiles before building 2015-07-11 14:33:34 +02:00
Enno Rehling 77b1bd6ef3 updte submoduiles before building 2015-07-11 14:33:09 +02:00
Enno Rehling 57268d3cd2 remove old iniparser 2015-07-11 12:55:13 +02:00
Enno Rehling 034d1d5433 Merge branch 'feature/rename-cerddor' into develop 2015-07-08 19:03:45 +02:00
Enno Rehling 434923ec67 Merge pull request #257 from badgerman/feature/rename-cerddor 
Bug 2115: fix the name of Cerddor everywhere.
 2015-07-08 18:57:08 +02:00
Enno Rehling b8e17839a7 eliminate some spammy warnings. 2015-07-08 18:27:27 +02:00
Enno Rehling 05f444bab1 Merge branch 'feature/rename-cerddor' into develop 2015-07-08 17:53:09 +02:00
Enno Rehling 5d150248dd Merge pull request #256 from badgerman/bug-1965-packice-buildings 
Bug 1965: cannot create new buildings on packice
 2015-07-08 17:18:54 +02:00
Enno Rehling 2b57fd9d83 whatever. Slack-Travis is back on. 2015-07-08 16:18:08 +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 247aecd92c Merge remote-tracking branch 'upstream/develop' into develop 2015-07-08 15:41:53 +02:00
Enno Rehling 3d0e610e9d Merge pull request #255 from badgerman/feature/magicresistance 
prevent crash, magic resistance on buildings (bug 1692)
 2015-07-08 05:39:04 +02:00
Enno Rehling 6d34d63d4f don't want slack/travis notifications for this fork. 2015-07-08 05:24:28 +02:00
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