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

10682 Commits

Author SHA1 Message Date
Enno Rehling 967cfd107b re-enable test 2020-01-04 20:00:57 +01:00
Enno Rehling fb21d6d932 kill ancient godcursezone code. 
add some tests for planting seeds.
 2020-01-04 12:22:14 +01:00
Enno Rehling 59d8775e21 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2020-01-04 12:20:57 +01:00
Enno Rehling 6806881bf1 Merge branch 'master' of github.com:ennorehling/eressea 2020-01-04 11:35:50 +01:00
Enno Rehling 32d2970965
Merge pull request #886 from ennorehling/develop 
Baumwachstum und Flotten-Meldungen
 2020-01-03 20:28:00 +01:00
Enno Rehling 84dfe46ce5 Revert "bug 2625 samen werden direkt zu schoesslingen" 
This reverts commit 4f88bf137e.
 2020-01-03 20:21:14 +01:00
Enno Rehling c9f82d81f9 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2020-01-03 20:20:47 +01:00
Enno Rehling 4785829d7f Typo 2020-01-03 18:02:42 +01:00
Enno Rehling e337b8b494 Bug 2626: Korrekter Meldungstext. 2020-01-03 17:14:44 +01:00
Enno Rehling c8c22aea1b bug 2624: short range conversion bug in tree growth 2020-01-02 12:52:39 +01:00
Enno Rehling 4f88bf137e bug 2625 samen werden direkt zu schoesslingen 2020-01-02 12:10:38 +01:00
Enno Rehling dcf9b9df26 bug 2626: fehlende neue messages nachtragen 2020-01-02 11:34:26 +01:00
Enno Rehling 787cc28a4c Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-12-29 16:08:32 +01:00
Enno Rehling d949d9a6d0 Bug 2623: Untote dürfen nicht in heilige Regionen ziehen. 
Code style fixes.
 2019-12-29 14:28:55 +01:00
Enno Rehling d22af93d5e Merge branch 'master' into develop 2019-12-25 20:44:25 +01:00
Enno Rehling face5eeb31 increase maxfiles to 50, handle error when no file generated. 2019-12-23 15:20:39 +01:00
Enno Rehling cef5ff44eb Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-12-01 17:30:34 +01:00
Enno Rehling c5f3cd420a Merge remote-tracking branch 'upstream/master' 2019-12-01 17:30:17 +01:00
Enno Rehling b45fe6b157 Merge branch 'master' of github.com:ennorehling/eressea 2019-12-01 17:30:07 +01:00
Enno Rehling 5428211751 Merge remote-tracking branch 'upstream/master' into develop 2019-12-01 17:29:25 +01:00
Enno Rehling 71566b9bab Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-12-01 17:29:15 +01:00
Enno Rehling 0b623d0768 monster include structure, contd. 2019-12-01 17:28:51 +01:00
Enno Rehling 2573ab19b5 begin work on v3.23 2019-12-01 17:20:34 +01:00
Enno Rehling 08f7d267b8 version 3.22 is released 2019-12-01 17:18:59 +01:00
Enno Rehling d6b5dea014 version 3.22 is released 2019-12-01 17:16:12 +01:00
Enno Rehling b0792b57e9 move binding function declarations to headers. 2019-12-01 17:07:09 +01:00
Enno Rehling 017f2c4e75
Merge pull request #885 from eressea/develop 
Release version 3.22
 2019-12-01 17:06:02 +01:00
Enno Rehling ff959cf059
Merge pull request #884 from ennorehling/develop 
get ready for release
 2019-12-01 16:55:14 +01:00
Enno Rehling 633866c814 STIRB PARTEI: Versuche, Helden zu übernehmen. 2019-11-30 16:29:23 +01:00
Enno Rehling 1a8b94da59 STIRB PARTEI löscht die Befehle nicht. 
Reparatur des Tests für VERGESSE MAGIE (Vertraute)
 2019-11-24 16:39:21 +01:00
Enno Rehling 6b1baec2de Merge branch 'master' into develop 2019-11-18 19:44:37 +01:00
Enno Rehling cd165d94ec Magier dürfen bei STIRB nicht übergeben werden. 2019-11-18 19:44:24 +01:00
Enno Rehling dccde58221 Merge branch 'master' into develop 2019-11-18 19:34:05 +01:00
Enno Rehling 1bff7801ff transfer_faction respects magic schools. 2019-11-18 19:33:37 +01:00
Enno Rehling e17fc6f078 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-11-18 18:48:50 +01:00
Enno Rehling beffa1d536 CID 205842: con is never NULL. 2019-11-18 18:48:28 +01:00
Enno Rehling 69dd83a4b1 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-11-17 20:10:15 +01:00
Enno Rehling 75000f2663 reduce struct person by 12 bytes on a 32-bit arch. 2019-11-17 19:55:41 +01:00
Enno Rehling 7850e84cea let's try increasing MAX_UNITSIZE to 128K 2019-11-02 21:37:33 +01:00
Enno Rehling fd1b981983 simplify sail/travel, remove route from arguments. 2019-11-02 21:32:11 +01:00
Enno Rehling 52ee682a48 Bug 2617: Berechnung von Überladung berechnet Flotten korrekt. 2019-11-02 19:09:15 +01:00
Enno Rehling 6c37b122b4 no arm builds, valgrind 2019-10-28 20:35:15 +01:00
Enno Rehling f4b87b1778 Merge branch 'develop' of github.com:eressea/server into develop 2019-10-28 20:22:54 +01:00
Enno Rehling 68fa43130f test travis arm builds 2019-10-28 20:22:40 +01:00
Enno Rehling ee6bcd5de4
Merge pull request #882 from ennorehling/develop 
Bug 2618: Zusätzlicher Test Piraterie
 2019-10-28 20:18:11 +01:00
Enno Rehling 9b2e33f044 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-10-28 20:14:16 +01:00
Enno Rehling 0db8f2167b Bug 2618: Zusätzlicher Test Piraterie 2019-10-28 20:12:52 +01:00
Enno Rehling c3ad20a569
Merge pull request #881 from ennorehling/develop 
More bugfixes for ships
 2019-10-27 11:04:59 +01:00
Enno Rehling 7f57aa2a18 small copy/paste error 2019-10-27 10:57:32 +01:00
Enno Rehling 9b54784c94 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-10-27 10:56:32 +01:00