Enno Rehling
|
f513c2c68a
|
skip excessive password generation in tests.
|
2018-09-26 20:19:59 +02:00 |
|
Enno Rehling
|
ae05d6d9e9
|
work factor 12 is incredibly slow, don't use it in tests.
|
2018-09-26 20:08:38 +02:00 |
|
Enno Rehling
|
4e5240628e
|
Extract gamedb open/close to separate functions.
|
2018-09-25 18:52:29 +02:00 |
|
Enno Rehling
|
ccc5556682
|
adding code to export faction information.
sqlite3 implementation only, not tied to anything yet.
add faction.uid
remove faction.subscription
|
2018-09-24 20:18:21 +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
|
2e5e8347ac
|
Bug 2489: Kill the SIEGE command, forever.
|
2018-09-09 21:01:10 +02:00 |
|
Enno Rehling
|
062abe8102
|
refactor siege property w. getter/setter
|
2018-09-09 17:10:18 +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 |
|
Enno Rehling
|
4d3718bab9
|
find out why t<=0 assert happens sometimes
|
2018-05-06 18:05:35 +02:00 |
|
Enno Rehling
|
0e3170a0cb
|
merge
|
2018-05-05 07:39:25 +02:00 |
|
Enno Rehling
|
d568e79490
|
spellbooks contain spellref, not spell *.
for order-independent load from XML.
|
2018-05-05 07:38:11 +02:00 |
|
Enno Rehling
|
ad0f83dcca
|
some xmlreader code still required that resources get loaded first.
|
2018-05-04 18:48:14 +02:00 |
|
Enno Rehling
|
75aff73e9a
|
Merge branch 'develop'
|
2018-05-03 23:01:42 +02:00 |
|
Enno Rehling
|
34c6222b8f
|
BUG 2436: Fix the E3 tactics bonus for ships.
|
2018-05-03 22:44:01 +02:00 |
|
Enno Rehling
|
5bcd8369af
|
ignore sqlite setting errno
|
2018-05-03 22:40:54 +02:00 |
|
Enno Rehling
|
d2eccd56b9
|
defaults
|
2018-05-01 19:39:41 +02:00 |
|
Enno Rehling
|
e5d3d77c06
|
begin parsing buildings.
|
2018-05-01 18:52:48 +02:00 |
|
Enno Rehling
|
3db9d5d878
|
merge from develop. luxuty price conflict resolved.
|
2018-05-01 17:23:46 +02:00 |
|
Enno Rehling
|
b5b9611a16
|
eliminate construction.improvement,
create building_type.stages instead.
|
2018-05-01 15:40:11 +02:00 |
|
Enno Rehling
|
c7ae070fa7
|
nobody needs the construct_t enum.
|
2018-05-01 07:02:55 +02:00 |
|
Enno Rehling
|
b44e4e747d
|
ships and items never have multi-stage builds.
we are going to make sure of this soon.
|
2018-04-30 23:23:48 +02:00 |
|
Enno Rehling
|
e0cae602dd
|
add a test for building items.
|
2018-04-30 23:18:39 +02:00 |
|
Enno Rehling
|
e0e873044d
|
fix stone golems (assert).
remove improvement logic from build().
|
2018-04-30 23:11:13 +02:00 |
|
Enno Rehling
|
22734a4ae4
|
refactor building stages into build_stages().
TODO: remove them from build().
|
2018-04-30 22:52:38 +02:00 |
|
Enno Rehling
|
c01e9b24ad
|
unit tests for racial weapon permissions.
|
2018-04-29 15:09:07 +02:00 |
|
Enno Rehling
|
1ef57ef4f0
|
merge conflicts, race masking.
|
2018-04-29 13:50:56 +02:00 |
|
Enno Rehling
|
837ab325f9
|
XML simplificatio: unified system for masking races on modifiers.
|
2018-04-29 13:46:17 +02:00 |
|
Enno Rehling
|
ac786e034c
|
extract rc_mask, add it to exparse code.
|
2018-04-29 13:16:07 +02:00 |
|
Enno Rehling
|
3cb1d1a071
|
simplify race masking for weapon modifiers.
|
2018-04-29 13:13:10 +02:00 |
|
Enno Rehling
|
e86f3e7589
|
read callback fucntions for resources and weapons.
|
2018-04-28 21:46:01 +02:00 |
|
Enno Rehling
|
e4a2b6cb35
|
loading armor with expat.
|
2018-04-28 18:47:17 +02:00 |
|
Enno Rehling
|
16cebed013
|
implement weapons loading with expat.
|
2018-04-28 18:40:14 +02:00 |
|
Enno Rehling
|
03cff6d595
|
extract rc_mask, add it to exparse code.
|
2018-04-28 16:14:32 +02:00 |
|
Enno Rehling
|
edadf2cbab
|
exparse: parse (most of) the resource data.
|
2018-04-28 15:58:14 +02:00 |
|
Enno Rehling
|
08663b6eb5
|
fix last commit. refactoring with the MSVC IDE is prone to errors.
|
2018-04-28 15:57:51 +02:00 |
|
Enno Rehling
|
ef96ec9de0
|
additional testing
|
2018-03-17 12:55:26 +01:00 |
|
Enno Rehling
|
3bca8d969a
|
Merge branch 'master' into develop
|
2018-03-16 21:58:52 +01:00 |
|
Enno Rehling
|
121bf343ea
|
fix get_command for K_STUDY (still bug 2427).
|
2018-03-16 21:49:24 +01:00 |
|
Enno Rehling
|
db5d9e069e
|
failing test for bug 2427: create_order(K_STUDY, ...)
|
2018-03-16 19:52:54 +01:00 |
|
Enno Rehling
|
ac8ae18588
|
allow a per-game seed in eressea.ini
|
2018-03-11 19:10:08 +01:00 |
|
Enno Rehling
|
ef3b72ceb7
|
BUG 2423: only apply other skill modifiers if race-modifier doesn't drop skill below 1.
|
2018-03-04 20:30:34 +01:00 |
|
Enno Rehling
|
db253ea6a1
|
newterrain was unfit for unit testing.
bad test: insects cannot trade in deserts without castle.
|
2018-03-04 20:03:13 +01:00 |
|
Enno Rehling
|
6c0f8a81f6
|
merge from master
|
2018-02-26 19:51:48 +01:00 |
|
Enno Rehling
|
622c103b00
|
more cppcheck messages
|
2018-02-26 19:48:52 +01:00 |
|
Enno Rehling
|
db83140753
|
merge conflict nightmare fix.
|
2018-02-25 20:49:33 +01:00 |
|
Enno Rehling
|
432a8d432d
|
messy merge of cppcheck fixes into develop
|
2018-02-25 20:41:53 +01:00 |
|
Enno Rehling
|
28e9ddbdb4
|
Merge branch 'master'
|
2018-02-25 20:27:16 +01:00 |
|
Enno Rehling
|
aae7e9b954
|
immer noch FAST_CONNECT Reste
|
2018-02-25 20:06:55 +01:00 |
|
Enno Rehling
|
079a55fe41
|
cppcheck warnings
|
2018-02-25 20:06:47 +01:00 |
|
Enno Rehling
|
aacd0885df
|
fix termination bug in itoa functions.
|
2018-02-25 19:17:20 +01:00 |
|
Enno Rehling
|
8c554edfee
|
findunitg was deprecated.
|
2018-02-25 18:35:40 +01:00 |
|
Enno Rehling
|
4181e23d15
|
FAST_CONNECT is always on.
fix more cppcheck messages.
|
2018-02-25 18:30:20 +01:00 |
|
Enno Rehling
|
120b03d2f5
|
Passing NULL after the last typed argument to a variadic function leads to undefined behaviour.
|
2018-02-25 18:14:48 +01:00 |
|
Enno Rehling
|
13cc8841d3
|
msg_setting is a dead feature, remove leftovers.
|
2018-02-25 18:10:09 +01:00 |
|
Enno Rehling
|
fc2506ee83
|
cppcheck: DMAXHASH was unused.
cppcheck: remove warnings, reduce variable scopes.
|
2018-02-25 17:58:45 +01:00 |
|