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

9409 Commits

Author SHA1 Message Date
Enno Rehling 3bca8d969a Merge branch 'master' into develop 2018-03-16 21:58:52 +01:00
Enno Rehling 64f1a483b4
Merge pull request #776 from ennorehling/master 
BUG 2427: emergency fix for 13.5.3 release
 2018-03-16 21:57:34 +01:00
Enno Rehling 121bf343ea fix get_command for K_STUDY (still bug 2427). 2018-03-16 21:49:24 +01:00
Enno Rehling db5d9e069e failing test for bug 2427: create_order(K_STUDY, ...) 2018-03-16 19:52:54 +01:00
Enno Rehling fa1056a696 fix sigaction code for macos 2018-03-16 16:21:33 +01:00
Enno Rehling ac8ae18588 allow a per-game seed in eressea.ini 2018-03-11 19:10:08 +01:00
Enno Rehling 9ba255e269 allow a maxnmr setting in eressea.ini to override the nmr.timeout rule. 2018-03-11 19:07:05 +01:00
Enno Rehling ed46a24f58 re-enable backtraces on linux. 2018-03-11 16:52:07 +01:00
Enno Rehling 9243f30c0e Merge branch 'develop' of github.com:eressea/server into develop 2018-03-11 15:00:11 +01:00
Enno Rehling d1ab941eac
Merge pull request #775 from ennorehling/develop 
ongoign changes and bug fixes for 3.16
 2018-03-11 14:54:23 +01:00
Enno Rehling da984b5880 BUG 2425: lighthouses can see units. 2018-03-11 14:40:38 +01:00
Enno Rehling 6d98a5dc4f BUG 2424 remove invlaid assertion 2018-03-11 11:39:57 +01:00
Enno Rehling 346f56ebdb merge conflict description namespace vs. xinclude removal and new potion names. 2018-03-11 09:19:16 +01:00
Enno Rehling a27fa287a0
Merge pull request #774 from ennorehling/master 
Fix 2018-03-11 crash in E3
 2018-03-11 09:11:58 +01:00
Enno Rehling bf21f24f98 BUG 2426: E3 hat kein RC_TEMPLATE, split potion names and descriptions 2018-03-11 09:02:02 +01:00
Enno Rehling 67a2f0bacd detect missing lua library 2018-03-10 18:32:31 +01:00
Enno Rehling b0840f83ef detect missing lua library 2018-03-10 18:27:11 +01:00
Enno Rehling 54ee7c04dc seenspell conversion bugfix 2018-03-10 17:46:48 +01:00
Enno Rehling ef3b72ceb7 BUG 2423: only apply other skill modifiers if race-modifier doesn't drop skill below 1. 2018-03-04 20:30:34 +01:00
Enno Rehling 7e33b2a94d BUG 2379: Test war kaputt (newterrain), getesteter Code auch. 2018-03-04 20:15:42 +01:00
Enno Rehling db253ea6a1 newterrain was unfit for unit testing. 
bad test: insects cannot trade in deserts without castle.
 2018-03-04 20:03:13 +01:00
Enno Rehling f997ff7e59 build problems. this looks like a merge conflict. 2018-03-04 18:21:00 +01:00
Enno Rehling fca684cf81 preview game 4 again 2018-03-04 11:49:02 +01:00
Enno Rehling f8de7cff69
Merge pull request #773 from ennorehling/master 
Master
 2018-02-26 19:52:58 +01:00
Enno Rehling 6c0f8a81f6 merge from master 2018-02-26 19:51:48 +01:00
Enno Rehling 622c103b00 more cppcheck messages 2018-02-26 19:48:52 +01:00
Enno Rehling 5518e43591 the "moved" attribute is unused 
so was a lot of other stuff.
 2018-02-26 19:47:03 +01:00
Enno Rehling db83140753 merge conflict nightmare fix. 2018-02-25 20:49:33 +01:00
Enno Rehling 432a8d432d messy merge of cppcheck fixes into develop 2018-02-25 20:41:53 +01:00
Enno Rehling 68ded1b9f1
Merge pull request #772 from ennorehling/master 
cppcheck fixes, gmtool repaired
 2018-02-25 20:30:31 +01:00
Enno Rehling 28e9ddbdb4 Merge branch 'master' 2018-02-25 20:27:16 +01:00
Enno Rehling b5b1050d73 Merge branch 'cppcheck' 2018-02-25 20:23:25 +01:00
Enno Rehling 43268b913b cppcheck ignores tests 2018-02-25 20:06:55 +01:00
Enno Rehling aae7e9b954 immer noch FAST_CONNECT Reste 2018-02-25 20:06:55 +01:00
Enno Rehling 15e2d82706 ignore some more defines 2018-02-25 20:06:55 +01:00
Enno Rehling a0fcdc83fe ignore TODO code 2018-02-25 20:06:55 +01:00
Enno Rehling 5d9d299e68 refactor repotring items 2018-02-25 20:06:55 +01:00
Enno Rehling 72daecd27e cppcheck false positives 2018-02-25 20:06:55 +01:00
Enno Rehling 079a55fe41 cppcheck warnings 2018-02-25 20:06:47 +01:00
Enno Rehling b7dcee7e08 fix goto-select-faction (itoa bug). 2018-02-25 19:36:28 +01:00
Enno Rehling aacd0885df fix termination bug in itoa functions. 2018-02-25 19:17:20 +01:00
Enno Rehling 8c554edfee findunitg was deprecated. 2018-02-25 18:35:40 +01:00
Enno Rehling 4181e23d15 FAST_CONNECT is always on. 
fix more cppcheck messages.
 2018-02-25 18:30:20 +01:00
Enno Rehling 120b03d2f5 Passing NULL after the last typed argument to a variadic function leads to undefined behaviour. 2018-02-25 18:14:48 +01:00
Enno Rehling 13cc8841d3 msg_setting is a dead feature, remove leftovers. 2018-02-25 18:10:09 +01:00
Enno Rehling fc2506ee83 cppcheck: DMAXHASH was unused. 
cppcheck: remove warnings, reduce variable scopes.
 2018-02-25 17:58:45 +01:00
Enno Rehling d802f6ea67 cppcheck: reduce variable scope. 2018-02-25 17:28:42 +01:00
Enno Rehling 6dd3783ecb unused #define 2018-02-25 17:19:54 +01:00
Enno Rehling 05242aaf2d Passing NULL after the last typed argument to a variadic function leads to undefined behaviour. 2018-02-25 17:18:30 +01:00
Enno Rehling 4ce7932d14 add some checks (cppcheck is weird). 2018-02-25 17:01:16 +01:00