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

10426 Commits

Author SHA1 Message Date
Enno Rehling 8e7919f206 clibs submodule update 2020-04-30 19:46:23 +02:00
Enno Rehling fd1f3524ef Merge branch 'master' of github.com:ennorehling/eressea 2020-03-14 11:59:46 +01:00
Enno Rehling 8bf8b68571 make parse_token trim ignored characters like zero-width spaces. 2020-03-14 11:59:35 +01:00
Enno Rehling 34ac5154e7 make parse_token trim ignored characters like zero-width spaces. 2020-03-14 11:57:29 +01:00
Enno Rehling 1e6f1f8bd8 Merge branch 'master' of github.com:eressea/server 2020-03-08 10:14:54 +01:00
Enno Rehling 4ddfc27525
Merge pull request #898 from ennorehling/master 
better starting conditions
 2020-03-08 10:14:39 +01:00
Enno Rehling c4cb44f961 better starting conditions 
- demons start cloaked
- regions have at least 50 trees
 2020-03-08 10:07:04 +01:00
Enno Rehling 81a90fc4ae Merge branch 'master' of github.com:eressea/server 2020-03-02 21:32:41 +01:00
Enno Rehling d5a784f03a
Merge pull request #895 from ennorehling/master 
password hotfix
 2020-03-02 21:17:14 +01:00
Enno Rehling f4af719175 do not read orders when password is wrong 2020-03-02 20:40:45 +01:00
Enno Rehling 2856998801 Merge branch 'master' of github.com:ennorehling/eressea 2020-01-26 10:29:29 +01:00
Enno Rehling 05774a06c6 Merge remote-tracking branch 'upstream/master' 2020-01-26 10:28:23 +01:00
Enno Rehling 5d3f51178e Merge branch 'master' of github.com:eressea/server 2020-01-26 09:20:00 +01:00
Enno Rehling 829ec6a3ad
Merge pull request #890 from ennorehling/master 
bugfix burgen
 2020-01-26 09:19:52 +01:00
Enno Rehling 9e41f6b0ba Merge branch 'master' of github.com:ennorehling/eressea 2020-01-26 09:12:47 +01:00
Enno Rehling 42e17f3ba9 bug 2221: buildings cannot exceed maxsize. 
* enable the allies.lua tests
 2020-01-26 00:34:31 +01:00
Enno Rehling b88f9e8610 remove duplicate calculation. 2020-01-15 23:08:11 +01:00
Enno Rehling 7aaa0fc301 Bug 2633: Porting the test from my "fix" to prove that it wasn't required. 2020-01-15 22:48:20 +01:00
Enno Rehling 6806881bf1 Merge branch 'master' of github.com:ennorehling/eressea 2020-01-04 11:35:50 +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 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 08f7d267b8 version 3.22 is released 2019-12-01 17:18:59 +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 beffa1d536 CID 205842: con is never NULL. 2019-11-18 18:48:28 +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 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
Enno Rehling c8769a4412 Fehler in ship_crewed Berechnung 2019-10-27 10:56:16 +01:00
Enno Rehling f5641b2787 Merge branch 'master' of github.com:ennorehling/eressea 2019-10-26 09:08:20 +02:00
Enno Rehling b55eac6862 Merge remote-tracking branch 'upstream/master' 2019-10-26 09:07:59 +02:00
Enno Rehling cf3fb42055 Merge remote-tracking branch 'upstream/develop' into develop 2019-10-26 09:07:35 +02:00
Enno Rehling 533a0aceec fix crash when following a lost ship 2019-10-23 23:17:31 +02:00
Enno Rehling 802fe20897 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-10-23 23:08:26 +02:00