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

8701 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
a3ebddeae4 update cron to check environment for switches 
use server/bin instead of ~/bin
 2017-05-26 13:52:55 +02:00
Enno Rehling
4efe6f6a71 Merge pull request #696 from ennorehling/develop 
BUG 2328: absolutely final changes for 3.12
 2017-05-26 06:35:22 +02:00
Enno Rehling
b0b9eec05d Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-05-26 06:27:31 +02:00
Enno Rehling
8e15487a1e BUG 2328: wrong calendar seasons. 2017-05-26 06:27:25 +02:00
Enno Rehling
153039fdef fix gcc compilation, unused variable 2017-05-24 08:58:46 +02:00
Enno Rehling
18daa9db2f entirely remove RC_SPELL 2017-05-24 08:52:19 +02:00
Enno Rehling
30cfe2c0c0 convert RC_SPELL to at_observer during readgame. 2017-05-24 08:18:55 +02:00
Enno Rehling
86974df332 Merge branch 'feature/refactor-rcspell' of https://github.com/ennorehling/eressea.git 2017-05-22 22:08:22 +02:00
Enno Rehling
611d69908f remove unnecessary code. 2017-05-22 22:08:18 +02:00
Enno Rehling
95a9bb4ab9 register missing attribute. 2017-05-22 21:53:10 +02:00
Enno Rehling
94a4e52ac8 Merge branch 'develop' into feature/refactor-rcspell 2017-05-22 21:36:02 +02:00
Enno Rehling
a3f655f322 fix bogus warnings 2017-05-22 21:35:25 +02:00
Enno Rehling
1bb022ef58 Merge branch 'feature/refactor-rcspell' of https://github.com/ennorehling/eressea.git 2017-05-22 21:16:34 +02:00
Enno Rehling
51f8f87072 eliminate the O(n) lighthouse/inside complexity from prepare_report 2017-05-22 21:15:42 +02:00
Enno Rehling
17ed46e6a8 fix test 2017-05-22 19:50:18 +02:00
Enno Rehling
0755830754 fix compilation, test still fails 2017-05-21 23:47:54 +02:00
Enno Rehling
abb7c9fb17 Merge branch 'kill-rcspell' into feature/refactor-rcspell 
Conflicts:
	src/kernel/config.h
	src/main.c
	src/report.c
	src/reports.c
	src/reports.test.c
	src/spells.c
 2017-05-21 21:33:29 +02:00
Enno Rehling
37aded9b1d remove unused function 2017-05-21 16:12:13 +02:00
Enno Rehling
9525c8790c Merge branch 'stm2-bug2211_addendum' into develop 2017-05-21 14:53:14 +02:00
Enno Rehling
bc0726da18 remove duplicate test 2017-05-21 14:52:46 +02:00
Enno Rehling
c8e777c6d4 Merge branch 'bug2211_addendum' of https://github.com/stm2/server into stm2-bug2211_addendum 2017-05-21 14:51:13 +02:00
Enno Rehling
efb0501b20 additional testing 2017-05-21 13:10:53 +02:00
Enno Rehling
7b0ec466fa only enable certain pragmas for MSVC 2015 and later 2017-05-21 13:09:54 +02:00
Enno Rehling
88626fb163 optimization: select_fighters. 
use select_fighters with callback to reduce the number of selected units for (most) combat spells.
 2017-05-21 12:26:04 +02:00
Enno Rehling
58d9aa58a0 BUG 2326: Untote Helden fehlen in der Kampfübersicht 
https://bugs.eressea.de/view.php?id=2326
 2017-05-21 11:14:16 +02:00
Enno Rehling
f0fc37bd69 Merge pull request #693 from ennorehling/develop 
callback refactoring
 2017-05-12 22:22:43 +02:00
Enno Rehling
1bc23beccc remove btypr->name funcptr and btype->attribs. 
why weren't these already gone?
 2017-05-12 22:12:22 +02:00
Enno Rehling
11d9afc62e BUG 2322: Test and bugfix for castle names. 2017-05-12 22:05:14 +02:00
Enno Rehling
34d51d9e6c BUG 2322: Test and bugfix for castle names. 2017-05-12 22:03:27 +02:00
Enno Rehling
c7f8b16c07 remove unused r->land->items list. 2017-05-09 18:49:10 +02:00
Enno Rehling
6b7dcadf84 refactor resource callbacks into callbacks module 2017-05-09 08:18:20 +02:00
Enno Rehling
437c9c2d2e Merge branch 'develop' of github.com:ennorehling/eressea into develop 2017-05-09 06:42:40 +02:00
Enno Rehling
d9fca4dcb3 refactor stray fptr variable into callbacks module. 2017-05-08 22:44:18 +02:00
Enno Rehling
53dc475d9d remove unused callback functions. 2017-05-08 22:41:00 +02:00
Enno Rehling
c44e63e763 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2017-05-08 22:06:45 +02:00
Enno Rehling
92844e1a9c Merge pull request #692 from ennorehling/develop 
noxml branch preparations
 2017-05-08 22:02:48 +02:00
Enno Rehling
4fdfbb44b5 this config.xml was added by accident. 2017-05-08 08:15:18 +02:00
Enno Rehling
18defdd5a2 remove last pieces of calendar.xml 2017-05-08 06:57:03 +02:00
Enno Rehling
a2c963beb0 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2017-05-08 06:53:12 +02:00
Enno Rehling
8765204e00 add unit tests for calendar parsing. 2017-05-07 18:10:18 +02:00
Enno Rehling
b27ae83581 Merge pull request #691 from ennorehling/develop 
calendar in json, ponnuki nicht aggressiv
https://bugs.eressea.de/view.php?id=2321
 2017-05-07 17:53:08 +02:00
Enno Rehling
80ab32cf51 remove calendar.xml from rules. 2017-05-07 17:48:59 +02:00
Enno Rehling
7806f4991f store calendar configuration nin JSON, not XML. 2017-05-07 17:46:51 +02:00
Enno Rehling
ad465f1028 Ponnuki should not be aggressive. 2017-05-07 17:29:55 +02:00
Enno Rehling
bf935f5bb7 gamedate: no negative turns allowed. 
feed the beast assert.
 2017-05-07 16:12:10 +02:00
Enno Rehling
29061fa4ba fleshing out the calendar tests 2017-05-07 15:50:19 +02:00
Enno Rehling
fa7e21b783 very simple calendar test. 2017-05-07 13:40:43 +02:00
Enno Rehling
3e1462a192 add empty calendar unit test. 2017-05-07 13:35:59 +02:00
Enno Rehling
2e3f68ed87 add a config_set_int convenience function. 2017-05-07 13:26:54 +02:00
Enno Rehling
6ed2e5bb26 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2017-05-06 16:48:46 +02:00