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

9646 Commits

Author SHA1 Message Date
Enno Rehling d8468dc83f Merge remote-tracking branch 'upstream/develop' into develop 2018-10-13 20:27:42 +02:00
Enno Rehling 576ddb6652
Merge pull request #801 from stm2/bug2480 
fix magic resistance (bug 2480)
 2018-10-13 20:25:31 +02:00
Enno Rehling 92c6fb9bac
Merge branch 'develop' into bug2480 2018-10-13 20:25:13 +02:00
Enno Rehling 675c6bc129 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-10-12 20:47:01 +02:00
Enno Rehling 772386ffc7 debug logging did not help. nothing unusual here, just weirdly intermittent. 2018-10-12 20:46:48 +02:00
Enno Rehling ef3ccc8d10 fix use of new database for sendreport et al 2018-10-09 19:42:17 +02:00
Enno Rehling 3327e996e5 Bei Neuauswertungen die Befehlsdatei neu erzeugen 2018-10-09 19:28:16 +02:00
Enno Rehling d1461e6622 Merge branch 'master' into develop 2018-10-07 08:31:44 +02:00
Enno Rehling a9c653c567
Merge pull request #811 from ennorehling/master 
Fix crash in report 1095
 2018-10-07 08:28:38 +02:00
Enno Rehling 53f2564eca Merge branch 'master' into develop 2018-10-07 08:24:24 +02:00
Enno Rehling 0398a1b705 Bug 2497: LERNE AUTO was subtly broken. 2018-10-07 08:22:56 +02:00
Enno Rehling 0b2292c98f
Merge pull request #810 from ennorehling/develop 
Integrate new parser library separation progress
 2018-10-06 21:35:15 +02:00
Enno Rehling 4d015469d3 Merge branch 'checker' into develop 2018-10-06 21:01:01 +02:00
Enno Rehling 5964d551e3 PATH_MAX is just a stupid constant 2018-10-06 20:53:26 +02:00
Enno Rehling 4f8dd4cb0f checker is going to use locales, fix them up, too. 2018-10-06 20:47:23 +02:00
Enno Rehling 9a1bdf4444 fix checker build and arg parsing 2018-10-04 10:49:53 +02:00
Enno Rehling 64752deb26 Merge branch 'checker' of github.com:ennorehling/eressea into checker 2018-10-04 10:43:21 +02:00
Enno Rehling 6b983079b7 remember to set faction.lastorders (NMR count was off). 
checker just removes comments now.
 2018-10-04 04:47:20 +02:00
Enno Rehling bbd57b6ae9 remove debug stuff, use new parser for the game. 2018-10-03 20:33:53 +02:00
Enno Rehling 730b94fa4a reuse the internal buffer when we don't have to malloc. 2018-10-03 20:29:45 +02:00
Enno Rehling fbce8f326a fix error in multi-line comments at stream border. 2018-10-03 19:47:32 +02:00
Enno Rehling 854decc4f1 comments split by a backslash are not handled right. 2018-10-03 10:37:34 +02:00
Enno Rehling 6c1d266c12 fix comment parsing at end of input 2018-10-02 21:40:14 +02:00
Enno Rehling b439e48a22 some failing tests 2018-10-02 19:02:22 +02:00
Enno Rehling e6b93ce79a reset state when we meet the NEXT command. 2018-10-02 19:02:01 +02:00
Enno Rehling eed3ab3acf finish new order parser, maybe? 2018-10-01 21:32:59 +02:00
Enno Rehling 90b80aba89 fix some more issues with buffer ending before decisions are finished. 2018-10-01 02:26:31 +02:00
Enno Rehling b1cd9bcfef Pretty good progress on the OrderParser implementaiton. 
Still finding bugs by unit-testing, though.
 2018-09-30 19:47:34 +02:00
Enno Rehling 0c4d1ec2b2 fix libbsd linking (MSVC) 2018-09-30 16:18:06 +02:00
Enno Rehling a4f6c6f005 fix libbsd linking 2018-09-30 16:16:32 +02:00
Enno Rehling fb8507e0d2 support for non-utf8 encodings has rotted, kill it. 2018-09-30 15:02:03 +02:00
Enno Rehling f53b1f50ae cmake init after pull 2018-09-30 14:54:13 +02:00
Enno Rehling a012f051f1
Merge pull request #809 from ennorehling/develop 
change database selection, fix in-memory db
 2018-09-30 13:45:55 +02:00
Enno Rehling 0c6ec47598 fix compilation 2018-09-30 13:45:19 +02:00
Enno Rehling 4a69573786 change database selection, fix in-memory db 2018-09-30 13:36:34 +02:00
Enno Rehling 965c8ce990 start putting the new parser into the server. 2018-09-29 21:21:14 +02:00
Enno Rehling b03da543b6 make findparam_ex part of laws, where building names are known. 2018-09-29 20:06:58 +02:00
Enno Rehling d3a37179ef add param.[hc], at last. 2018-09-29 19:32:39 +02:00
Enno Rehling bc5f2ea6d1 move keyword.[hc] to util 2018-09-29 18:13:32 +02:00
Enno Rehling 991fe8fd8d enable checker build. 
remove getid aliases from parser.h
 2018-09-29 13:35:49 +02:00
Enno Rehling b22d838a57 move gamedata.c to kernel 2018-09-29 13:21:46 +02:00
Enno Rehling a373807189 move attrib and event modules to kernel 2018-09-29 11:37:17 +02:00
Enno Rehling 5dcb9075ac we have a library that contains the parser 2018-09-29 11:19:59 +02:00
Enno Rehling 735c890ece explicitly build sqlite on travis 2018-09-29 09:58:23 +02:00
Enno Rehling b18f8ca9fb change database selection, fix in-memory db 2018-09-29 09:56:05 +02:00
Enno Rehling 33a894ee1c
Merge pull request #808 from ennorehling/develop 
Weekend update
 2018-09-29 03:48:47 +02:00
Enno Rehling b47a41541f write a new (expensive) in-memory db driver for orders. 2018-09-28 21:43:20 +02:00
Enno Rehling 91c49659ef orderdb is glue code, belongs outside of kernel. 2018-09-28 21:02:32 +02:00
Enno Rehling 7b9e72e559 reduce dependeny spaghetti for database code. 2018-09-28 20:51:16 +02:00
Enno Rehling 17f7aa2c0a start new branch for a syntax checker 2018-09-27 19:53:07 +02:00