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

8755 Commits

Author SHA1 Message Date
Enno Rehling 6ab35d80d0 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-09-18 17:26:50 +02:00
Enno Rehling 7fdbb1b939 add a test for rt_find to flush out substring matches. 2017-09-18 17:26:34 +02:00
Enno Rehling 69079ce319 remove it_register, because it does nothing. 2017-09-18 17:20:58 +02:00
Enno Rehling 1f65932794 add a test for get_equipment with substrings. 2017-09-18 17:20:09 +02:00
Enno Rehling c9445ab517 change resource_type trie storage 2017-09-18 11:48:42 +02:00
Enno Rehling 97dc98862b do not use strncpy, then 2017-09-18 08:39:06 +02:00
Enno Rehling eca1e5f973 make keys_size not return 4096 all the time. 2017-09-17 21:09:23 +02:00
Enno Rehling 455e03fa05 try and make coverity understand the equipment trie. 
shorten names.
 2017-09-17 20:42:43 +02:00
Enno Rehling 8e0bdbe428 coverity scan does not understand get_or_create_equipment? 2017-09-17 09:31:43 +02:00
Enno Rehling 0d0fb49381 attempt to fix valgrind bug 2017-09-16 09:34:47 +02:00
Enno Rehling 0a3eb9ac7b fix read/write of regioninfo. 2017-09-16 09:03:42 +02:00
Enno Rehling 1b19e8d19c BUG 2365: Ozeane sollen keine Beschreibung haben können. 
https://trello.com/c/GSeHT8t6/618-why-r-display-not-r-land-display
 2017-09-16 08:42:49 +02:00
Enno Rehling 423fe65377 move region display to land_region struct, oceans do not have descriptions. 2017-09-16 07:58:57 +02:00
Enno Rehling 8c6362002e fix some niggles, delete invalid test. 2017-09-16 07:37:33 +02:00
Enno Rehling 860afe855f improve the skill read/write code. 2017-09-15 22:03:54 +02:00
Enno Rehling 8b4e3b7738 extract write_skills and read_skills functions. 2017-09-15 21:55:57 +02:00
Enno Rehling a569ef67e8 sortiere unit.skills nach id. 
TODO: binary search statt linear, read_unit optimization

https://trello.com/c/ydUTDGgl/616-sort-unitskills-binary-search
 2017-09-15 21:52:20 +02:00
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