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

9635 Commits

Author SHA1 Message Date
Enno Rehling 67089aeb8c Bug 2487: Fix LERNE AUTO translations 
Also disallow autolearning expensive skills.
 2018-09-09 15:13:20 +02:00
Enno Rehling fe58b624b1 Merge remote-tracking branch 'upstream/master' 2018-09-09 12:11:24 +02:00
Enno Rehling 422415870f Merge branch 'master' 2018-09-09 07:54:41 +02:00
Enno Rehling 41f9d32923 Merge branch 'master' into develop 2018-09-09 07:50:25 +02:00
Enno Rehling 3c99677723
Merge pull request #802 from ennorehling/master 
Fix E2 crashing 2018-09-08
 2018-09-09 07:48:29 +02:00
Enno Rehling 6f5f1651c7 fix crashes when trying to trade on ocean. 
fix missing message sections.
 2018-09-09 07:41:30 +02:00
Enno Rehling 714d4034af Merge remote-tracking branch 'upstream/develop' into develop 2018-09-04 15:29:05 +02:00
Enno Rehling 7544565237 start work on 3.18 release 2018-09-04 15:28:05 +02:00
Enno Rehling 264830ba74
Merge pull request #800 from eressea/develop 
Release version 3.17
 2018-09-04 15:26:30 +02:00
Enno Rehling 6fee918536
Merge pull request #799 from ennorehling/develop 
fix multiple coverity defects in parsers.
 2018-09-04 15:21:47 +02:00
Enno Rehling 876113d991 fix multiple coverity defects in parsers. 2018-09-03 20:43:17 +02:00
Enno Rehling 65a13d10ad
Merge pull request #798 from ennorehling/develop 
version 3.17, final preview
 2018-08-29 17:54:28 +02:00
Enno Rehling af445e5ca1 BUG 2477 Null-Personen Meldungen sind unnötig. 2018-08-21 22:25:04 +02:00
Enno Rehling 4b8f063096
Merge pull request #15 from eressea/develop 
LERNE AUTO remerge
 2018-08-18 12:48:56 +02:00
Enno Rehling 34abedd642
Merge pull request #797 from ennorehling/automate 
LERNE AUTO
 2018-08-18 12:44:24 +02:00
Enno Rehling 2ae838440e Merge branch 'automate' of github.com:ennorehling/eressea into automate 2018-08-05 06:43:26 +02:00
Enno Rehling 22d0fe5693 missing include, do not use fset 2018-08-05 06:43:11 +02:00
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