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

9274 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
a48d177472 BUG 2401: fix combat display, again. 2018-01-07 17:22:15 +01:00
Enno Rehling
2cf20dd6e2 Bug 2407: do not cache study_cost(SK_MAGIC). 2018-01-07 15:26:17 +01:00
Enno Rehling
8e9ffa2d2b Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-01-07 14:04:16 +01:00
Enno Rehling
822612c94e Merge branch 'master' into develop 
Conflicts:
	process/run-turn
 2018-01-07 13:57:49 +01:00
Enno Rehling
c9157ec2a4 Merge remote-tracking branch 'upstream/master' 2018-01-07 13:56:45 +01:00
Enno Rehling
bd98cf1fbc on the Rapsberry Pi, long is only 32 bit 2018-01-07 13:56:05 +01:00
Enno Rehling
1bd28f8ce5
Merge pull request #755 from ennorehling/develop 
ongoing work
 2018-01-05 17:52:26 +01:00
Enno Rehling
4eb4c61d37 BUG 2387 some tweaks to the first draft. 2018-01-02 20:34:42 +01:00
Enno Rehling
c7a65116be add a test for racename. 2018-01-01 18:50:39 +01:00
Enno Rehling
e4859e68c9 do not use MIN and MAX. 2018-01-01 08:23:52 +01:00
Enno Rehling
6a31b432de disable storms in tests 2018-01-01 07:47:06 +01:00
Enno Rehling
77926d2d54 add soem debug output to intermittent test 2018-01-01 07:43:06 +01:00
Enno Rehling
0022f48c39 do not use MIN/MAX 2018-01-01 06:56:57 +01:00
Enno Rehling
396e0f6bd7 remove bsdstring from battle. 2018-01-01 01:17:16 +01:00
Enno Rehling
455a929d9e help cmake find pdcurses on windows. 2018-01-01 01:06:14 +01:00
Enno Rehling
1575a59921 fix cmake builds on windows. 2018-01-01 00:43:08 +01:00
Enno Rehling
564390a762
Merge pull request #754 from ennorehling/develop 
fix the preview report for 1057
 2017-12-31 21:37:44 +01:00
Enno Rehling
9d8cfc422c fix cmake detection of libbsd 2017-12-31 21:33:31 +01:00
Enno Rehling
a79e22984b cppcheck disabled, it is too slow 2017-12-31 20:47:40 +01:00
Enno Rehling
55479c960c break up the cppcheck tests, they time out on travis 2017-12-31 20:26:24 +01:00
Enno Rehling
62130ca44b add a strncat function to sbstring, use it for create_order. 
eliminate bsdstring.h use.
 2017-12-31 20:07:40 +01:00
Enno Rehling
0aa7a812ca Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-12-31 19:14:10 +01:00
Enno Rehling
cc8d34a1e7 fix sbs_strcat, use it for orders. 2017-12-31 18:51:56 +01:00
Enno Rehling
ddd30e6210 sbstring implmentation and first use. 2017-12-31 18:07:29 +01:00
Enno Rehling
d37b92dca1 Merge remote-tracking branch 'upstream/develop' into develop 2017-12-31 16:39:34 +01:00
Enno Rehling
01dd489b7a BUG 2403: endless loop (variable rename gone wrong). 2017-12-31 16:36:59 +01:00
Enno Rehling
643c989cf9 BUG 2401: fix attacker list, move code to reports.c 2017-12-31 15:05:49 +01:00
Enno Rehling
0440fcc11c bug 2400: magicbag preservation 2017-12-31 13:14:44 +01:00
Enno Rehling
0686e6ceba bug 2399: %% typo. 2017-12-31 11:57:57 +01:00
Enno Rehling
141941b760
Merge pull request #753 from ennorehling/master 
bug 2402: xmas fix
 2017-12-31 11:51:21 +01:00
Enno Rehling
da81537c92 bug 2402: xmas fix 
Conflicts:
	scripts/eressea/xmas.lua
 2017-12-31 11:39:44 +01:00
Enno Rehling
fc570d2ec7 bug 2402: xmas fix 2017-12-31 11:36:47 +01:00
Enno Rehling
057a19d7bf
Merge pull request #752 from ennorehling/develop 
header file shenanigans
 2017-12-30 21:16:44 +01:00
Enno Rehling
a6c2a878e0 remov bsdstring tests and include 2017-12-30 20:11:02 +01:00
Enno Rehling
83149de26a remove bsdstring.h where possible. 2017-12-30 20:09:48 +01:00
Enno Rehling
54572fe40e add missing include 2017-12-30 19:50:37 +01:00
Enno Rehling
a8140f1dc9 rename strlcpy->str_strlcpy, etc. 2017-12-30 19:49:21 +01:00
Enno Rehling
23ff404d2e move strlcat and strlcpy to strings.h 2017-12-30 13:04:00 +01:00
Enno Rehling
57b161132d fix conversion warnings (MSVC) 2017-12-30 11:51:57 +01:00
Enno Rehling
d45141255e Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-12-30 11:42:41 +01:00
Enno Rehling
07b25fbed1 missing include, thanks mac 2017-12-30 11:09:09 +01:00
Enno Rehling
c8ee0db02d stop using MIN and MAX 2017-12-30 08:58:50 +01:00
Enno Rehling
ea0acc49d9 iwyu 2017-12-30 07:22:09 +01:00
Enno Rehling
a6ae5a9e93 no more MINMAX 2017-12-30 00:06:07 +01:00
Enno Rehling
687f88d66e Merge branch 'master' into develop 2017-12-29 21:03:09 +01:00
Enno Rehling
d47bee5572 christmas 2017 2017-12-29 21:01:50 +01:00
Enno Rehling
f1a6203f3e Not yet ready to give up on the MIN/MAX macros 2017-12-29 19:26:20 +01:00
Enno Rehling
095148ab50 move va_copy macro closer to where it is used. 2017-12-29 17:00:16 +01:00
Enno Rehling
c3a812123f fix use of static configuration in study_cost. 2017-12-29 16:07:48 +01:00
Enno Rehling
c23e7bf9b9 add a unit test for academy_can_teach. 2017-12-29 13:37:17 +01:00