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

9568 Commits

Author SHA1 Message Date
Enno Rehling 36b7104ce3 extract long_order_allowed for use in autostudy. 2018-08-05 06:43:11 +02:00
Enno Rehling 2bb3e7601d merge conflict 2018-08-05 06:42:31 +02:00
Enno Rehling b0fb1e5032 actually do the learning. 2018-08-05 06:41:04 +02:00
Enno Rehling b4cb1dfe8d finished autostudy 2018-08-05 06:41:04 +02:00
Enno Rehling c8ebde3990 autostudy continued (WIP) 2018-08-05 06:41:04 +02:00
Enno Rehling 0e754a31ac Test, sorting units by skill and level 2018-08-05 06:41:03 +02:00
Enno Rehling f6b6904ced finish parser for K_AUTOSTUDY and P_AUTO. 2018-08-05 06:41:03 +02:00
Enno Rehling ee8a02c425 autostudy framework 2018-08-05 06:41:03 +02:00
Enno Rehling 0eb030194c Merge branch 'develop' of github.com:ennorehling/eressea into develop 2018-08-05 06:40:44 +02:00
Enno Rehling 14cfccde0c
Merge pull request #796 from ennorehling/develop 
cleaning up, fixing bugs
 2018-08-05 06:34:58 +02:00
Enno Rehling 4978e95b9a delete leftover npc callbacks. 2018-08-03 06:52:37 +02:00
Enno Rehling fc0616ed1e kill lua triggers for npc logic, never used. 2018-08-03 06:47:29 +02:00
Enno Rehling 116ff7247d Remove unused "message" events (old NPC sh*t). 2018-08-02 16:41:23 +02:00
Enno Rehling 8d88579570 Refactor: extract can_recruit, write tests for insects. 2018-08-02 14:31:00 +02:00
Enno Rehling 3880960acf BUG 2458: fix insect recruit warnings. 2018-08-02 13:53:41 +02:00
Enno Rehling 2697d78c07 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-08-01 11:56:08 +02:00
Enno Rehling e89fe69d58 simplicate the sink_ship function, do not rescue units. 2018-08-01 11:55:57 +02:00
Enno Rehling ad0464ab50 BUG 2168: call sink_ship for ships that take too much damage. 2018-08-01 10:04:12 +02:00
Enno Rehling ec57192403 equip_newunits got called twice. 2018-07-31 10:46:49 +02:00
Enno Rehling 82c194f4c1
Merge pull request #795 from ennorehling/develop 
equip_newunits got called twice.
 2018-07-31 10:46:29 +02:00
Enno Rehling d9ba7be884 Merge branch 'master' into develop 2018-07-31 10:42:53 +02:00
Enno Rehling 65768a52e9
Merge pull request #794 from ennorehling/master 
BUG 2469 wrong default quantity for construction reqs
 2018-07-31 10:33:13 +02:00
Enno Rehling e9bded4a87 BUG 2469 wrong default quantity for construction reqs 2018-07-31 10:13:00 +02:00
Enno Rehling 7eb951544a equip_newunits got called twice. 2018-07-30 22:19:40 +02:00
Enno Rehling de75444480
Merge pull request #793 from ennorehling/develop 
BUG 2465 Kein Item-Teleport bei Lied der Verfuehrung.
 2018-07-27 12:13:59 +02:00
Enno Rehling 5309c84224 BUG 2465 Kein Item-Teleport bei Lied der Verfuehrung. 2018-07-25 19:42:48 +02:00
Enno Rehling e7184add00 use system-wide muttrc 2018-07-24 13:59:34 +02:00
Enno Rehling 11eb4980f8 use system-wide muttrc 2018-07-24 13:58:36 +02:00
Enno Rehling 138114bcb1
Merge pull request #792 from ennorehling/develop 
lighthouse crash fix
 2018-07-22 10:56:06 +02:00
Enno Rehling bd9b785325 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-07-22 10:55:19 +02:00
Enno Rehling cd6154cae6 fix the lighthouse crash in preview. 2018-07-22 10:55:09 +02:00
Enno Rehling a4a3ebd633 backup the reports, because sometimes I am an idiot 2018-07-21 21:41:13 +02:00
Enno Rehling 5d2b45a20d Merge branch 'ennorehling-develop' into develop 2018-07-21 05:39:22 +02:00
Enno Rehling 85167983af Merge branch 'develop' of https://github.com/ennorehling/eressea into ennorehling-develop 2018-07-21 05:38:56 +02:00
Enno Rehling e62b5c580d update tests to reflect new lighthouse rules 2018-07-19 04:57:33 +02:00
Enno Rehling 2282160916 separate lighthouse_view_distance from lighthouse_range. 2018-07-18 20:49:17 +02:00
Enno Rehling 7b7d3cb759 test: lighhouse size reduction reduces effectiveness 2018-07-17 21:34:22 +02:00
Enno Rehling fc80e4b83e BUG 2462: Leuchtturm meldet keine Landregionen, beschützt Schiffe erst ab Größe 10. 2018-07-17 20:53:34 +02:00
Enno Rehling 8a503445f6 missing include, do not use fset 2018-07-16 10:53:12 +02:00
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