Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • b0186cab6b
         Merge pull request #853 from ennorehling/develop Enno Rehling 2019-05-11 21:07:13 +0200
  • 48a343db36 Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2019-05-11 20:52:19 +0200
  • 7dbb417b93 Bug 2575 Enno Rehling 2019-05-11 20:51:42 +0200
  • 93bcf53f96 Merge branch 'master' into develop Enno Rehling 2019-05-09 21:57:01 +0200
  • c5ec577f33 Merge remote-tracking branch 'upstream/master' Enno Rehling 2019-05-09 21:56:50 +0200
  • 182d7df480 do not include the database when creating order file the old way Enno Rehling 2019-05-09 21:55:45 +0200
  • 5d7ef85fe5 Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2019-05-08 21:12:02 +0200
  • 7a59a11c20 Merge branch 'master' into develop Enno Rehling 2019-05-08 21:09:39 +0200
  • 3d05dd4484 Merge remote-tracking branch 'upstream/master' Enno Rehling 2019-05-08 21:08:48 +0200
  • ef90806ca0 hold lockfile only during python script v3.19.6 Enno Rehling 2019-05-08 21:08:14 +0200
  • 4efe63d3e2
         Merge pull request #852 from ennorehling/master Enno Rehling 2019-05-08 18:43:30 +0200
  • 85a7066ecc move php calls from python to shell script Enno Rehling 2019-05-08 18:23:19 +0200
  • 32da0028c1 write to database after the file is created and dated Enno Rehling 2019-05-07 21:45:10 +0200
  • 305098c32c do not pollute global namespace with import statements Enno Rehling 2019-05-07 19:46:22 +0200
  • 618247e4bf Merge branch 'master' of github.com:ennorehling/eressea Enno Rehling 2019-05-07 19:36:50 +0200
  • 0701f895f4 Merge remote-tracking branch 'upstream/master' Enno Rehling 2019-05-07 19:35:20 +0200
  • c5aa6fc940
         Merge pull request #851 from ennorehling/develop Enno Rehling 2019-05-05 20:32:32 +0200
  • eaddeaa783
         Merge pull request #850 from ennorehling/master Enno Rehling 2019-05-04 19:01:36 +0200
  • f5e9bc9696 Merge branch 'orders-db' Enno Rehling 2019-05-04 18:54:05 +0200
  • 11b628d092 use the orders databse script if it exists Enno Rehling 2019-05-04 17:37:11 +0200
  • b20e6972a5 write accepted orders to database Enno Rehling 2019-05-04 16:21:03 +0200
  • dbbfc3317e Merge remote-tracking branch 'upstream/master' Enno Rehling 2019-05-04 16:20:40 +0200
  • 44713d0aa2
         Merge pull request #849 from ennorehling/2541-quit Enno Rehling 2019-05-04 14:02:08 +0200
  • 5c7788ecdd Merge branch '2541-quit' into develop Enno Rehling 2019-05-04 12:01:55 +0200
  • cd28f3aee4 heroes lose their status when gifted. Enno Rehling 2019-05-04 11:11:30 +0200
  • 2cb4287268 do not transfer migrants. comments are good. Enno Rehling 2019-05-04 10:55:13 +0200
  • 8605409ed3 limited-skill units are only transferred up to the limit. Enno Rehling 2019-05-04 10:45:51 +0200
  • 6637c94852 do not allow transfer of heros and limited units. Enno Rehling 2019-05-01 20:46:26 +0200
  • 0daa0ec04e Rechtschreibung Enno Rehling 2019-05-01 20:10:20 +0200
  • 8918f3fa9e Merge branch '2550-shipspeed' into develop Enno Rehling 2019-05-01 20:08:49 +0200
  • 7b3b792d01 Nicht Sonnensegel verhindert Sturmelementar, sondern Sturmelementar verhindert Sturmelementar. Enno Rehling 2019-05-01 20:08:14 +0200
  • b13deb2b04 test maximum shipspeed with all modifiers Enno Rehling 2019-04-30 22:06:08 +0200
  • 6b93acec08
         Merge pull request #848 from ennorehling/master Enno Rehling 2019-04-30 19:00:34 +0200
  • ab58dd6e3a Merge branch 'master' of github.com:ennorehling/eressea Enno Rehling 2019-04-30 19:00:33 +0200
  • 505ad39ddf coverity cert hack Enno Rehling 2019-04-30 19:00:03 +0200
  • 5cde26e25e preview gets games as arguments, game 4 is over Enno Rehling 2019-04-26 18:56:38 +0200
  • 8c0fc4bd91 2577: Fix resource values, again. Enno Rehling 2019-04-30 18:56:37 +0200
  • bbcb2113d7 WIP feature: STIRB <password> [PARTEI <nr>] Enno Rehling 2019-04-30 18:40:24 +0200
  • 0e1b61e00e
         Merge pull request #847 from ennorehling/master Enno Rehling 2019-04-28 23:14:37 +0200
  • a2b89b5354 Merge branch 'master' into develop Enno Rehling 2019-04-28 18:31:29 +0200
  • 46f1d36c17 Merge branch 'master' of github.com:ennorehling/eressea Enno Rehling 2019-04-28 18:31:13 +0200
  • f89c414bcd Bug 2580: Muschelplateau Enno Rehling 2019-04-28 18:30:54 +0200
  • f42df810d6
         Merge pull request #846 from ennorehling/develop Enno Rehling 2019-04-27 18:43:50 +0200
  • 968f67a567 delete intermittent test: ents have no special guarding powers. Enno Rehling 2019-04-27 18:30:30 +0200
  • cffcac8af7 fix binding faction.no to sqlite statement. Enno Rehling 2019-04-26 23:54:22 +0200
  • 90cd77c586 preview gets games as arguments, game 4 is over Enno Rehling 2019-04-26 18:56:38 +0200
  • 71090d0091 Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2019-04-26 06:22:02 +0200
  • 7e9b9330a3 Merge branch 'master' into develop Enno Rehling 2019-04-26 06:14:56 +0200
  • d67c1d9899 Merge remote-tracking branch 'upstream/master' Enno Rehling 2019-04-26 06:13:40 +0200
  • 97afaa29c3 increase maximum number of submissions per week from 20 to 30. v3.19.5 Enno Rehling 2019-04-26 06:10:17 +0200
  • 2442aed1db null pointer handling for strlcpy Enno Rehling 2019-04-25 16:31:35 +0200
  • 692cdcea13 Rechtschreibung Dragon Evolution: hitpoint tweaking. Enno Rehling 2019-04-25 08:44:48 +0200
  • 5acfdf5cd0 fix unused variable warning. Enno Rehling 2019-04-24 15:13:27 +0200
  • 75dfed8082 Leerzeichen aus Beschreibungen trimmen. Enno Rehling 2019-04-24 12:55:41 +0200
  • 7298968921 schema version 2 faction no is a char(4), not an int. Enno Rehling 2019-04-24 08:08:50 +0200
  • d44eb74331 Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2019-04-23 13:19:40 +0200
  • aab234a3f4 update to schema version 1 - factions table is now faction - no turn column - new update logic Enno Rehling 2019-04-23 13:18:51 +0200
  • 6fcfca27ca Revert "stop using the turn column from gamedb" Enno Rehling 2019-04-20 08:15:27 +0200
  • adb626df3d stop using the turn column from gamedb Enno Rehling 2019-04-19 20:14:43 +0200
  • bb3ce32be6 fix default crtag locale Enno Rehling 2019-04-08 14:56:44 +0200
  • 91e40b7061 Bug 1982: Klone auflösen, und Magiern ihre permanete Aura und Trank zurück geben. Enno Rehling 2019-04-07 21:37:06 +0200
  • 3f021b21cd Bug 1982: disable the clone spell. Enno Rehling 2019-04-07 17:55:04 +0200
  • 94f54dc105 Merge branch 'master' of github.com:ennorehling/eressea Enno Rehling 2019-04-07 16:07:10 +0200
  • 21e226b068 Bug 2576: fix indexing of portals. Enno Rehling 2019-04-07 16:05:00 +0200
  • 2c03c67075 fix cmake syntax. Enno Rehling 2019-04-06 11:41:56 +0200
  • de5181f3fe I am moving my library dependency folder to c:\libraries build.bat needed to know that. Enno Rehling 2019-04-06 11:29:19 +0200
  • c92f7505e5 Bug 2576: additional logging. increase log verbosity, decrease some log levels. Enno Rehling 2019-04-07 13:11:02 +0200
  • ca5e7b82ae Bug 2570: Linie vor jeder Region, Leerzeilen aufgeräumt. Enno Rehling 2019-04-07 15:27:11 +0200
  • bcca812ecc Bug 2576: additional logging. increase log verbosity, decrease some log levels. Enno Rehling 2019-04-07 13:11:02 +0200
  • d868dbb439
         Merge pull request #845 from ennorehling/develop Enno Rehling 2019-04-06 19:52:15 +0200
  • 510b6c2628 Zeige keine Luxusgüter-Statistik im Ozean. Enno Rehling 2019-04-06 19:00:59 +0200
  • 102a0e0e27 fix cmake syntax. Enno Rehling 2019-04-06 11:41:56 +0200
  • 65dee13592 I am moving my library dependency folder to c:\libraries build.bat needed to know that. Enno Rehling 2019-04-06 11:29:19 +0200
  • df746dd342 Newbie islands should not have volcano terrain. Enno Rehling 2019-04-05 17:14:28 +0200
  • b48b69bc94 Let's apply the relaxed E3 hunger rules to E2. Enno Rehling 2019-04-03 18:27:29 +0200
  • 6351f04916 blnak line conflict? Enno Rehling 2019-04-03 18:24:42 +0200
  • f7b4ff3c4c
         Merge pull request #843 from ennorehling/master v3.19.4 Enno Rehling 2019-03-31 21:30:01 +0200
  • f9b2c40792
         Merge pull request #844 from ennorehling/develop Enno Rehling 2019-03-31 21:29:47 +0200
  • 3b1a615f25 Merge branch 'master' into develop Enno Rehling 2019-03-31 21:20:21 +0200
  • 29a9d8d30b Merge remote-tracking branch 'upstream/master' Enno Rehling 2019-03-31 21:18:35 +0200
  • 17484e220f Bug 2569: Rostregen macht zu viele Waffen kaputt. Enno Rehling 2019-03-31 21:03:31 +0200
  • 8868855837 allow setting password to null Enno Rehling 2019-03-31 18:14:37 +0200
  • 53662878aa minor cleanup Enno Rehling 2019-03-31 10:19:02 +0200
  • 2ec6021278
         Merge pull request #842 from ennorehling/master v3.19.3 Enno Rehling 2019-03-24 21:37:11 +0100
  • 8f5eff063e Merge branch 'master' of github.com:ennorehling/eressea Enno Rehling 2019-03-24 21:27:57 +0100
  • fc6bb36ee4 BUG 2566 mountains with no low-level resources. NB: new data version Enno Rehling 2019-03-24 21:27:43 +0100
  • a5755a4976
         Merge pull request #841 from ennorehling/master Enno Rehling 2019-03-24 18:20:58 +0100
  • 9168a25bf2 test debugging Enno Rehling 2019-03-24 18:05:40 +0100
  • 7c64ec5612 test debugging Enno Rehling 2019-03-24 18:05:40 +0100
  • a75b46d6d4 Merge branch 'master' of github.com:ennorehling/eressea Enno Rehling 2019-03-24 17:53:41 +0100
  • 24a9d483e7
         Merge pull request #840 from ennorehling/develop Enno Rehling 2019-03-24 17:52:25 +0100
  • 63b762a627 missing nul-termination triggers valgrind. Enno Rehling 2019-02-17 15:34:14 +0100
  • 7c01170563 Merge branch 'master' into develop Enno Rehling 2019-03-24 17:27:58 +0100
  • f1c27f09e3 dragon evolution gives full hitpoints. Enno Rehling 2019-03-24 17:24:16 +0100
  • ea1bf3d3b9 Bug 2567: we had alliances with status 0 in the data. Enno Rehling 2019-03-24 17:18:25 +0100
  • dd927aebb6 Merge branch 'master' of github.com:ennorehling/eressea Enno Rehling 2019-03-24 17:17:08 +0100
  • 9b3bb7d643 Merge remote-tracking branch 'upstream/master' Enno Rehling 2019-03-18 10:37:39 +0100
  • 2a702cbabc Merge remote-tracking branch 'upstream/develop' into develop Enno Rehling 2019-03-18 10:37:13 +0100
  • d1fbd924e0 increase version number Enno Rehling 2019-03-18 10:36:33 +0100
  • 37c47effae Merge branch 'master' into develop Enno Rehling 2019-03-18 10:32:49 +0100