Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
10554 commits 10 branches 0 tags 41 MiB
Commit graph

10554 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Enno Rehling
06f00cae53 Bug 2632: no flying convoy 2020-01-13 22:21:26 +01:00
Enno Rehling
00ac549750 idiot-proofing the newfactions file parser 2020-01-08 20:57:29 +01:00
Enno Rehling
bfd89687cd when planting saplings, plant remaining seeds. 2020-01-07 20:37:21 +01:00
Enno Rehling
043949c8d0 Bug 2625 PFLANZE Implementation aufgeklärt, Tests geschrieben. 2020-01-07 20:28:43 +01:00
Enno Rehling
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.
 2020-01-07 19:24:10 +01:00
Enno Rehling
ea15af879e Bug 2625 disable springtime sapling test. 2020-01-04 20:05:10 +01:00
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