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

9106 Commits

Author SHA1 Message Date
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
Enno Rehling 7441b1e0eb disable nwbie immunity in test that requires ATTACK 2018-01-22 19:30:56 +01:00
Enno Rehling cc278896f9 DRY: change mistletoe code 
add some debug logic to intermittent test
 2018-01-22 19:22:56 +01:00
Enno Rehling 0b036557c0 test that mistletoe users survive attacks. 2018-01-21 18:13:42 +01:00
Enno Rehling 1eaa1e6d84 BUG 2405: use mistletoe to create effect, use effect to flee from battle. 2018-01-21 18:07:49 +01:00
Enno Rehling 6eae363487 disable the mistletoe test for now, it has no effect. 2018-01-21 11:18:06 +01:00
Enno Rehling ee9223fcf2 Merge branch '2405-mistletoe' of https://github.com/ennorehling/eressea.git 2018-01-21 11:16:28 +01:00
Enno Rehling 4247ef96b1 why are we using the short type? 2018-01-21 11:14:55 +01:00
Enno Rehling a8abca3f1c test potions with long-duration effect. 2018-01-21 11:03:51 +01:00
Enno Rehling 7db82ba21e refactoring for readability 2018-01-21 11:03:51 +01:00
Enno Rehling 9ff04ec6db skip all xp draining tests 2018-01-21 11:03:50 +01:00
Enno Rehling 2493b01883 make some changes to support non-random skill progress. 
disable test_drain_exp, since it can't deal with that.
 2018-01-21 11:03:50 +01:00
Enno Rehling 88a96d5723 begin adding tests for skills. 2018-01-21 11:03:49 +01:00
Enno Rehling 0b20c379b6 enhance foolpotion test. 2018-01-21 11:03:49 +01:00
Enno Rehling 6481acac76 move xmlreader.c up a directory. 2018-01-21 11:03:49 +01:00
Enno Rehling d38582360a mistletoe as curse (bad idea) 2018-01-21 11:03:48 +01:00
Enno Rehling d383abb625 Merge remote-tracking branch 'upstream/develop' into develop 2018-01-21 11:02:42 +01:00
Enno Rehling 0bf5e3bd57 fix test_cleanup -> test_teardown name change 2018-01-21 11:02:20 +01:00
Enno Rehling c1bacdb5fd Merge branch 'master' into develop 2018-01-21 11:01:05 +01:00
Enno Rehling 44f8e1909f
Merge pull request #759 from ennorehling/master 
Hotfix turn 1060, broken data from bug 2413
 2018-01-21 10:58:28 +01:00
Enno Rehling d78b21c1c3 BUG 2413: renumber parsing caused f->no == 0 2018-01-21 10:38:30 +01:00
Enno Rehling 74c48f7914 christmas mege conflict, why? 2018-01-21 09:54:32 +01:00
Enno Rehling a6487313e0
Merge pull request #758 from ennorehling/develop 
tests and minor changes
 2018-01-21 00:40:49 +01:00
Enno Rehling 0291d85529 make sure that jewels are what is sold in tests. 2018-01-19 16:59:52 +01:00
Enno Rehling 69c0f45d6c refactoring for readability 2018-01-18 17:38:20 +01:00
Enno Rehling 00e1115cad skip all xp draining tests 2018-01-18 17:29:06 +01:00
Enno Rehling 8b837060e7 make some changes to support non-random skill progress. 
disable test_drain_exp, since it can't deal with that.
 2018-01-17 19:25:20 +01:00
Enno Rehling de74fc0861 begin adding tests for skills. 2018-01-17 18:04:04 +01:00
Enno Rehling e0a5ba60b4 enhance foolpotion test. 2018-01-17 17:37:37 +01:00
Enno Rehling 66ffca3ac4 move xmlreader.c up a directory. 2018-01-15 18:11:43 +01:00