Enno Rehling
|
dfeae86af5
|
Merge branch 'develop' of github.com:badgerman/eressea into develop
|
2015-07-12 14:43:05 +02:00 |
Enno Rehling
|
ffa4a01f1c
|
Merge branch 'ennorehling-feature/travis-migration' into develop
|
2015-07-12 14:42:37 +02:00 |
Enno Rehling
|
4682a4ec62
|
Merge branch 'feature/travis-migration' of https://github.com/ennorehling/eressea into ennorehling-feature/travis-migration
|
2015-07-12 14:42:01 +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
|
083c848db1
|
merge with latest hotfix
|
2015-07-12 04:53:10 +02:00 |
Enno Rehling
|
65b7fc7ff8
|
prefer clang
|
2015-07-12 04:49:40 +02:00 |
Enno Rehling
|
12d7862c51
|
Merge branch 'hotfix-3-5-3'
|
2015-07-12 04:48:35 +02:00 |
Enno Rehling
|
93f7c16def
|
new iniparser
|
2015-07-12 04:46:53 +02:00 |
Enno Rehling
|
e06352a242
|
iniparser master
|
2015-07-12 04:45:10 +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
|
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
|
6d4f05fad8
|
quicklist updates
|
2015-07-11 12:48:03 +02:00 |
Enno Rehling
|
27835dc4e1
|
unit tests for STUDY and TEACH commands.
|
2015-07-09 13:24:21 +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 |