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

10371 Commits

Author SHA1 Message Date
Enno Rehling f7b4ff3c4c
Merge pull request #843 from ennorehling/master 
Bug 2569: Rostregen macht zu viele Waffen kaputt.
 2019-03-31 21:30:01 +02:00
Enno Rehling f9b2c40792
Merge pull request #844 from ennorehling/develop 
ongoing bugfixes
 2019-03-31 21:29:47 +02:00
Enno Rehling 3b1a615f25 Merge branch 'master' into develop 2019-03-31 21:20:21 +02:00
Enno Rehling 29a9d8d30b Merge remote-tracking branch 'upstream/master' 2019-03-31 21:18:35 +02:00
Enno Rehling 17484e220f Bug 2569: Rostregen macht zu viele Waffen kaputt. 2019-03-31 21:03:31 +02:00
Enno Rehling 8868855837 allow setting password to null 2019-03-31 18:14:37 +02:00
Enno Rehling 53662878aa minor cleanup 2019-03-31 10:19:02 +02:00
Enno Rehling 2ec6021278
Merge pull request #842 from ennorehling/master 
FIX_STARTLEVEL_VERSION
 2019-03-24 21:37:11 +01:00
Enno Rehling 8f5eff063e Merge branch 'master' of github.com:ennorehling/eressea 2019-03-24 21:27:57 +01:00
Enno Rehling fc6bb36ee4 BUG 2566 mountains with no low-level resources. 
NB: new data version
 2019-03-24 21:27:43 +01:00
Enno Rehling a5755a4976
Merge pull request #841 from ennorehling/master 
important bugfix for bad data
 2019-03-24 18:20:58 +01:00
Enno Rehling 9168a25bf2 test debugging 2019-03-24 18:13:42 +01:00
Enno Rehling 7c64ec5612 test debugging 2019-03-24 18:05:40 +01:00
Enno Rehling a75b46d6d4 Merge branch 'master' of github.com:ennorehling/eressea 2019-03-24 17:53:41 +01:00
Enno Rehling 24a9d483e7
Merge pull request #840 from ennorehling/develop 
develop updates
 2019-03-24 17:52:25 +01:00
Enno Rehling 63b762a627 missing nul-termination triggers valgrind. 2019-03-24 17:51:41 +01:00
Enno Rehling 7c01170563 Merge branch 'master' into develop 2019-03-24 17:27:58 +01:00
Enno Rehling f1c27f09e3 dragon evolution gives full hitpoints. 2019-03-24 17:24:16 +01:00
Enno Rehling ea1bf3d3b9 Bug 2567: we had alliances with status 0 in the data. 2019-03-24 17:18:25 +01:00
Enno Rehling dd927aebb6 Merge branch 'master' of github.com:ennorehling/eressea 2019-03-24 17:17:08 +01:00
Enno Rehling 9b3bb7d643 Merge remote-tracking branch 'upstream/master' 2019-03-18 10:37:39 +01:00
Enno Rehling 2a702cbabc Merge remote-tracking branch 'upstream/develop' into develop 2019-03-18 10:37:13 +01:00
Enno Rehling d1fbd924e0 increase version number 2019-03-18 10:36:33 +01:00
Enno Rehling 37c47effae Merge branch 'master' into develop 2019-03-18 10:32:49 +01:00
Enno Rehling ef81a20c6e 2565 Leerzeile nach Helfe-Status. 
Helfestatus an das Ende des Reports.
 2019-03-11 21:37:32 +01:00
Enno Rehling 3fb9b0db13 fix the new password test 2019-03-03 13:31:02 +01:00
Enno Rehling 5eb4115054 new players should have lastorders = 0, get password. 2019-03-03 13:30:53 +01:00
Enno Rehling 6a286db0f0 upgrade to cJSON 1.7.10 2019-03-03 13:14:38 +01:00
Enno Rehling 8cc38420f0 missing nul-termination triggers valgrind. 2019-03-03 13:13:46 +01:00
Enno Rehling 2a0688d1b4 re-enable undead check, I think it is fixed. 2019-03-03 13:12:37 +01:00
Enno Rehling 9f3f9d7c56 fix the new password test 2019-03-03 13:12:08 +01:00
Enno Rehling 8253d8f833 new players should have lastorders = 0, get password. 2019-03-03 13:11:20 +01:00
Enno Rehling 5dd12df100 BUG 2564: show new spells. 2019-03-03 13:11:03 +01:00
Enno Rehling 5a5a6de69d Merge remote-tracking branch 'upstream/master' 2019-03-03 09:53:40 +01:00
Enno Rehling 9210f77a1a fix bcrypt use 2019-03-03 09:44:44 +01:00
Enno Rehling f5a03d4501 stop writing password to logfile 2019-03-03 09:42:42 +01:00
Enno Rehling e24ebd7cbd do not fail on malformed passwords 2019-03-03 09:42:42 +01:00
Enno Rehling d122ba22d0 fix reports backup, I hope 2019-03-03 09:42:42 +01:00
Enno Rehling 894bb4db4c BUG 2504: skeletons can learn. 
There was a mixup between the AI feature and the race capability, so I cleared up the code a little bit.
It's annoying that these flags are in the same int.
 2019-03-03 09:42:42 +01:00
Enno Rehling de06600394 fix coverity errors 2019-03-03 09:42:42 +01:00
Enno Rehling 07f7adbe56 include expat in dependencies 2019-03-03 09:42:42 +01:00
Enno Rehling f83f17687b remove queue after we are done with it 2019-03-03 09:42:42 +01:00
Enno Rehling 306c1d8659 simplify the orders.queue locking logic, remove it from python 2019-03-03 09:42:42 +01:00
Enno Rehling d03f2cdab6 Mantis 2552: rewrite goblin stealing to be more readable. 2019-03-03 09:42:42 +01:00
Enno Rehling 2e1bd01c54 asciification 2019-03-03 09:42:42 +01:00
Enno Rehling ffccf8014f asciification 2019-03-03 09:42:42 +01:00
Enno Rehling 1944c2c136 asciify more files 2019-03-03 09:42:42 +01:00
Enno Rehling debb86601b umlaut substitutions 2019-03-03 09:42:42 +01:00
Enno Rehling 9e44b8a989 kaputte umlaute ersetzt, ascii 4 lyfe 2019-03-03 09:42:42 +01:00
Enno Rehling 9436640d22 remove UTF-8 BOM from sources 2019-03-03 09:42:42 +01:00