Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
6138 commits 10 branches 0 tags 41 MiB
Commit graph

6138 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
936c201d0b Merge pull request #312 from eressea/master 
pull latest changes from master into develop
 2015-10-11 16:47:29 +02:00
Enno Rehling
431345c675 Merge pull request #311 from ennorehling/master 
Getting ready for Visual Studio 2015
 2015-10-11 15:03:32 +02:00
Enno Rehling
a3c843f90d clean up after tests 
update runtests.bat script for windows development in VS2015
 2015-10-11 14:57:35 +02:00
Enno Rehling
6a074fd294 only disable MSVC2015 warnings in MSVC2015, do not break confuse compilers. 2015-10-11 14:39:51 +02:00
Enno Rehling
e8880db447 get the code to compile under vs2015 (disable warnings) 2015-10-11 14:39:43 +02:00
Enno Rehling
0e64bc043c Merge pull request #310 from ennorehling/master 
additional mail_cmd tests
 2015-10-11 14:29:43 +02:00
Enno Rehling
c47c9dbf64 add mail_cmd tests for FACTION 2015-10-11 12:54:27 +02:00
Enno Rehling
403b8a2e7e add mail_cmd tests for REGION 2015-10-11 12:44:22 +02:00
Enno Rehling
070ed1a941 clean up hastily written tests, eliminate duplicate code 2015-10-11 12:38:05 +02:00
Enno Rehling
9e49e10d11 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
	src/kernel/unit.test.c
 2015-10-10 22:55:29 +02:00
Enno Rehling
99c385412a fix crash in mail_cmd when order is missing a message 2015-10-10 22:50:15 +02:00
Enno Rehling
b93874172f Merge branch 'develop' of github.com:eressea/server into develop 2015-10-02 11:30:57 +02:00
Enno Rehling
61a95d8b52 handle express issues by filename 2015-10-02 11:30:43 +02:00
Enno Rehling
37a8081c9b handle express issues by filename 2015-10-02 11:30:14 +02:00
Enno Rehling
7f81cee36d Merge pull request #305 from ennorehling/feature/log-reduce 
reduced log spam in cron emails
 2015-09-28 12:27:04 +02:00
Enno Rehling
5e28cc9de3 re-enable valgrind 2015-09-28 11:31:58 +02:00
Enno Rehling
3eead446d0 reduce cron log spam 2015-09-26 22:42:22 +02:00
Enno Rehling
3e6112747c Merge pull request #9 from eressea/develop 
latest develop branch
 2015-09-25 14:16:41 +02:00
Enno Rehling
baacd9b5cc Merge pull request #304 from ennorehling/feature/test-follow-ship 
additional tests: follow ship (bug 2140 is invalid)
 2015-09-25 14:14:38 +02:00
Enno Rehling
d153846769 test: ageing ship trails works as expected. cannot find a bug here. 
Conflicts:
	src/move.test.c
 2015-09-25 14:10:25 +02:00
Enno Rehling
f07802bab5 add a test to check that move_ship creates a trail when given a route 
Conflicts:
	src/move.test.c
 2015-09-25 14:09:22 +02:00
Enno Rehling
f018016feb rename hunt to follow_ship, because why was it ever called anything else? 2015-09-25 14:06:18 +02:00
Enno Rehling
6162d0f16c fixing bug 2141 2015-09-25 11:31:43 +02:00
Enno Rehling
af5909a9c3 Merge pull request #303 from ennorehling/hotfix/bug-2138-familiarmage 
bug 2138 familiarmage
 2015-09-23 18:37:48 +02:00
Enno Rehling
ae513c5f23 Merge branch 'hotfix/bug-2138-familiarmage' of github.com:ennorehling/eressea into hotfix/bug-2138-familiarmage 2015-09-23 18:31:46 +02:00
Enno Rehling
1028539adb version number increase 2015-09-23 18:29:18 +02:00
Enno Rehling
9ceea5bd44 Merge branch 'develop' of github.com:badgerman/eressea into develop 2015-09-23 17:33:43 +02:00
Enno Rehling
3de0426b86 Merge branch 'ennorehling-feature/bug-2053-attack-monsters' into develop 2015-09-19 13:36:05 +02:00
Enno Rehling
84a92124bd Merge branch 'feature/bug-2053-attack-monsters' of https://github.com/ennorehling/eressea into ennorehling-feature/bug-2053-attack-monsters 
Conflicts:
	conf/e3/config.xml
 2015-09-19 13:35:53 +02:00
Enno Rehling
a795226368 just a script for fixing broken familiar links between releases 2015-09-15 17:43:22 +02:00
Enno Rehling
e217a4b550 age_unit accidentally returned AT_AGE_REMOVE (caused by a recent change to curse_age) 2015-09-14 22:58:12 +02:00
Enno Rehling
3a1444f378 backport (failing) at_familiarmage test from 3.7 branch 2015-09-14 17:38:58 +02:00
Enno Rehling
23a7ed59ac backport familiar skill test from 3.7 development 2015-09-14 17:17:29 +02:00
Enno Rehling
1122bb70a4 fix museum terrains 2015-09-13 10:05:52 +02:00
Enno Rehling
2dcd69cb46 Merge pull request #301 from ennorehling/develop 
fix terrains.json in E2
 2015-09-13 09:55:47 +02:00
Enno Rehling
90bcf30628 fix bad terrain definitions in E2 (string, not number: these values are used for dice throws). 
clean up the jsonconf.c code for reading these a little bit, report more specific errors.
 2015-09-13 09:46:40 +02:00
Enno Rehling
a9abf4d87d Merge remote-tracking branch 'upstream/develop' into develop 
Conflicts:
	src/guard.c
	src/guard.h
 2015-09-12 23:48:01 +02:00
Enno Rehling
599a2bbc86 Merge pull request #300 from ennorehling/feature/guard-module 
guard module
 2015-09-12 23:45:44 +02:00
Enno Rehling
71c4cb53c0 add missing guard.h include everywhere, remove duplicate prototypes from config.h 2015-09-12 23:41:37 +02:00
Enno Rehling
dd9420fc38 move at_guard into guard module as well 2015-09-12 23:38:31 +02:00
Enno Rehling
3055f517dc move guard implementation into a module (WIP) 2015-09-12 22:53:54 +02:00
Enno Rehling
a931ac4fb6 move guard implementation into a module (WIP) 2015-09-12 22:49:43 +02:00
Enno Rehling
772b1cf203 Merge remote-tracking branch 'upstream/develop' into develop 2015-09-12 22:48:49 +02:00
Enno Rehling
5f7b9129bc Merge branch 'master' into develop 
Conflicts:
	tests/runtests.bat
 2015-09-12 22:47:33 +02:00
Enno Rehling
ee9586bc2e crontab time changes 2015-09-12 22:47:09 +02:00
Enno Rehling
b93a75c529 Merge pull request #299 from ennorehling/master 
fix logging for sp_igjarjuk
 2015-09-12 22:44:40 +02:00
Enno Rehling
47c48d2985 Merge branch 'master' into develop 2015-09-12 22:27:14 +02:00
Enno Rehling
871373a0e5 be less verbose about cursing 2015-09-12 22:26:54 +02:00
Enno Rehling
7e6312441c cron fixes 2015-09-12 21:43:36 +02:00
Enno Rehling
de9fec8eed fix bug in a python script 
do not install crontab anywhere but eressea@gruenbaer
 2015-09-12 21:21:58 +02:00