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

3730 commits

Author SHA1 Message Date
Enno Rehling
7b7d3cb759 test: lighhouse size reduction reduces effectiveness 2018-07-17 21:34:22 +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
820264aa82 BUG 2461: Liste der Angreifer zeigt nicht alle Parteien. 2018-07-15 13:39:23 +02:00
Enno Rehling
ced21cc336 BUG 2459 Regionen recycling macht ein Reset der Rohstoffe. 2018-07-13 23:37:45 +02:00
Enno Rehling
de7248fb5a BUG 2457: Einheiten werden bei Durchreise nicht angezeigt. 2018-07-13 22:45:17 +02:00
Enno Rehling
6403c75c85 monsters should not be anonymous. 2018-07-02 19:58:26 +02:00
Enno Rehling
e8ef5be7f6 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-06-28 22:49:05 +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
2b0b7cd0f8 BUG 2447: PArtei fehlt im Kampfreport. 
replace strcpy with strcat
 2018-06-18 20:33:28 +02:00
Enno Rehling
ecdf03138f Merge branch 'master' into develop 2018-06-11 21:38:55 +02:00
Enno Rehling
34d0b56c68 BUG 2448: Default-Attacken respektieren! 2018-06-11 21:36:59 +02:00
Enno Rehling
a62541a17e BUG 2443: Straßen ohne komplizierte String-Bastelei. 2018-06-11 21:00:33 +02:00
Enno Rehling
13090fd27c BUG 2446: trade prices not getting read from XML. 2018-06-10 10:58:39 +02:00
Enno Rehling
ade7b2ef43 BUG 2446: trade prices not getting read from XML. 2018-06-10 09:58:26 +02:00
Enno Rehling
5b0f3f9ea7 more sbstring upgrades 2018-06-09 21:22:02 +02:00
Enno Rehling
4b5bd11f29 spell_syntax without bsdstring, better tests. 2018-06-03 13:29:54 +02:00
Enno Rehling
f96c9c5bf9 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-06-03 11:04:20 +02:00
Enno Rehling
3208164b13 update version 2018-06-03 11:01:08 +02:00
Enno Rehling
cb5d15fee3 eliminate bsdstring.h usage 2018-06-03 05:42:09 +02:00
Enno Rehling
6abf054b42 replace bsdstring functions in cycle_route. 2018-05-27 20:31:36 +02:00
Enno Rehling
034872c44e respect the input length when copying in str_escape_ex. 2018-05-27 15:15:31 +02:00
Enno Rehling
5af3ac1b40 reproduce buffer overflow in str_escape_ex 2018-05-27 15:11:03 +02:00
Enno Rehling
95c5c86303 Bug 2444: set default scores 2018-05-24 16:40:50 +02:00
Enno Rehling
9b3b376579 BUG 2443: Fehlende Leerzeile im Kampfreport. 2018-05-24 16:31:01 +02:00
Enno Rehling
49178d8fc7 unused variable 2018-05-21 16:38:32 +02:00
Enno Rehling
e53a1caa08 cleanup unused conde 2018-05-21 16:24:08 +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
226fa2ba08 fix crash in region messages. 2018-05-20 17:11:29 +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
4154b1c3d9 remove additional whitespace in some strings. 2018-05-19 13:34:00 +02:00
Enno Rehling
6699e8940e some cleanup is good. 2018-05-18 21:44:03 +02:00
Enno Rehling
33a6d7fa0e free sections memory. 2018-05-18 21:43:02 +02:00
Enno Rehling
22f6d4feed fix sections handling, remove it from nrmessage. 2018-05-18 21:36:10 +02:00
Enno Rehling
c11a020846 remove the text from messages.xml 2018-05-18 21:24:08 +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
f8b8a5284c begin expat message parsing 2018-05-18 18:50:13 +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
26dc593ddb shrink nrmessage 2018-05-18 08:34:00 +02:00
Enno Rehling
810bf3b40a fix some cppcheck warnings 2018-05-18 02:55:33 +02:00
Enno Rehling
9e64f66409 gates are never created, probably dead code 2018-05-18 02:55:03 +02:00
Enno Rehling
ef74b8e759 reduce the footprint of nrmessage 2018-05-18 02:46:34 +02:00
Enno Rehling
3867388834 iwyu 2018-05-18 02:35:11 +02:00
Enno Rehling
42f59fbd9e I think pofile.c belongs in the util directory. 2018-05-18 00:08:30 +02:00
Enno Rehling
7fa568da09 eliminate dead code, fix compile 2018-05-17 23:53:44 +02:00
Enno Rehling
409f5df9a9 po export code removed. 2018-05-17 23:29:12 +02:00
Enno Rehling
87914a7b5b delete XML Strings. 2018-05-17 23:27:29 +02:00
Enno Rehling
4d09f00f03 remove string parsing from XML. E3 tests failing! 2018-05-17 22:58:01 +02:00
Enno Rehling
0d6abd3811 Merge branch 'develop' 2018-05-17 22:49:03 +02:00
Enno Rehling
615dfe7ec5 Get the NR message text from locale. 2018-05-17 22:47:16 +02:00
Enno Rehling
c0ed53b679 last of the duplicate names. battles have lost their separators, though. 2018-05-17 22:15:24 +02:00
Enno Rehling
7a10a58605 1. nrmessage is locale-independent, uses locale_getstring 
2. unique strings:
rename aurapotion50 message.
delete unused bithday_firework definitions.
 2018-05-17 19:04:25 +02:00
