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

8738 Commits

Author SHA1 Message Date
Enno Rehling b224603fea small fix to orders.queue locking 2017-09-15 19:59:42 +02:00
Enno Rehling f83c3a9e9f move orders.queue file (clever use of lockfile program) 2017-09-15 19:58:22 +02:00
Enno Rehling 1413c2807d Merge pull request #728 from ennorehling/develop 
bugfixes, sea serpents
 2017-09-09 19:10:43 +02:00
Enno Rehling 1319f546b8 fix seaserpent tests, simplify monster tests. 2017-09-09 15:24:50 +02:00
Enno Rehling c5181195d7 new feature: sea serpents will not go after small targets. 2017-09-09 12:58:10 +02:00
Enno Rehling b9b3f0322e slightly faster lookup for equipment, probably. 2017-09-08 22:24:17 +02:00
Enno Rehling e7fe3f8292 push stream compatibility calls back to cr_output_region. 2017-09-05 19:52:48 +02:00
Enno Rehling 127cc41e8e BUG 1779: Elfenwald-Effekte bei Trankzaubern. 
https://bugs.eressea.de/view.php?id=1779
 2017-09-05 18:56:47 +02:00
Enno Rehling 46b065dd29 BUG 2203: Schattenrichter sind gewichtslos 2017-09-04 20:08:56 +02:00
Enno Rehling 873b1a81af testing that words do not get split, lines get split at spaces. 2017-09-04 20:08:34 +02:00
Enno Rehling a85fa491e7 Merge branch 'master' 2017-09-04 16:05:44 +02:00
Enno Rehling 1c397df11d Merge branch 'master' of https://github.com/ennorehling/eressea.git 2017-09-04 14:40:14 +02:00
Enno Rehling d2291d03c8 fix intermittent test caused by produceexp 2017-09-04 14:39:33 +02:00
Enno Rehling 18abbb6c49 fix intermittent test caused by produceexp 2017-09-04 14:38:39 +02:00
Enno Rehling 0386aafa7b new template file location 2017-09-03 20:28:27 +02:00
Enno Rehling e36f607fed send bz2 report with new mail text location 2017-09-03 11:33:15 +02:00
Enno Rehling c293e08cca send bz2 report with new mail text location 2017-09-03 11:32:20 +02:00
Enno Rehling 046afcd3dd Merge remote-tracking branch 'upstream/master' 2017-09-03 11:14:14 +02:00
Enno Rehling fef3951bfc Merge remote-tracking branch 'upstream/develop' into develop 2017-09-03 11:13:54 +02:00
Enno Rehling 55655e6d33 Merge branch 'master' into develop 2017-09-03 11:13:28 +02:00
Enno Rehling 3c86880b2e add the report email text to the install process 2017-09-03 11:09:15 +02:00
Enno Rehling 437deccddd Merge remote-tracking branch 'upstream/develop' into develop 2017-09-02 22:12:26 +02:00
Enno Rehling 4ac80d3e5b Merge pull request #726 from ennorehling/develop 
clone_men and familiars
 2017-09-02 22:12:03 +02:00
Enno Rehling 30b0b2ad81 fix a lot of memory leaks that were exposed by unit tests. 2017-09-02 17:36:09 +02:00
Enno Rehling 71ced993e2 Merge remote-tracking branch 'upstream/develop' into develop 2017-09-02 17:10:55 +02:00
Enno Rehling 754354226d Merge pull request #727 from stm2/bug2355 
simplify academy teaching code, addressing bug 2335
 2017-09-02 17:10:15 +02:00
Steffen Mecke 080d5e3f65 rename teaching_info.value to days 2017-09-02 15:50:03 +02:00
Steffen Mecke b98c01a7b8 simplify academy teaching code, addressing bug 2335 2017-09-02 03:24:04 +02:00
Enno Rehling 5f518ae4f0 Merge pull request #725 from ennorehling/develop 
Bugfixes for 3.14 release
 2017-09-01 22:23:48 +02:00
Enno Rehling 108268fa17 BUG 2269: Vertraute vergessen ihre Magie nicht. 2017-09-01 22:10:38 +02:00
Enno Rehling eabf72e60e BUG 2362: clone_men hitpoint calculation was wrong. 2017-09-01 22:04:36 +02:00
Enno Rehling a8bfa5e095 try fixing familars without a mage. 2017-08-31 21:19:25 +02:00
Enno Rehling 0b6f5aa064 handle eressea.ini containing a 0 to disable modules 2017-08-28 00:04:05 +02:00
Enno Rehling 1ac64650b0 BUG 2360: upper limits for trees. 
https://bugs.eressea.de/view.php?id=2360
 2017-08-27 20:10:27 +02:00
Enno Rehling 8517857d55 BUG 2361: familiars cannot forget magic. 
https://bugs.eressea.de/view.php?id=2361
 2017-08-27 19:55:04 +02:00
Enno Rehling aa27c91a6e BUG 2289: Beschreibung "Opfere Kraft" 2017-08-27 17:11:07 +02:00
Enno Rehling 13059df707 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-08-25 21:11:27 +02:00
Enno Rehling f4df6bd9db kill ATF_CURSE flag, compare to at_curse directly. 2017-08-25 21:11:01 +02:00
Enno Rehling 612cd1158a move chaosgate to borders.c 2017-08-25 21:07:23 +02:00
Enno Rehling faefaf2523 deprecate unused at_cursewall. 2017-08-25 21:03:04 +02:00
Enno Rehling 4bf4f088b0 BUG 2346: restore old unit limits 2017-08-25 14:10:43 +02:00
Enno Rehling 6d1fe2842a leak: free special directions. 2017-08-25 08:52:15 +02:00
Enno Rehling 6b7da57e28 Merge pull request #724 from ennorehling/master 
version 3.13 release
 2017-08-24 17:32:10 +02:00
Enno Rehling 77f6e7adb4 Merge pull request #723 from ennorehling/develop 
syncing master and develop for 3.14
 2017-08-24 17:24:00 +02:00
Enno Rehling 4bb6d503ea upgrade version number, ready for 3.14 development 2017-08-24 17:00:36 +02:00
Enno Rehling c5bd67d62b Merge branch 'master' into develop 2017-08-24 16:59:49 +02:00
Enno Rehling 9a7da6aea3 Merge branch 'develop' 2017-08-24 16:57:14 +02:00
Enno Rehling b70f0e9977 do not allow install from the wrong branch 2017-08-24 16:57:02 +02:00
Enno Rehling 2dd159841e Merge branch 'master' into develop 2017-08-24 16:47:24 +02:00
Enno Rehling eb5616aa19 Merge remote-tracking branch 'upstream/master' 2017-08-24 14:13:46 +02:00