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

9185 Commits

Author SHA1 Message Date
Enno Rehling 907c5fc601 unused variable. 2018-02-06 21:39:52 +01:00
Enno Rehling 1ee6f5444a finish XInclude removal project. 
reduce number of XML files for E3.
 2018-02-06 21:28:55 +01:00
Enno Rehling 9d54dac0f5 merge 2018-02-06 18:49:38 +01:00
Enno Rehling df255b886a verify xml loading, fix remaining files for e2. 2018-02-06 18:46:28 +01:00
Enno Rehling 434b7ae29e convert all of E2 to new config loading. 2018-02-05 19:35:15 +01:00
Enno Rehling da02c1b92e Use custom URI schemes for config files. 
TODO: XML files need to be rebased, XIncludes replaced.
 2018-02-05 17:46:11 +01:00
Enno Rehling 92f82c3608 plan to eliminate xinclude use, move to single config file with includes. 2018-02-05 17:46:11 +01:00
Enno Rehling 79b54060f9 Merge remote-tracking branch 'upstream/develop' into develop 2018-02-05 17:45:06 +01:00
Enno Rehling 961c6e0130 delete unused XML files 2018-02-05 17:41:35 +01:00
Enno Rehling 6ef8d1af3c Use custom URI schemes for config files. 
TODO: XML files need to be rebased, XIncludes replaced.
 2018-02-05 03:44:26 +01:00
Enno Rehling 82be89e9ed
Merge pull request #765 from ennorehling/develop 
Mac builds, Braineater diet
 2018-02-04 20:47:27 +01:00
Enno Rehling a316283a6d plan to eliminate xinclude use, move to single config file with includes. 2018-02-04 20:02:01 +01:00
Enno Rehling 2d7d46d3ac Merge small braineater units to reduce memory pressure. 2018-02-04 19:13:04 +01:00
Enno Rehling a8c9576937 fix mac build 2018-02-04 14:59:01 +01:00
Enno Rehling 48bb6c65da Merge branch 'master' into develop 2018-02-04 12:09:39 +01:00
Enno Rehling 04f46cd591 disable deveron preview 2018-02-04 12:08:51 +01:00
Enno Rehling 9aca86ec8b
Merge pull request #764 from ennorehling/develop 
some memory savings
 2018-02-03 22:11:40 +01:00
Enno Rehling 19563ee9ec Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-02-03 22:07:08 +01:00
Enno Rehling 5b61f895a2 further reduce teh amount of temporary storage required by the economy module. 2018-02-03 20:52:24 +01:00
Enno Rehling 6f7c8743b3 remove a lot of struct copying in the stupid expand function. 2018-02-03 20:45:19 +01:00
Enno Rehling e1d33e55a4 refactor econ_request union for readability. 2018-02-03 20:24:16 +01:00
Enno Rehling 613c0edf2f add most basic test coverage for cmd_loot 2018-02-03 15:25:03 +01:00
Enno Rehling ba14fab3a3 macros should have uppercase names. 2018-02-03 14:49:35 +01:00
Enno Rehling f1be8caa46 more skill size savings. 2018-02-03 14:16:01 +01:00
Enno Rehling 5cdd79804a optimize sizeof(skill) 2018-02-03 12:57:43 +01:00
Enno Rehling 3c8ff4e76e CMAKE_BUILD_TYPE is a cache variable 2018-02-03 09:58:56 +01:00
Enno Rehling 096861fc62 Merge remote-tracking branch 'upstream/develop' into develop 2018-02-02 19:50:10 +01:00
Enno Rehling ce0ac9b6a1
Merge pull request #763 from ennorehling/libdb 
smarter cmake with db-select options
 2018-02-02 19:49:37 +01:00
Enno Rehling 5094705ba0 make s/cmake-init more intelligent. 2018-02-02 18:39:05 +01:00
Enno Rehling b349da4509
Merge pull request #762 from stm2/sound_out 
fixed typo for sound_out
 2018-02-01 12:55:08 +01:00
Steffen Mecke c6a459c918 fixed typo for sound_out 2018-02-01 11:33:11 +01:00
Enno Rehling 5b42de3283 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-01-28 19:12:48 +01:00
Enno Rehling 6f1f5409ae Solve unicode indentation problems in summary. 2018-01-28 19:12:31 +01:00
Enno Rehling 1181cae463 Merge remote-tracking branch 'upstream/develop' into develop 2018-01-28 18:42:22 +01:00
Enno Rehling 6fca773426 BUG 2416: prefer sqlite over db 2018-01-28 18:26:54 +01:00
Enno Rehling 70cc56b223 make summary a little prettier. 2018-01-28 11:37:42 +01:00
Enno Rehling b6e8822044 BUG 2398: remove deltas from summary. 2018-01-27 21:48:05 +01:00
Enno Rehling 715097ae0d
Merge pull request #761 from ennorehling/develop 
small tweaks
 2018-01-27 13:38:12 +01:00
Enno Rehling 241cb4d6eb Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-01-26 18:18:18 +01:00
Enno Rehling ed623732d3 fix reduce_skill max_week calculation. 2018-01-26 18:18:12 +01:00
Enno Rehling b0ef468617 select berkeley over sqlite, compile only one 2018-01-26 18:02:10 +01:00
Enno Rehling ff85cda724 stop using sqlite for a player database 2018-01-26 17:56:30 +01:00
Enno Rehling 1c535b8dda rough test of familiar spell 2018-01-26 17:45:40 +01:00
Enno Rehling e233d08e8f move more reporting code to reports.c 2018-01-26 17:39:15 +01:00
Enno Rehling 0170a6fc09 move bsdstring use to reports.c 2018-01-25 21:31:09 +01:00
Enno Rehling 6a9320a0d0 these casts not required. 2018-01-25 18:49:12 +01:00
Enno Rehling 495c45391d CID 182344: Integer handling issues 2018-01-25 15:38:55 +01:00
Enno Rehling 5fb2283d7b Merge remote-tracking branch 'upstream/develop' into develop 2018-01-22 19:49:29 +01:00
Enno Rehling e354b65151
Merge pull request #760 from ennorehling/2405-mistletoe 
BUG 2405: mistletoe rewrite
 2018-01-22 19:48:14 +01:00
Enno Rehling 1edaaef99b remove debug output 2018-01-22 19:44:52 +01:00