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

9572 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
74fe5a8779 Merge remote-tracking branch 'upstream/master' 2018-11-04 12:12:34 +01:00
Enno Rehling
7a42f6926a
Merge pull request #816 from ennorehling/master 
Bug 2511: LERNE AUTO fixed, student limit increased
 2018-11-04 09:15:08 +01:00
Enno Rehling
1a10c0271d Bug 2511: LERNE AUTO fixed, student limit increased 2018-11-04 09:08:50 +01:00
Enno Rehling
d315d73fa8
Merge pull request #814 from ennorehling/master 
Version 3.17.6
 2018-10-31 15:31:22 +01:00
Enno Rehling
1eceef540a Merge branch 'master' of github.com:ennorehling/eressea 2018-10-31 07:00:13 +01:00
Enno Rehling
b5b39024f2 BUG 2506: starting regions have bad resource levels. 
add some one-off custom code to fix the resource levels of selected regions
 2018-10-30 21:01:16 +01:00
Enno Rehling
a8ff6d2a99 gmtool can now select and highlight islands. 2018-10-30 20:11:35 +01:00
Enno Rehling
00718424cf missing limits include 2018-10-30 06:02:55 +01:00
Enno Rehling
e8ca81bc1a BUG 2505: make build code more comlpicated, and fix multi-stage buildings. 2018-10-29 19:35:49 +01:00
Enno Rehling
f8040e2d9f unit test to also prove bug 2505 2018-10-29 18:54:23 +01:00
Enno Rehling
eba89b3eda Merge branch 'master' of https://github.com/ennorehling/eressea 2018-10-28 21:56:36 +01:00
Enno Rehling
e5207fd1c7 do not backup eressea.db right now 2018-10-28 21:55:34 +01:00
Enno Rehling
6326664b86 BUG 2505 proof by test. 2018-10-28 21:48:52 +01:00
Enno Rehling
dce5f7857b unused variable 2018-10-28 21:31:58 +01:00
Enno Rehling
be84c13a72 remove test_inject_messagetypes(), make that the default behavior in tests. 2018-10-28 21:28:05 +01:00
Enno Rehling
113a6e68c7 BUG 2507: LERNE AUTO with invalid skill. 2018-10-28 21:27:24 +01:00
Enno Rehling
f640cf56d6
Merge pull request #812 from ennorehling/master 
Hotfix undead spawn rate.
 2018-10-22 20:07:53 +02:00
Enno Rehling
1305edb744 BUG 2503: fix undead spawn rate 2018-10-22 19:59:28 +02:00
Enno Rehling
297312ddb3 Hirntoeter auch zaehlen. 2018-10-21 19:56:46 +02:00
Enno Rehling
820de2ee35 fix cont arguments for new clibs version 2018-10-21 19:30:19 +02:00
Enno Rehling
38c1dfe26f BUG 2503: statistics API, logging monster creation 2018-10-21 19:22:30 +02:00
Enno Rehling
0f3f7a68b9 upgrade clibs 2018-10-21 19:10:32 +02:00
Enno Rehling
4056f08afa Switching to VS2017 compiler has found a bug in pofile.c 2018-10-21 19:10:31 +02:00
Enno Rehling
ad4d7dca53 use latest clibs, like develop 2018-10-14 11:50:52 +02:00
Enno Rehling
ca835f7b04 Bei Neuauswertungen die Befehlsdatei neu erzeugen 2018-10-09 19:28:56 +02:00
Enno Rehling
a9c653c567
Merge pull request #811 from ennorehling/master 
Fix crash in report 1095
 2018-10-07 08:28:38 +02:00
Enno Rehling
0398a1b705 Bug 2497: LERNE AUTO was subtly broken. 2018-10-07 08:22:56 +02:00
Enno Rehling
e169e20cc3 Merge remote-tracking branch 'upstream/master' 2018-09-16 11:30:33 +02:00
Enno Rehling
7dabf554bd Merge remote-tracking branch 'upstream/master' 2018-09-16 11:29:40 +02:00
Enno Rehling
0c3126eb70 fix non-drifting ships crash 2018-09-16 11:25:34 +02:00
Enno Rehling
c5dd7d69df
Merge pull request #806 from ennorehling/master 
Bugfix: Rosthauch, Abtreiben
 2018-09-16 10:15:05 +02:00
Enno Rehling
552dbe5e72 In Rosthauch min und max verwechselt. 2018-09-16 10:10:17 +02:00
Enno Rehling
65675d1947 Fix crash when removing drifted ships. 2018-09-16 10:02:09 +02:00
Enno Rehling
419ff9b514 Merge remote-tracking branch 'upstream/master' 2018-09-10 18:00:27 +02:00
Enno Rehling
bca987ee64 force tag update after release 2018-09-10 17:54:39 +02:00
Enno Rehling
418d6b1f6c Bug 2486: spawn_chance für Drachen und Seeschlangen war zu hoch. 2018-09-10 17:52:23 +02:00
Enno Rehling
c40295f35c Merge remote-tracking branch 'upstream/master' 2018-09-09 15:52:02 +02:00
Enno Rehling
90f854f5b7
Merge pull request #803 from ennorehling/master 
Fixing LERNE AUTO
 2018-09-09 15:49:47 +02:00
Enno Rehling
9456c4bdc7 fix debug logging. 2018-09-09 15:16:11 +02:00
Enno Rehling
67089aeb8c Bug 2487: Fix LERNE AUTO translations 
Also disallow autolearning expensive skills.
 2018-09-09 15:13:20 +02:00
Enno Rehling
fe58b624b1 Merge remote-tracking branch 'upstream/master' 2018-09-09 12:11:24 +02:00
Enno Rehling
41f9d32923 Merge branch 'master' into develop 2018-09-09 07:50:25 +02:00
Enno Rehling
3c99677723
Merge pull request #802 from ennorehling/master 
Fix E2 crashing 2018-09-08
 2018-09-09 07:48:29 +02:00
Enno Rehling
6f5f1651c7 fix crashes when trying to trade on ocean. 
fix missing message sections.
 2018-09-09 07:41:30 +02:00
Enno Rehling
7544565237 start work on 3.18 release 2018-09-04 15:28:05 +02:00
Enno Rehling
264830ba74
Merge pull request #800 from eressea/develop 
Release version 3.17
 2018-09-04 15:26:30 +02:00
Enno Rehling
6fee918536
Merge pull request #799 from ennorehling/develop 
fix multiple coverity defects in parsers.
 2018-09-04 15:21:47 +02:00
Enno Rehling
876113d991 fix multiple coverity defects in parsers. 2018-09-03 20:43:17 +02:00
Enno Rehling
65a13d10ad
Merge pull request #798 from ennorehling/develop 
version 3.17, final preview
 2018-08-29 17:54:28 +02:00
Enno Rehling
af445e5ca1 BUG 2477 Null-Personen Meldungen sind unnötig. 2018-08-21 22:25:04 +02:00