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

9428 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
480c8f9d33 merge 2018-05-18 21:15:11 +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
f5d6e6ac6e we do not need xmlreader anymore! 2018-05-18 20:43: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
bad58eeef4 remove superfluous keywords from e3 strings. 2018-05-17 23:19:54 +02:00
Enno Rehling
04a15ba1fd read E3 strings from po file only 2018-05-17 23:13:37 +02:00
Enno Rehling
ab556f0086 Merge branch 'develop' 2018-05-17 23:05:28 +02:00
Enno Rehling
6f6f2c1c2e Additional strings used by E3 only. 2018-05-17 23:05:03 +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
064a0872ed Export strings to .po files (WIP). 2018-05-16 21:33:29 +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
9dd38a6593 convert E2 familiars from XML to Lua 2018-05-15 06:58:07 +02:00
Enno Rehling
e46cfa5e77 remove even more equipment xml to Lua 
only familiars still TBD, I think.
 2018-05-14 22:01:32 +02:00
Enno Rehling
2a026da1fd Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-05-14 19:27:41 +02:00
Enno Rehling
40a2a6735a mac build fix, dragon spoils equipment in Lua 2018-05-14 04:42:59 +02:00
Enno Rehling
cadb374ab8 re-add accidentally deleted undead and dracoid equipment. 2018-05-13 22:01:51 +02:00
Enno Rehling
2be0e9bd41 customize equipment for each game, in Lua. 
no more equipment.xml for e3
 2018-05-13 21:58:01 +02:00
Enno Rehling
a741eaca97 equip new orcs in e2 with lua and a hacky callback. 2018-05-13 21:23:54 +02:00
Enno Rehling
1d7318d9b6 test that new orcs have weapon skills. 2018-05-13 20:36:49 +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
666d5715ab BUG 2439 Strassenbau Fehlermeldung (Region/Richtung). 2018-05-13 13:03:47 +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
cdef4ae21d
Merge pull request #779 from ennorehling/develop 
beginning of the end of XML equipment
 2018-05-12 21:52:35 +02:00
Enno Rehling
40125bb75e translate seed_%race% equipment from xml to lua. 2018-05-12 20:52:10 +02:00
Enno Rehling
298e220cfd Oh. E3 hat kein autoseed, ergo kein seed_elf equipment? 2018-05-12 19:18:25 +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