Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
server/src/kernel
History
Enno Rehling 89bc83c4ab Merge branch 'master' into develop 
Conflicts:
	src/bind_region.c
	src/buildno.h
	src/kernel/item.c
 		2015-08-20 16:58:07 +02:00
..
CMakeLists.txt refining spy tests 2015-05-04 14:30:59 +02:00
alliance.c fix indentation in every file 2015-01-30 20:37:14 +01:00
alliance.h fix copyright notice 2015-01-30 22:10:29 +01:00
alliance.test.c remove a faction from its alliance when it is dead. 2015-06-21 17:49:22 +02:00
ally.c fix gcc build, ebable new test. 2014-10-31 16:51:57 +01:00
ally.h fix copyright notice 2015-01-30 22:10:29 +01:00
ally.test.c fix gcc build, ebable new test. 2014-10-31 16:51:57 +01:00
build.c repair update_long_order and K_DESTROY handling according to discussion in https://bugs.eressea.de/view.php?id=2080 2015-08-04 22:47:55 +02:00
build.h fix copyright notice 2015-01-30 22:10:29 +01:00
build.test.c fix build_building tests, require an order argument. 2015-05-21 11:52:31 +02:00
building.c building type construction is in bt_get_or_create, and only there. 2015-02-02 19:52:24 +01:00
building.h fix copyright notice 2015-01-30 22:10:29 +01:00
building.test.c constructor st_get_or_create sets ship_type to default values 2015-02-03 17:10:29 +01:00
calendar.c fix indentation in every file 2015-01-30 20:37:14 +01:00
calendar.h fix indentation in every file 2015-01-30 20:37:14 +01:00
command.c fix indentation in every file 2015-01-30 20:37:14 +01:00
command.h fix indentation in every file 2015-01-30 20:37:14 +01:00
config.c suspect some submodule shenanigans 2015-08-20 16:26:32 +02:00
config.h backfill missing tests for ally_cmd 2015-08-05 12:19:17 +02:00
config.test.c fix indentation in every file 2015-01-30 20:37:14 +01:00
connection.c fix copyright notice 2015-01-30 22:10:29 +01:00
connection.h fix copyright notice 2015-01-30 22:10:29 +01:00
curse.c magicians can always identify their own curse-effects. 2015-08-07 15:52:10 +02:00
curse.h magicians can always identify their own curse-effects. 2015-08-07 15:52:10 +02:00
curse.test.c fix memstream-based tests, new storage submodule. 2015-05-31 11:03:44 +02:00
equipment.c enable stricter conversion checking for gcc < 4.9, fix code 2015-05-15 20:35:36 +02:00
equipment.h fix copyright notice 2015-01-30 22:10:29 +01:00
equipment.test.c fix indentation in every file 2015-01-30 20:37:14 +01:00
faction.c do not remove battles from dead faction before writing the report. 2015-08-16 12:06:05 +02:00
faction.h rename set_origin/get_origin into faction.c, remove argument from adjust_coordinates. add test for bug 2070. 2015-05-19 08:27:16 +02:00
faction.test.c Merge branch 'master' into develop 2015-06-21 18:32:10 +02:00
group.c fix copyright notice 2015-01-30 22:10:29 +01:00
group.h fix copyright notice 2015-01-30 22:10:29 +01:00
group.test.c clean up data files after tests are finished. 2014-11-04 08:06:46 +01:00
item.c Merge branch 'master' into develop 2015-08-20 16:58:07 +02:00
item.h fix copyright notice 2015-01-30 22:10:29 +01:00
item.test.c Merge branch 'master' of github.com:eressea/server 2015-01-30 20:44:42 +01:00
jsonconf.c enhanced ship speed for selected ships (currently none). 2015-08-07 12:51:20 +02:00
jsonconf.h fix indentation in every file 2015-01-30 20:37:14 +01:00
jsonconf.test.c enhanced ship speed for selected ships (currently none). 2015-08-07 12:51:20 +02:00
messages.c Merge region messages and individual messages before writing them into the report. 2015-08-16 11:30:44 +02:00
messages.h Merge region messages and individual messages before writing them into the report. 2015-08-16 11:30:44 +02:00
messages.test.c refactoring: rewrite tests to use test_find_messagetype instead of assert_messages. 2015-08-17 19:36:28 +02:00
objtypes.h fix copyright notice 2015-01-30 22:10:29 +01:00
order.c Merge pull request #7 from ennorehling/feature/bug-2101-study-teach-testing 2015-08-06 17:05:32 +02:00
order.h repair update_long_order and K_DESTROY handling according to discussion in https://bugs.eressea.de/view.php?id=2080 2015-08-04 22:47:55 +02:00
order.test.c fix build_building tests, require an order argument. 2015-05-21 11:52:31 +02:00
pathfinder.c fix copyright notice 2015-01-30 22:10:29 +01:00
pathfinder.h fix copyright notice 2015-01-30 22:10:29 +01:00
plane.c merge feature/test-cleanup 2015-07-01 21:24:44 +02:00
plane.h rename set_origin/get_origin into faction.c, remove argument from adjust_coordinates. add test for bug 2070. 2015-05-19 08:27:16 +02:00
pool.c Bug 2115: fix cerrdor -> cerddor spelling errors. 2015-07-07 20:30:34 +02:00
pool.h fix copyright notice 2015-01-30 22:10:29 +01:00
pool.test.c fix escape_string mmeory corruption error. 2014-12-12 11:28:37 +01:00
race.c bug 2069: not all E3 magic schools have a familiar. 2015-07-02 09:49:51 +02:00
race.h Merge branch 'develop' into feature/bug-1588-magicpower-limit 2015-08-06 19:16:05 +02:00
race.test.c set defaults in the race constructor, add test. 2015-01-15 17:17:58 +01:00
region.c move travelthru logic to a separate module. todo: split off the report writing from the collection of units. 2015-08-18 18:57:04 +02:00
region.h move travelthru logic to a separate module. todo: split off the report writing from the collection of units. 2015-08-18 18:57:04 +02:00
render.h fix copyright notice 2015-01-30 22:10:29 +01:00
resources.c fix indentation in every file 2015-01-30 20:37:14 +01:00
resources.h fix indentation in every file 2015-01-30 20:37:14 +01:00
save.c fix segfault, disable intermittent test 2015-08-20 16:18:15 +02:00
save.h press F3 to save game in editor. 2015-05-12 17:18:51 -07:00
save.test.c press F3 to save game in editor. 2015-05-12 17:18:51 -07:00
ship.c test bonus for new ship-speed rules (WIP). 2015-08-07 13:03:19 +02:00
ship.h get_captain is wrong, the rules say the captain is the FIRST unit in the ship, which I believe means ship_owner, not best skill. 2015-08-07 13:07:45 +02:00
ship.test.c eliminate warning (unused variable) 2015-08-16 19:55:11 +02:00
skills.c Add a message that contains the password in the first report, so Magellan can pick it up. 2015-08-15 20:25:36 +02:00
skills.h fix -Wconversion in reports.c, json.c 2015-05-15 11:19:26 +02:00
spell.c Bug 2115: fix cerrdor -> cerddor spelling errors. 2015-07-07 20:30:34 +02:00
spell.h fix copyright notice 2015-01-30 22:10:29 +01:00
spell.test.c fix indentation in every file 2015-01-30 20:37:14 +01:00
spellbook.c fix indentation in every file 2015-01-30 20:37:14 +01:00
spellbook.h fix copyright notice 2015-01-30 22:10:29 +01:00
spellbook.test.c fix indentation in every file 2015-01-30 20:37:14 +01:00
teleport.c fix copyright notice 2015-01-30 22:10:29 +01:00
teleport.h fix copyright notice 2015-01-30 22:10:29 +01:00
terrain.c resize buffer in eval_command, it was too small for many commands. 2015-08-06 16:52:24 +02:00
terrain.h fix copyright notice 2015-01-30 22:10:29 +01:00
terrainid.h Implement an optional JSON report writer. Currently writes readable maps for Tiled. 2015-03-29 14:03:56 +02:00
types.h Implement an optional JSON report writer. Currently writes readable maps for Tiled. 2015-03-29 14:03:56 +02:00
unit.c refactoring ship speed, extract total skills of sailors into a function. 2015-08-07 12:43:18 +02:00
unit.h fix missing units from CR, add a test, partially convert from FILE* to stream 2015-08-05 14:45:46 +02:00
unit.test.c test good/bad dreams 2015-05-06 18:15:10 +02:00
version.h save the faction.max_spelllevel in the data file, do not recalculate it each time. 2015-08-19 19:43:47 +02:00
xmlreader.c enhanced ship speed for selected ships (currently none). 2015-08-07 12:51:20 +02:00
xmlreader.h fix indentation in every file 2015-01-30 20:37:14 +01:00