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

10488 Commits

Author SHA1 Message Date
Enno Rehling 1c11d25082 Merge branch 'master' into develop 2020-03-08 10:15: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 de8028c5dd remove debug output from cron script 2020-02-25 19:19:02 +01:00
Enno Rehling b89824f721
Merge pull request #892 from ennorehling/develop 
LERNE AUTO fix
 2020-02-21 21:14:03 +01:00
Enno Rehling e5e936acc6 Bug 2640: LERNE AUTO sollte nicht alle Einheiten zu Lehrern delegieren. 
Fixt den konkreten Bug, fühlt sich aber immer noch nach einemn Spezialfall an?
 2020-02-21 21:12:19 +01:00
Enno Rehling 5ee5751475 Keine Befehle löschen, ist nicht nötig und verwirtr nur. 2020-02-20 21:09:04 +01:00
Enno Rehling 095e3d39ce Bug 2637: Monster sollen sich nicht parteitarnen. 2020-02-09 15:24:36 +01:00
Enno Rehling 1ce051549c
Merge pull request #891 from ennorehling/develop 
Development updates
 2020-02-08 22:05:39 +01:00
Enno Rehling 950a7b7f9c fix tests that try to disable mallorn. 2020-02-08 21:49:42 +01:00
Enno Rehling b1098f7838 broke several monster behaviors, fixed. 2020-02-08 21:24:07 +01:00
Enno Rehling 3771b88bc6 typo, opps 2020-02-08 21:02:18 +01:00
Enno Rehling 40d63264d3 bug 2635: let only swimming units attack on ocean. 2020-02-07 22:12:24 +01:00
Enno Rehling 4886d29401 small code cleanup 2020-02-02 18:52:30 +01:00
Enno Rehling 855a989971 documentation for how orders work 
remove unit names from tests.
 2020-02-02 18:48:33 +01:00
Enno Rehling bf867eb2d6 bug 2634 display number of ships to all factions. 2020-01-31 20:54:32 +01:00
Enno Rehling 63f4853875 crash in quit faction 
fix test modules that have no setup
add test for lazy trolls
 2020-01-26 12:32:31 +01:00
Enno Rehling 2856998801 Merge branch 'master' of github.com:ennorehling/eressea 2020-01-26 10:29:29 +01:00
Enno Rehling 2af7a1350b Merge branch 'develop' of github.com:ennorehling/eressea into develop 2020-01-26 10:29:04 +01:00
Enno Rehling 05774a06c6 Merge remote-tracking branch 'upstream/master' 2020-01-26 10:28:23 +01:00
Enno Rehling 33066a705b Merge remote-tracking branch 'upstream/develop' into develop 2020-01-26 10:27:57 +01:00
Enno Rehling 80b8bd7158 Merge branch 'master' into develop 2020-01-26 10:15:18 +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 983a6f5426
Merge pull request #889 from ennorehling/develop 
fix intermittent tests
 2020-01-19 18:34:23 +01:00
Enno Rehling b9153ac920 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2020-01-19 18:33:42 +01:00
Enno Rehling e5947f432e fix intermittent test because sometimes regions contained mallorn. 2020-01-19 18:20:12 +01:00
Enno Rehling ec04bf5035 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2020-01-19 16:36:15 +01:00
Enno Rehling 356bb54bf3
Merge pull request #888 from ennorehling/develop 
fix tree growth crash, cew CR version
 2020-01-19 13:56:10 +01:00
Enno Rehling 3efcf97289 Fix for negative tree growth crash. 2020-01-19 13:45:38 +01:00
Enno Rehling ec0d5b3754 new CR VERSION: remove MESSAGETYPES 2020-01-19 13:45:19 +01:00
Enno Rehling 54d0784b54 Kampfreport: Jede Partei hilft sich selbst, duh. 2020-01-18 21:25:40 +01:00
Enno Rehling 010487ac8d
Merge pull request #887 from ennorehling/develop 
trees and seeds
 2020-01-18 21:11:55 +01:00
Enno Rehling af50fe65a3 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2020-01-18 21:07:17 +01:00
Enno Rehling a94e4219b1 automatic tree growth is a b*tch 2020-01-18 21:06:48 +01:00
Enno Rehling 87a71d24e6 some english message fixes 2020-01-18 17:23:51 +01:00
Enno Rehling c515d76c5d Merge branch 'develop' of github.com:ennorehling/eressea into develop 2020-01-18 12:08:05 +01:00
Enno Rehling 5c5649a8ea Merge branch 'master' into develop 2020-01-16 18:22:34 +01:00
Enno Rehling 3b09b401f7 Revert unnecessary trade limit bugfix 
This reverts commit 27aac671a4.
 2020-01-16 18:22:01 +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 27aac671a4 simplicate and add lightness 2020-01-14 21:00:54 +01:00
Enno Rehling 6626cfe297 Bug 2633: implement combined trade limits. 2020-01-14 20:57:29 +01:00
Enno Rehling e02c1e9d00 Bug 2631: Kein Konvoi mit Sonnensegel. 2020-01-13 22:24:48 +01:00