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

9863 Commits

Author SHA1 Message Date
Enno Rehling c5dd7d69df
Merge pull request #806 from ennorehling/master 
Bugfix: Rosthauch, Abtreiben
 2018-09-16 10:15:05 +02:00
Enno Rehling 868499d941 Merge branch 'master' into develop 2018-09-16 10:12:57 +02:00
Enno Rehling 552dbe5e72 In Rosthauch min und max verwechselt. 2018-09-16 10:10:17 +02:00
Enno Rehling 65675d1947 Fix crash when removing drifted ships. 2018-09-16 10:02:09 +02:00
Enno Rehling 658b47aeb4 remove seaserpent test that is not a test. 2018-09-15 19:12:32 +02:00
Enno Rehling 681cf32e1f remove besiege from keywords[] array 
fix broken at_keys attributes
remove unused global.attribs
 2018-09-15 18:35:27 +02:00
Enno Rehling a876a60b68 Stop using player email to set faction name. 2018-09-13 16:16:32 +02:00
Steffen Mecke a90ae46d52 assert assumption on armor 2018-09-13 10:59:15 +02:00
Enno Rehling d6e8b38724 FOLGE SCHIFF reparieren (hat UFL_LONGORDER getestet). 2018-09-12 20:35:27 +02:00
Steffen Mecke 69702df203 refactor terminate finished 2018-09-12 15:11:39 +02:00
Steffen Mecke d981044953 refactor calculate_armor 2018-09-12 15:11:39 +02:00
Steffen Mecke c15b4c8fbf refactor terminate (calculate_armor/resistance) 2018-09-12 15:11:34 +02:00
Enno Rehling ecaf72324c Bug 2481: FOLGE wurde durch ZAUBERE verhindert. 2018-09-10 19:50:22 +02:00
Enno Rehling 12fd6435c5 eliminate apparently dead code, and coverity warning. 2018-09-10 18:17:34 +02:00
Enno Rehling 419ff9b514 Merge remote-tracking branch 'upstream/master' 2018-09-10 18:00:27 +02:00
Enno Rehling b2c2942c60 Merge remote-tracking branch 'upstream/develop' into develop 2018-09-10 17:58:22 +02:00
Enno Rehling d32689bac8 experiments with clang-tidy 2018-09-10 17:58:14 +02:00
Enno Rehling bca987ee64 force tag update after release 2018-09-10 17:54:39 +02:00
Enno Rehling 418d6b1f6c Bug 2486: spawn_chance für Drachen und Seeschlangen war zu hoch. 2018-09-10 17:52:23 +02:00
Enno Rehling 2e5e8347ac Bug 2489: Kill the SIEGE command, forever. 2018-09-09 21:01:10 +02:00
Enno Rehling 8fdfe9fab4 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2018-09-09 18:17:22 +02:00
Enno Rehling 062abe8102 refactor siege property w. getter/setter 2018-09-09 17:10:18 +02:00
Enno Rehling 10c47d339e Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2018-09-09 16:05:31 +02:00
Enno Rehling b0ecf3eab4 Merge remote-tracking branch 'upstream/develop' into develop 2018-09-09 15:52:18 +02:00
Enno Rehling c40295f35c Merge remote-tracking branch 'upstream/master' 2018-09-09 15:52:02 +02:00
Enno Rehling 90f854f5b7
Merge pull request #803 from ennorehling/master 
Fixing LERNE AUTO
 2018-09-09 15:49:47 +02:00
Enno Rehling 9456c4bdc7 fix debug logging. 2018-09-09 15:16:11 +02:00
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
Steffen Mecke aed7432bb2 fix magic resistance (bug 2480) 2018-09-04 16:41:46 +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