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

10416 Commits

Author SHA1 Message Date
Enno Rehling b13deb2b04 test maximum shipspeed with all modifiers 2019-04-30 22:06:08 +02:00
Enno Rehling 6b93acec08
Merge pull request #848 from ennorehling/master 
2577: Fix resource values, again.
 2019-04-30 19:00:34 +02:00
Enno Rehling ab58dd6e3a Merge branch 'master' of github.com:ennorehling/eressea 2019-04-30 19:00:33 +02:00
Enno Rehling 505ad39ddf coverity cert hack 2019-04-30 19:00:11 +02:00
Enno Rehling 5cde26e25e preview gets games as arguments, game 4 is over 2019-04-30 19:00:11 +02:00
Enno Rehling 8c0fc4bd91 2577: Fix resource values, again. 2019-04-30 18:56:37 +02:00
Enno Rehling bbcb2113d7 WIP feature: STIRB <password> [PARTEI <nr>] 2019-04-30 18:40:24 +02:00
Enno Rehling 0e1b61e00e
Merge pull request #847 from ennorehling/master 
bugfix muschelplateau
 2019-04-28 23:14:37 +02:00
Enno Rehling a2b89b5354 Merge branch 'master' into develop 2019-04-28 18:31:29 +02:00
Enno Rehling 46f1d36c17 Merge branch 'master' of github.com:ennorehling/eressea 2019-04-28 18:31:13 +02:00
Enno Rehling f89c414bcd Bug 2580: Muschelplateau 2019-04-28 18:30:54 +02:00
Enno Rehling f42df810d6
Merge pull request #846 from ennorehling/develop 
Development ongoing
 2019-04-27 18:43:50 +02:00
Enno Rehling 968f67a567 delete intermittent test: ents have no special guarding powers. 2019-04-27 18:30:30 +02:00
Enno Rehling cffcac8af7 fix binding faction.no to sqlite statement. 2019-04-26 23:54:22 +02:00
Enno Rehling 90cd77c586 preview gets games as arguments, game 4 is over 2019-04-26 18:56:38 +02:00
Enno Rehling 71090d0091 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-04-26 06:22:02 +02:00
Enno Rehling 7e9b9330a3 Merge branch 'master' into develop 2019-04-26 06:14:56 +02:00
Enno Rehling d67c1d9899 Merge remote-tracking branch 'upstream/master' 2019-04-26 06:13:40 +02:00
Enno Rehling 97afaa29c3 increase maximum number of submissions per week from 20 to 30. 2019-04-26 06:10:17 +02:00
Enno Rehling 2442aed1db null pointer handling for strlcpy 2019-04-25 16:31:35 +02:00
Enno Rehling 692cdcea13 Rechtschreibung 
Dragon Evolution: hitpoint tweaking.
 2019-04-25 08:44:48 +02:00
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 d868dbb439
Merge pull request #845 from ennorehling/develop 
Development
 2019-04-06 19:52:15 +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 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