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

9529 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
00459782b9 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2018-07-16 10:51:09 +02:00
Enno Rehling
820264aa82 BUG 2461: Liste der Angreifer zeigt nicht alle Parteien. 2018-07-15 13:39:23 +02:00
Enno Rehling
902ce9bf69 extract long_order_allowed for use in autostudy. 2018-07-14 16:26:37 +02:00
Enno Rehling
ced21cc336 BUG 2459 Regionen recycling macht ein Reset der Rohstoffe. 2018-07-13 23:37:45 +02:00
Enno Rehling
de7248fb5a BUG 2457: Einheiten werden bei Durchreise nicht angezeigt. 2018-07-13 22:45:17 +02:00
Enno Rehling
21cbff0740 update submodules 2018-07-12 20:54:28 +02:00
Enno Rehling
25d93f3a18 update storage library with needed bugfix 2018-07-12 20:52:09 +02:00
Enno Rehling
3ab29225c9 Merge branch 'master' into develop 2018-07-12 20:32:57 +02:00
Enno Rehling
15ae3ba45f Merge branch 'master' of https://github.com/ennorehling/eressea.git 2018-07-12 20:24:29 +02:00
Enno Rehling
64eb545b4a Bug 2460: Startgeschenke 2018-07-12 20:24:23 +02:00
Enno Rehling
af0a359acf make local comparison function static 2018-07-11 21:39:33 +02:00
Enno Rehling
c4424f9899 actually do the learning. 2018-07-11 21:07:31 +02:00
Enno Rehling
51740476ba finished autostudy 2018-07-11 21:03:00 +02:00
Enno Rehling
7affbd6c74 autostudy continued (WIP) 2018-07-09 03:31:13 +02:00
Enno Rehling
9bd439e2e1 Test, sorting units by skill and level 2018-07-07 20:56:35 +02:00
Enno Rehling
a93d8fd56b finish parser for K_AUTOSTUDY and P_AUTO. 2018-07-07 17:29:22 +02:00
Enno Rehling
26e06804d6 autostudy framework 2018-07-07 12:22:52 +02:00
Enno Rehling
cabc936837 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-07-07 12:21:55 +02:00
Enno Rehling
b1b4654b0e Bug 2445: duplicate strings warnings. 2018-07-07 12:21:42 +02:00
Enno Rehling
e089a9e9c6 Merge remote-tracking branch 'upstream/master' 2018-07-07 10:57:28 +02:00
Enno Rehling
e2c2f61927 pipe cron output to logfile, fix sendreport script 2018-07-07 10:55:41 +02:00
Enno Rehling
68f241ad7d redirect cron output to a logfile 2018-07-07 10:55:41 +02:00
Enno Rehling
6bf595ce5c Merge branch 'master' into develop 2018-07-07 10:53:07 +02:00
Enno Rehling
8af4b1fe29 pipe cron output to logfile, fix sendreport script 2018-07-07 10:45:11 +02:00
Enno Rehling
6403c75c85 monsters should not be anonymous. 2018-07-02 19:58:26 +02:00
Enno Rehling
fda5f8cf11
Merge pull request #789 from ennorehling/develop 
Kampfreport, neue Parteien
 2018-07-02 19:41:43 +02:00
Enno Rehling
af7e291923 submodule updates 2018-06-28 23:03:12 +02:00
Enno Rehling
e8ef5be7f6 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-06-28 22:49:05 +02:00
Enno Rehling
5018308170 remove at_chaoscount, update storage module. 2018-06-28 22:48:57 +02:00
Enno Rehling
38cb6297bb Merge branch 'master' 2018-06-24 20:36:32 +02:00
Enno Rehling
82b1e16a82 Merge branch 'master' of github.com:eressea/server 2018-06-24 18:39:46 +02:00
Enno Rehling
503b22aa9f
Merge pull request #788 from ennorehling/master 
bugfixes
 2018-06-24 18:38:42 +02:00
Enno Rehling
6d10ee8fa5 BUG 2453: Erstausstattung und Default-Befehle für neue Parteien. 2018-06-24 18:08:19 +02:00
Enno Rehling
2b0b7cd0f8 BUG 2447: PArtei fehlt im Kampfreport. 
replace strcpy with strcat
 2018-06-18 20:33:28 +02:00
Enno Rehling
136e093c96
Merge pull request #787 from ennorehling/develop 
bugfixes develop
 2018-06-11 21:44:58 +02:00
Enno Rehling
ecdf03138f Merge branch 'master' into develop 2018-06-11 21:38:55 +02:00
Enno Rehling
34d0b56c68 BUG 2448: Default-Attacken respektieren! 2018-06-11 21:36:59 +02:00
Enno Rehling
a62541a17e BUG 2443: Straßen ohne komplizierte String-Bastelei. 2018-06-11 21:00:33 +02:00
Enno Rehling
c3d08d1536 redirect cron output to a logfile 2018-06-11 21:00:01 +02:00
Enno Rehling
f7d4388232 BUG 2443: spaces for list of roads, again! 2018-06-10 10:59:04 +02:00
Enno Rehling
3c57917b79 BUG 2443: spaces for list of roads, again! 2018-06-10 10:58:39 +02:00
Enno Rehling
cf76e0a03c BUG 2443, list of roads missing whitespace. 2018-06-10 10:58:39 +02:00
Enno Rehling
13090fd27c BUG 2446: trade prices not getting read from XML. 2018-06-10 10:58:39 +02:00
Enno Rehling
1c6f598fdd fix orders script running from install directory 2018-06-10 10:58:39 +02:00
Enno Rehling
5939b56b32 convert orders-process to use mutt 
update install process.
 2018-06-10 10:58:39 +02:00
Enno Rehling
e168c667ad make orders-accept use mutt to send email, fix encoding 2018-06-10 10:58:39 +02:00
Enno Rehling
1f5a31b817 Merge remote-tracking branch 'upstream/master' 2018-06-10 10:58:18 +02:00
Enno Rehling
1cfa28e4e9 Merge branch 'master' of github.com:eressea/server 2018-06-10 10:44:25 +02:00
Enno Rehling
eb4a13cd76
Merge pull request #786 from ennorehling/master 
bugfixes turn 1080
 2018-06-10 10:44:15 +02:00
Enno Rehling
6d61b837cf BUG 2443, spaces again 2018-06-10 10:37:20 +02:00