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

8437 Commits

Author SHA1 Message Date
Enno Rehling 2c9c4c23f0 convert warning to debug output 2017-06-11 14:47:33 +02:00
Enno Rehling 025a04a5e9 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	scripts/tests/common.lua
 2017-05-28 12:47:54 +02:00
Enno Rehling b266509746 Einheitenlimit anheben (3000 und 500) 2017-05-27 20:07:36 +02:00
Enno Rehling 9e213d3bcd minor optimization and using fraction code 2017-05-26 19:05:46 +02:00
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 a3f655f322 fix bogus warnings 2017-05-22 21:35:25 +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 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
Enno Rehling 9d5369ff1e coverity: unintended integer division 2017-05-06 16:48:32 +02:00
Enno Rehling 44b114a9c4 Merge pull request #690 from ennorehling/develop 
ship and building search improvements
 2017-05-06 16:16:09 +02:00
Enno Rehling 898c12e99a XML construction elements never have a building. 
required buildings are encoded by RMT_PROD_REQUIRE.
improved error messaging.
 2017-05-06 15:53:21 +02:00
Enno Rehling b74d18b8c9 bt_register is non-standard API, hide it. 
factor out st_register for readability.
 2017-05-06 15:39:09 +02:00
Enno Rehling 3eb89e93ae use a cbtrie for shiptype-lookups instead of the selist. 2017-05-06 15:33:35 +02:00
Enno Rehling 6778cbe483 assert that we do not add new ship types after the per-language lookup is initialized. 2017-05-06 15:26:45 +02:00
Enno Rehling dd4bdca72b do not use the shiptypes list for searches, use a cbtrie. 2017-05-06 15:05:36 +02:00
Enno Rehling 7f16e18ded quick fix for intermittent spells 2017-05-06 13:54:11 +02:00
Enno Rehling 3b5bd6779a Merge branch 'develop' of github.com:ennorehling/eressea into develop 2017-05-06 13:52:46 +02:00
Enno Rehling 981f003231 Merge pull request #689 from ennorehling/develop 
many spell-related changes
 2017-05-06 13:46:48 +02:00