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

6926 Commits

Author SHA1 Message Date
Enno Rehling d43265f937 a new test for the happy case of a working academy 
dependency injection for learn_skill
memory leak fixes (triggers, armor)
 2016-03-09 23:20:05 +01:00
Enno Rehling eea99e2fd3 add missing new files. 2016-03-09 14:52:50 +01:00
Enno Rehling 02cfacd7f8 refactorings 
- learn_skill from unit.c to study.c
- add academy.c module
 2016-03-09 14:52:50 +01:00
Enno Rehling 3d5c7ba8fb refactoring: move produceexp from unit.c to study.c 2016-03-09 14:50:54 +01:00
Enno Rehling e1f27448bc disable broken test. 
fix test_study_with_teacher (simple optimization was in the wrong place)
 2016-03-09 14:50:04 +01:00
Enno Rehling 13f51ab796 create a test that crashes for bug 2194 2016-03-09 14:50:04 +01:00
Enno Rehling 2b62747718 fix datafile reading problems for versions 350 and 351 2016-03-09 14:50:03 +01:00
Enno Rehling c1786c14ed Merge pull request #493 from ennorehling/tests-without-files 
Remove file operations from most tests
 2016-03-09 14:39:44 +01:00
Enno Rehling 197241df0d fix datafile reading problems for versions 350 and 351 2016-02-29 16:18:14 +01:00
Steffen Mecke e3f27e3571 clean up after your tests, young grashopper 2016-02-28 20:34:37 +01:00
Steffen Mecke 11b8d85167 fixed reversed logic for demon peasant hunger (bug 2187) 
renamed config variable hunger.demons to hunger.demons.peasant_tolerance and reversed reversed logic in upkeep.c
 2016-02-28 16:15:48 +01:00
Steffen Mecke aa3397a24f reduced report directory spam 2016-02-28 16:15:47 +01:00
Enno Rehling fcc846da95 all of the easy external file tests are eliminated 2016-02-26 20:07:51 +01:00
Enno Rehling 5f923295e6 remove datafiles from save.test.c 
this should fix intermittent tests on windows.
 2016-02-26 19:49:58 +01:00
Enno Rehling 63408501b9 convert another test to read_/write_game 2016-02-26 19:01:28 +01:00
Enno Rehling 3c272fd53f fix reading and writing curses from test (crash) 
fix read_game/write_game incomaptibility.
 2016-02-26 17:54:25 +01:00
Enno Rehling ce867af34f this is a static variable, and it is bad 2016-02-25 23:11:44 +01:00
Enno Rehling 81a2dd9d21 extract read_game and write_game (take a gamedata argument, not filenames) 2016-02-25 19:12:38 +01:00
Enno Rehling 5fd4d5f30b Merge pull request #491 from ennorehling/feature/data_version 
eliminate global.data_version
 2016-02-25 16:01:44 +01:00
Enno Rehling e766b78345 Merge branch 'master' into develop 2016-02-25 11:06:15 +01:00
Enno Rehling bb03517619 disable most password formats 2016-02-25 10:46:46 +01:00
Enno Rehling 5fed36903c some drmemory fixes 
some tests leaked.
current test_eressea reports:
     41 unique,    41 total,   3778 byte(s) of leak(s)
    120 unique,   270 total,   5615 byte(s) of possible leak(s)
 2016-02-25 10:16:50 +01:00
Enno Rehling db852a05fd eliminate global.data_version completely 2016-02-24 11:58:05 +01:00
Enno Rehling 98856a8e4b CID 65491 double free 2016-02-24 11:54:24 +01:00
Enno Rehling d48d9a25e0 forward-declare struct gamedata 2016-02-24 11:54:23 +01:00
Enno Rehling 8a9d617aa3 read_referernce takes a gamedata object. 
with all the trimmings that requires,
this is for github issue $479
 2016-02-24 11:53:22 +01:00
Enno Rehling 2e41c4972c read_spellbook, use gamedata.version 
github issue #479
 2016-02-24 11:48:46 +01:00
Enno Rehling 21aee8ece8 remove global.data_version where gamedata.version is available 
github issue #479
 2016-02-24 11:47:46 +01:00
Enno Rehling 2d30d4cce6 trigger_type.read gets a gamedata object 
github issue #479
 2016-02-24 11:46:54 +01:00
Enno Rehling 73a6b96bc7 remove global.data_version from border.read 
remove global.encoding
github issue #479
 2016-02-24 11:44:19 +01:00
Enno Rehling 3e584245c0 attrib.read gets a gamedata object 
stop using global.data_version
for github issue #479
 2016-02-24 11:44:19 +01:00
Enno Rehling 7f6ced99b9 attrib.read gets a gamedata object (remove dependency on global.data_version) 2016-02-24 11:44:18 +01:00
Enno Rehling d1fdd9a89c fix failing storage test 2016-02-24 11:39:27 +01:00
Enno Rehling 45d09622cb missing include errno.h 2016-02-24 11:39:24 +01:00
Enno Rehling 775bbe7ea6 refactor another test to not create files. 2016-02-24 11:39:24 +01:00
Enno Rehling ec3839fb9f rewrite intermittent test to use memory stream. 2016-02-24 11:39:23 +01:00
Enno Rehling 6ca81646eb extract gamedata into a separate file. 2016-02-24 11:38:09 +01:00
Enno Rehling 0197ad16cc Merge branch 'ennorehling-develop' into develop 2016-02-23 11:43:41 +01:00
Enno Rehling c8018dd095 Merge branch 'develop' of https://github.com/ennorehling/eressea into ennorehling-develop 
Conflicts:
	process/epasswd.py
 2016-02-23 11:43:18 +01:00
Enno Rehling e6f3dc8b85 Merge branch 'master' into develop 
Conflicts:
	scripts/run-turn.lua
	src/buildno.h
	src/kernel/group.c
	src/kernel/save.c
	src/kernel/save.test.c
	src/kernel/version.h
	src/util/password.c
	src/util/password.test.c
	tests/run-turn.sh
 2016-02-23 10:47:33 +01:00
Enno Rehling 1bb215dd52 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	src/kernel/save.c
	src/triggers/createunit.c
 2016-02-23 08:35:31 +01:00
Enno Rehling d6a8d12dbb Merge pull request #489 from ennorehling/hotfix/fix-faction-references 
fix writing faction references
 2016-02-23 07:30:26 +01:00
Enno Rehling 7807e9e710 fix integration test data file 2016-02-22 21:35:37 +01:00
Enno Rehling 1e4b860a2e some trivial assertions 2016-02-22 20:48:24 +01:00
Enno Rehling 77ed6f3722 add missing file 2016-02-22 20:48:24 +01:00
Enno Rehling be99c02a82 fix valgrind report 2016-02-22 20:48:24 +01:00
Enno Rehling 370338736c gcc is picky, fix gcc warnings 2016-02-22 20:47:06 +01:00
Enno Rehling 4f7e1cb80f integration test update. 
- have a faction that quits,
- try to reload the datafile we just wrote.
 2016-02-22 20:47:06 +01:00
Enno Rehling c823a3b036 handle regions that have no owner 2016-02-22 20:47:06 +01:00
Enno Rehling 7fe07439f5 fix write_faction_reference, check for f->alive in other places 
TODO:
1. I added some new TODOs
2. What happens to morale when region owners die?
3. Needs tests
 2016-02-22 20:47:06 +01:00