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

Commit Graph

  • c515d76c5d Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2020-01-18 12:08:05 +0100
  • 5c5649a8ea Merge branch 'master' into develop Enno Rehling 2020-01-16 18:22:34 +0100
  • 3b09b401f7 Revert unnecessary trade limit bugfix Enno Rehling 2020-01-16 18:19:25 +0100
  • b88f9e8610 remove duplicate calculation. Enno Rehling 2020-01-15 23:08:11 +0100
  • 7aaa0fc301 Bug 2633: Porting the test from my "fix" to prove that it wasn't required. Enno Rehling 2020-01-15 22:48:20 +0100
  • 27aac671a4 simplicate and add lightness Enno Rehling 2020-01-14 21:00:54 +0100
  • 6626cfe297 Bug 2633: implement combined trade limits. Enno Rehling 2020-01-14 20:57:29 +0100
  • e02c1e9d00 Bug 2631: Kein Konvoi mit Sonnensegel. Enno Rehling 2020-01-13 22:24:48 +0100
  • 06f00cae53 Bug 2632: no flying convoy Enno Rehling 2020-01-13 22:21:26 +0100
  • 00ac549750 idiot-proofing the newfactions file parser Enno Rehling 2020-01-08 20:57:29 +0100
  • bfd89687cd when planting saplings, plant remaining seeds. Enno Rehling 2020-01-07 20:37:21 +0100
  • 043949c8d0 Bug 2625 PFLANZE Implementation aufgeklärt, Tests geschrieben. Enno Rehling 2020-01-07 20:28:43 +0100
  • 2e054f27cc Bug 2630: Drachen 1. Jungdrachen sind Drachen (RCF_DRAGON) 2. Ein Monster das nicht kämpfen kann, braucht nicht zu plündern. 3. make code more readable. 4. Wer schon bewacht, braucht keinen BEWACHE Befehl. Enno Rehling 2020-01-07 19:24:10 +0100
  • ea15af879e Bug 2625 disable springtime sapling test. Enno Rehling 2020-01-04 20:05:10 +0100
  • 967cfd107b re-enable test Enno Rehling 2020-01-04 20:00:57 +0100
  • fb21d6d932 kill ancient godcursezone code. add some tests for planting seeds. Enno Rehling 2020-01-04 12:22:14 +0100
  • 59d8775e21 Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2020-01-04 12:20:57 +0100
  • 6806881bf1 Merge branch 'master' of github.com:ennorehling/eressea Enno Rehling 2020-01-04 11:35:50 +0100
  • 32d2970965
         Merge pull request #886 from ennorehling/develop Enno Rehling 2020-01-03 20:28:00 +0100
  • 84dfe46ce5 Revert "bug 2625 samen werden direkt zu schoesslingen" Enno Rehling 2020-01-03 20:21:14 +0100
  • c9f82d81f9 Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2020-01-03 20:20:47 +0100
  • 4785829d7f Typo Enno Rehling 2020-01-03 18:02:42 +0100
  • e337b8b494 Bug 2626: Korrekter Meldungstext. Enno Rehling 2020-01-03 17:14:44 +0100
  • c8c22aea1b bug 2624: short range conversion bug in tree growth Enno Rehling 2020-01-02 12:47:09 +0100
  • 4f88bf137e bug 2625 samen werden direkt zu schoesslingen Enno Rehling 2020-01-02 12:10:38 +0100
  • dcf9b9df26 bug 2626: fehlende neue messages nachtragen Enno Rehling 2020-01-02 11:34:26 +0100
  • 787cc28a4c Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2019-12-29 16:08:32 +0100
  • d949d9a6d0 Bug 2623: Untote dürfen nicht in heilige Regionen ziehen. Code style fixes. Enno Rehling 2019-12-29 14:28:55 +0100
  • d22af93d5e Merge branch 'master' into develop Enno Rehling 2019-12-25 20:44:25 +0100
  • face5eeb31 increase maxfiles to 50, handle error when no file generated. v3.22.2 Enno Rehling 2019-12-23 15:20:39 +0100
  • cef5ff44eb Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2019-12-01 17:30:34 +0100
  • c5f3cd420a Merge remote-tracking branch 'upstream/master' Enno Rehling 2019-12-01 17:30:17 +0100
  • b45fe6b157 Merge branch 'master' of github.com:ennorehling/eressea Enno Rehling 2019-12-01 17:30:07 +0100
  • 5428211751 Merge remote-tracking branch 'upstream/master' into develop Enno Rehling 2019-12-01 17:29:25 +0100
  • 71566b9bab Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2019-12-01 17:29:15 +0100
  • 0b623d0768 monster include structure, contd. Enno Rehling 2019-12-01 17:28:51 +0100
  • 2573ab19b5 begin work on v3.23 Enno Rehling 2019-12-01 17:20:34 +0100
  • 08f7d267b8 version 3.22 is released v3.22.1 Enno Rehling 2019-12-01 17:16:12 +0100
  • d6b5dea014 version 3.22 is released Enno Rehling 2019-12-01 17:16:12 +0100
  • b0792b57e9 move binding function declarations to headers. Enno Rehling 2019-12-01 17:07:09 +0100
  • 017f2c4e75
         Merge pull request #885 from eressea/develop v3.22.0 v3.22 Enno Rehling 2019-12-01 17:06:02 +0100
  • ff959cf059
         Merge pull request #884 from ennorehling/develop Enno Rehling 2019-12-01 16:55:14 +0100
  • 633866c814 STIRB PARTEI: Versuche, Helden zu übernehmen. Enno Rehling 2019-11-30 16:29:23 +0100
  • 1a8b94da59 STIRB PARTEI löscht die Befehle nicht. Reparatur des Tests für VERGESSE MAGIE (Vertraute) Enno Rehling 2019-11-24 16:39:21 +0100
  • 6b1baec2de Merge branch 'master' into develop Enno Rehling 2019-11-18 19:44:37 +0100
  • cd165d94ec Magier dürfen bei STIRB nicht übergeben werden. Enno Rehling 2019-11-18 19:44:24 +0100
  • dccde58221 Merge branch 'master' into develop Enno Rehling 2019-11-18 19:34:05 +0100
  • 1bff7801ff transfer_faction respects magic schools. Enno Rehling 2019-11-18 19:33:37 +0100
  • e17fc6f078 Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2019-11-18 18:48:50 +0100
  • beffa1d536 CID 205842: con is never NULL. Enno Rehling 2019-11-18 18:48:28 +0100
  • 69dd83a4b1 Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2019-11-17 20:10:15 +0100
  • 75000f2663 reduce struct person by 12 bytes on a 32-bit arch. Enno Rehling 2019-11-17 19:55:41 +0100
  • 7850e84cea let's try increasing MAX_UNITSIZE to 128K Enno Rehling 2019-11-02 21:37:33 +0100
  • fd1b981983 simplify sail/travel, remove route from arguments. Enno Rehling 2019-11-02 21:32:11 +0100
  • 52ee682a48 Bug 2617: Berechnung von Überladung berechnet Flotten korrekt. Enno Rehling 2019-11-02 19:09:15 +0100
  • 6c37b122b4 no arm builds, valgrind Enno Rehling 2019-10-28 20:35:15 +0100
  • f4b87b1778 Merge branch 'develop' of github.com:eressea/server into develop Enno Rehling 2019-10-28 20:22:54 +0100
  • 68fa43130f test travis arm builds Enno Rehling 2019-10-28 20:22:40 +0100
  • ee6bcd5de4
         Merge pull request #882 from ennorehling/develop Enno Rehling 2019-10-28 20:18:11 +0100
  • 9b2e33f044 Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2019-10-28 20:14:16 +0100
  • 0db8f2167b Bug 2618: Zusätzlicher Test Piraterie Enno Rehling 2019-10-28 20:09:35 +0100
  • c3ad20a569
         Merge pull request #881 from ennorehling/develop Enno Rehling 2019-10-27 11:04:59 +0100
  • 7f57aa2a18 small copy/paste error Enno Rehling 2019-10-27 10:57:32 +0100
  • 9b54784c94 Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2019-10-27 10:56:32 +0100
  • c8769a4412 Fehler in ship_crewed Berechnung Enno Rehling 2019-10-27 10:56:16 +0100
  • f5641b2787 Merge branch 'master' of github.com:ennorehling/eressea Enno Rehling 2019-10-26 09:08:20 +0200
  • b55eac6862 Merge remote-tracking branch 'upstream/master' Enno Rehling 2019-10-26 09:07:59 +0200
  • cf3fb42055 Merge remote-tracking branch 'upstream/develop' into develop Enno Rehling 2019-10-26 09:07:35 +0200
  • 533a0aceec fix crash when following a lost ship Enno Rehling 2019-10-23 23:17:31 +0200
  • 802fe20897 Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2019-10-23 23:08:26 +0200
  • c82b3b27dd Bug 2616: FOLGE schiesst über das Ziel hinaus. Enno Rehling 2019-10-22 21:30:14 +0200
  • 1c358b9982 bug 2263: skeletons and undead can guard and desert. Enno Rehling 2019-10-22 18:56:04 +0200
  • 75a71c36aa ZERSTOERE Schiffe evtl. auch richtig? Best effort. Enno Rehling 2019-10-22 18:46:00 +0200
  • f64020157c test name spelling fix Enno Rehling 2019-10-21 20:07:55 +0200
  • 70b148296f MACHE beschädigte Konvois Enno Rehling 2019-10-21 20:04:32 +0200
  • d04fe741a9 https://bugs.eressea.de/view.php?id=2615 in the report, calculate max size of ships correctly. Enno Rehling 2019-10-20 18:04:49 +0200
  • d9cbbd9052 Bug 2614: Einheiten bewachen Region vor sich selbst. Enno Rehling 2019-10-20 17:11:58 +0200
  • bec38f544b
         Merge pull request #880 from ennorehling/develop Enno Rehling 2019-10-10 20:48:15 +0200
  • 1309b81879 Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2019-10-10 20:38:15 +0200
  • 7c72495a24 Merge remote-tracking branch 'origin/ship-number' into develop Enno Rehling 2019-10-10 20:26:44 +0200
  • 12491ffc16 GIB 0 an Land kann alle Schiffe geben, auf Ozean nicht. Enno Rehling 2019-10-10 20:24:18 +0200
  • 1d405e2ef8 GIB 0 n SCHIFFE Keine Boote erlauben Übergabe an eigene Besatzung. Enno Rehling 2019-10-10 20:17:25 +0200
  • 78e44e0fe3 check compatible costs Enno Rehling 2019-10-10 16:12:25 +0200
  • 24978a5b80 Schiffstransfer nur zwischen Kapitänen. Enno Rehling 2019-10-08 21:14:01 +0200
  • 1e0afdc961 spells can only be cast on single ships. Enno Rehling 2019-10-08 20:56:14 +0200
  • 43094e8bf9 plural strings for ships. Enno Rehling 2019-10-08 05:15:23 +0200
  • b0e6ed430b GIB alle Schiffe an andere Einheit. Enno Rehling 2019-10-08 04:52:41 +0200
  • 4052cb71ff Show convoy in reports. Enno Rehling 2019-10-07 22:01:02 +0200
  • f4011af784 GIB unit n SCHIFF implementiert. Enno Rehling 2019-10-07 21:45:49 +0200
  • 39e3001a50 start implementing give_ship Enno Rehling 2019-10-06 20:42:47 +0200
  • 5cf417d16d must have one captain per ship. Enno Rehling 2019-10-06 20:22:19 +0200
  • 178f7c2e19 add number of ships for convoys. check required crew skills. require number of captains >= ship.number. Enno Rehling 2019-10-06 18:11:10 +0200
  • f14d6462c9
         Merge pull request #879 from ennorehling/develop Enno Rehling 2019-10-06 09:08:24 +0200
  • 441c5d602d Merge branch 'develop' of github.com:ennorehling/eressea into develop Enno Rehling 2019-10-06 08:57:49 +0200
  • 84633b50e1 gamedata version SHIP_NUMBER_VERSION Enno Rehling 2019-10-05 20:31:00 +0200
  • f02c4cbaeb disable magic resistant to prevent 2% intermittent test. Enno Rehling 2019-10-05 20:59:55 +0200
  • b4f3120658 delete unused function Enno Rehling 2019-09-29 18:31:11 +0200
  • 7b9ea75d16 make disrupt_astral use callback, not region_list. Enno Rehling 2019-09-29 18:25:08 +0200
  • 17fbd0d67d Bug 2612 Zauberreparatur. Enno Rehling 2019-09-29 17:56:56 +0200
  • a6ea80f5f8 create a for_all_in_range function to avoid use of region_list. functional programming is good. Enno Rehling 2019-09-29 16:57:26 +0200