Enno Rehling
c596402e4a load strings from po file, not xml. 2018-05-17 16:54:59 +02:00
Enno Rehling
9ca945cb2c add a string escaping function. 
start some work on nrmessage.c.
 2018-05-17 16:53:56 +02:00
Enno Rehling
35c3d4cda0 export messages and strings into separate .po files 
commit the exported files.
 2018-05-17 10:43:23 +02:00
Enno Rehling
0f3e3c9e38 po file exporter, also for messages. 2018-05-16 21:58:02 +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
40a2a6735a mac build fix, dragon spoils equipment in Lua 2018-05-14 04:42:59 +02:00
Enno Rehling
c223542ced kill an unused macro. 2018-05-13 16:17:03 +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
40125bb75e translate seed_%race% equipment from xml to lua. 2018-05-12 20:52:10 +02:00
Enno Rehling
271352d0ba create a lua module that can handle simple euipments. 
lua test for equip_unit, with callbacks.
 2018-05-12 19:10:40 +02:00
Enno Rehling
b12050ac2a lua callback for equip_unit 2018-05-12 18:25:44 +02:00
Enno Rehling
7e6688552b create a callback mechanism for equipment. 2018-05-11 21:30:26 +02:00
Enno Rehling
5c26155f2f Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-05-11 20:55:38 +02:00
Enno Rehling
7b1038b0b1 this equipment callback is never used in our lua scripts, and we want to use equipment less. 2018-05-11 06:06:31 +02:00
Enno Rehling
ac73052dc1 autoseed code is never used in lua scripts (they have their own autoseed implementation). 2018-05-11 06:05:28 +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
85cf8da383 rename canteach/canlearn to teach/learn 
race/function is never used (and there is no namedragon function).
 2018-05-10 20:37:37 +02:00
Enno Rehling
94769a66f8 teach vs canteach mixup 2018-05-10 20:18:56 +02:00
Enno Rehling
ad0491cecb Merge branch 'develop' 2018-05-10 20:03:16 +02:00
Enno Rehling
b0012eeae0 familiars do not need the default value in XML (bad XML). 2018-05-10 20:02:53 +02:00
Enno Rehling
48a4de0768 parse race/attack data 2018-05-10 07:01:46 +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
9e6ae0edc1 make str_strdup more forgiving 2018-05-09 07:14:56 +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
b197bb395d parse spell components. 2018-05-08 23:06:33 +02:00
Enno Rehling
371335ab95 spell flag merge conflicts 2018-05-08 21:45:21 +02:00
Enno Rehling
ccf09770e3 rename global target flag, invert logic 2018-05-08 21:43:13 +02:00
Enno Rehling
d45c32f1ac Merge branch 'develop' 2018-05-08 21:32:45 +02:00
Enno Rehling
6746401330 BUG 2437: fetch_astral should have no aura cost when given bad units. 2018-05-07 20:22:02 +02:00
Enno Rehling
68de367a98 print an error instead of asserting. 2018-05-06 19:27:22 +02:00
Enno Rehling
cfe21e7e1d re-enable tests, allow more spell arguments. 
a list of ships, units, etc can be long!
 2018-05-06 19:07:20 +02:00
Enno Rehling
d0d366485e Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-05-06 19:02:55 +02:00
Enno Rehling
14f59e4bfe functional tests for pull_astral spell. 2018-05-06 19:02:47 +02:00
Enno Rehling
4d3718bab9 find out why t<=0 assert happens sometimes 2018-05-06 18:05:35 +02:00