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

5687 Commits

Author SHA1 Message Date
Enno Rehling 18d82b38ea Merge branch 'feature/travis-migration' into develop 2015-07-12 15:04:57 +02:00
Enno Rehling 21a81bd307 cleanup: struct declaration, more static. 2015-07-12 14:24:46 +02:00
Enno Rehling cc263ed6c8 Merge branch 'feature/travis-migration' into develop 2015-07-12 14:18:27 +02:00
Enno Rehling f1b0488a78 missing include 2015-07-12 14:17:35 +02:00
Enno Rehling 0a57933e30 minor optimizations, error checking (static analysis) 2015-07-12 14:17:27 +02:00
Enno Rehling 3fc3660152 ignore PVS=-Studio files 2015-07-12 14:17:18 +02:00
Enno Rehling 758f4a592d minor optimizations, error checking (static analysis) 2015-07-12 14:10:33 +02:00
Enno Rehling 6ea859ecea ignore PVS=-Studio files 2015-07-12 13:15:10 +02:00
Enno Rehling c0c3400f21 remove junk files, thank you windows 2015-07-12 11:01:59 +02:00
Enno Rehling 7087c0e0ab Update to latest submodules, fix iniparser and critbit. 
I did this before, must have lost it in the merge. Crazy.
 2015-07-12 10:38:01 +02:00
Enno Rehling 11e1fab0d0 Merge branch 'hotfix-3.4.1' into feature/travis-migration 
Conflicts:
	.travis.yml
	s/build
	s/cmake-init
	s/runtests
	s/travis-build
	src/kernel/region.c
 2015-07-12 04:12:32 +02:00
Enno Rehling cfb1812f24 fix building on RasPi 2015-07-12 03:08:29 +02:00
Enno Rehling ae079b8a15 Merge branch 'hotfix-3.4.1' of github.com:eressea/server into hotfix-3.4.1 2015-07-12 01:41:48 +02:00
Enno Rehling a3a2e3074d uninitialized variable 2015-07-12 01:38:22 +02:00
Enno Rehling b89c9a2401 raspberry pi fixes 2015-07-12 01:04:39 +02:00
Enno Rehling 3f57431e0b new submodule rev, might fix travis? 2015-07-12 00:09:00 +02:00
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 034d1d5433 Merge branch 'feature/rename-cerddor' into develop 2015-07-08 19:03:45 +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 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 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