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

10141 Commits

Author SHA1 Message Date
Enno Rehling 5acfdf5cd0 fix unused variable warning. 2019-04-24 15:13:27 +02:00
Enno Rehling 75dfed8082 Leerzeichen aus Beschreibungen trimmen. 2019-04-24 13:09:59 +02:00
Enno Rehling 7298968921 schema version 2 
faction no is a char(4), not an int.
 2019-04-24 08:08:50 +02:00
Enno Rehling d44eb74331 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-04-23 13:19:40 +02:00
Enno Rehling aab234a3f4 update to schema version 1 
- factions table is now faction
- no turn column
- new update logic
 2019-04-23 13:19:14 +02:00
Enno Rehling 6fcfca27ca Revert "stop using the turn column from gamedb" 
This reverts commit adb626df3d.
 2019-04-20 08:15:27 +02:00
Enno Rehling adb626df3d stop using the turn column from gamedb 2019-04-19 20:14:43 +02:00
Enno Rehling bb3ce32be6 fix default crtag locale 2019-04-08 14:56:44 +02:00
Enno Rehling 91e40b7061 Bug 1982: Klone auflösen, und Magiern ihre permanete Aura und Trank zurück geben. 2019-04-07 21:37:06 +02:00
Enno Rehling 3f021b21cd Bug 1982: disable the clone spell. 2019-04-07 17:55:04 +02:00
Enno Rehling 94f54dc105 Merge branch 'master' of github.com:ennorehling/eressea 2019-04-07 16:07:10 +02:00
Enno Rehling 21e226b068 Bug 2576: fix indexing of portals. 2019-04-07 16:05:00 +02:00
Enno Rehling 2c03c67075 fix cmake syntax. 2019-04-07 15:29:16 +02:00
Enno Rehling de5181f3fe I am moving my library dependency folder to c:\libraries 
build.bat needed to know that.
 2019-04-07 15:29:12 +02:00
Enno Rehling c92f7505e5 Bug 2576: additional logging. 
increase log verbosity, decrease some log levels.
 2019-04-07 15:28:47 +02:00
Enno Rehling ca5e7b82ae Bug 2570: Linie vor jeder Region, Leerzeilen aufgeräumt. 2019-04-07 15:27:11 +02:00
Enno Rehling bcca812ecc Bug 2576: additional logging. 
increase log verbosity, decrease some log levels.
 2019-04-07 13:11:02 +02:00
Enno Rehling 510b6c2628 Zeige keine Luxusgüter-Statistik im Ozean. 2019-04-06 19:00:59 +02:00
Enno Rehling 102a0e0e27 fix cmake syntax. 2019-04-06 11:41:56 +02:00
Enno Rehling 65dee13592 I am moving my library dependency folder to c:\libraries 
build.bat needed to know that.
 2019-04-06 11:29:19 +02:00
Enno Rehling df746dd342 Newbie islands should not have volcano terrain. 2019-04-05 17:14:28 +02:00
Enno Rehling b48b69bc94 Let's apply the relaxed E3 hunger rules to E2. 2019-04-03 18:27:29 +02:00
Enno Rehling 6351f04916 blnak line conflict? 2019-04-03 18:24:42 +02:00
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 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 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