Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
9560 commits 10 branches 0 tags 41 MiB
Commit graph

1673 commits

Author SHA1 Message Date
Enno Rehling
f8040e2d9f unit test to also prove bug 2505 2018-10-29 18:54:23 +01:00
Enno Rehling
dce5f7857b unused variable 2018-10-28 21:31:58 +01:00
Enno Rehling
be84c13a72 remove test_inject_messagetypes(), make that the default behavior in tests. 2018-10-28 21:28:05 +01:00
Enno Rehling
820de2ee35 fix cont arguments for new clibs version 2018-10-21 19:30:19 +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
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
7544565237 start work on 3.18 release 2018-09-04 15:28:05 +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
2697d78c07 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-08-01 11:56:08 +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
d9ba7be884 Merge branch 'master' into develop 2018-07-31 10:42:53 +02:00
Enno Rehling
cd6154cae6 fix the lighthouse crash in preview. 2018-07-22 10:55:09 +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
ced21cc336 BUG 2459 Regionen recycling macht ein Reset der Rohstoffe. 2018-07-13 23:37:45 +02:00
Enno Rehling
6403c75c85 monsters should not be anonymous. 2018-07-02 19:58:26 +02:00
Enno Rehling
5018308170 remove at_chaoscount, update storage module. 2018-06-28 22:48:57 +02:00
Enno Rehling
38cb6297bb Merge branch 'master' 2018-06-24 20:36:32 +02:00
Enno Rehling
6d10ee8fa5 BUG 2453: Erstausstattung und Default-Befehle für neue Parteien. 2018-06-24 18:08:19 +02:00
Enno Rehling
a62541a17e BUG 2443: Straßen ohne komplizierte String-Bastelei. 2018-06-11 21:00:33 +02:00
Enno Rehling
3208164b13 update version 2018-06-03 11:01:08 +02:00
Enno Rehling
49178d8fc7 unused variable 2018-05-21 16:38:32 +02:00
Enno Rehling
60a86e7b2f escaping a string for use in CR needs to only replace quotes and backslashes. 2018-05-21 13:27:02 +02:00
Enno Rehling
b3b19e7c83 suppress those null-reference bugs in another way, maybe? 2018-05-19 21:01:10 +02:00
Enno Rehling
dfa0ff09d1 Suppress some false positive coverity results. 
It apparently does not understand CuTest code well?
Add a check for Lua eff_skill binding.
 2018-05-19 20:53:51 +02:00
Enno Rehling
33a6d7fa0e free sections memory. 2018-05-18 21:43:02 +02:00
Enno Rehling
bbae56633b rules was part of convert, and we do never finished that branch. 2018-05-18 21:19:01 +02:00
Enno Rehling
ce37fd1bb7 remove libxml2 from dependencies 
remove the converter, that isn't a way we're going.
 2018-05-18 21:14:22 +02:00
Enno Rehling
6b0f75339f message parsing from exparse is working, but allocates too much. 2018-05-18 20:42:22 +02:00
Enno Rehling
19b3b5b35a change how message types are created (more prep work for expat) 2018-05-18 19:58:49 +02:00
Enno Rehling
6608f1b1ab Merge branch 'develop' 2018-05-18 15:34:50 +02:00
Enno Rehling
3cd51fe384 cppcheck niggles. 2018-05-18 15:34:21 +02:00
Enno Rehling
810bf3b40a fix some cppcheck warnings 2018-05-18 02:55:33 +02:00
Enno Rehling
0a9f8bf662 merge from develop 2018-05-15 21:59:01 +02:00
Enno Rehling
269030082c remove struct equipment from the code entirely. 2018-05-15 21:51:47 +02:00
Enno Rehling
4240e142a5 BUG 2440: the random encounters code was completely unused. 2018-05-13 16:15:22 +02:00
Enno Rehling
79bc22b617 fatal error my a$$ . the gamedat check is killing tests for no discernible reason. 2018-05-12 22:12:14 +02:00
Enno Rehling
7e6688552b create a callback mechanism for equipment. 2018-05-11 21:30:26 +02:00
Enno Rehling
84bc08a381 all races can be on a boat by default. 
but now MAKETEMP is broken.
prefer assert_(not_)nil over assert_(not_)equal
 2018-05-10 22:10:26 +02:00
Enno Rehling
9e16ebc01a all kinds of race flag breakage repaired. 
but now, humans suddenly can't build a ship in E2?
 2018-05-10 22:00:23 +02:00
Enno Rehling
5de2a9e2ae fix ec_flags parsing (irongolem, etc) 2018-05-10 21:05:51 +02:00
Enno Rehling
fc052034ac Merge branch 'exparse' of https://github.com/ennorehling/eressea.git 2018-05-09 22:23:40 +02:00
Enno Rehling
907348adfc merge race xml changes (teach, migrants, floating point) 2018-05-09 22:21:50 +02:00
Enno Rehling
c05a65b881 expat parses (most of) races. 
fix canteach flag in XML.
 2018-05-09 22:16:30 +02:00
Enno Rehling
8c7b890f3e set the default unarmed modifiers for races. 2018-05-09 20:56:38 +02:00
Enno Rehling
c9b9bac2ac Merge branch 'develop' 2018-05-08 23:11:14 +02:00
Enno Rehling
ae3c0b099f spells do not have a function element in XML 2018-05-08 23:10:51 +02:00
Enno Rehling
d45c32f1ac Merge branch 'develop' 2018-05-08 21:32:45 +02:00