Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
server/src/kernel
History
Enno Rehling 1d57bf527d Merge branch 'master' into develop 
Conflicts:
	src/battle.test.c
	src/buildno.h
 		2015-12-05 17:27:04 +01:00
..
CMakeLists.txt fix anything that uses the calendar module. opps. 2015-09-12 12:54:49 +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 2015-11-24 19:15:53 +01:00
ally.h fix gcc build 2015-11-24 19:15:53 +01:00
ally.test.c
…
build.c refactoring: move parsing and allies code out of config.c 2015-11-24 18:52:09 +01:00
build.h free multi-level construction correctly, avoid duplication 2015-10-13 22:56:16 +02:00
build.test.c eliminate use of test_create_world 2015-11-07 23:49:45 +01:00
building.c Merge branch 'market_tests' of https://github.com/stm2/server into stm2-market_tests 2015-11-26 18:42:23 +01:00
building.h refactored inside_building/building_is_active/active_building 2015-11-16 02:13:48 +01:00
building.test.c Merge branch 'market_tests' of https://github.com/stm2/server into stm2-market_tests 2015-11-26 18:42:23 +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 cleanup of config.c: move more code to other modules like unit.c and faction.c 2015-11-24 19:53:27 +01:00
config.h cleanup of config.c: move more code to other modules like unit.c and faction.c 2015-11-24 19:53:27 +01:00
config.test.c faster lookup for get_param with tries 2015-11-20 15:48:17 +01:00
connection.c CID 30742 Dereference before null check 2015-11-05 10:59:14 +01:00
connection.h fix copyright notice 2015-01-30 22:10:29 +01:00
curse.c always use a macro, not magical constants 2015-10-15 08:40:52 +02:00
curse.h minor leak: release memory held by curse_type structures 2015-10-15 08:38:43 +02:00
curse.test.c leak: do not create new message_type objects in test_cleanup 2015-10-15 08:29:20 +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 cleanup of config.c: move more code to other modules like unit.c and faction.c 2015-11-24 19:53:27 +01:00
faction.h cleanup of config.c: move more code to other modules like unit.c and faction.c 2015-11-24 19:53:27 +01: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 CID 22522, 22520 Resource leak 2015-11-09 20:05:55 +01:00
item.h memory leak: free weapon data 2015-10-13 22:27:43 +02:00
item.test.c clean up item tests so they don't use test_create_world 2015-11-07 13:52:18 +01:00
jsonconf.c Merge branch 'release-3.7' into develop 2015-11-23 17:12:48 +01:00
jsonconf.h fix indentation in every file 2015-01-30 20:37:14 +01:00
jsonconf.test.c replace all get_param_* for global.parameters with config_get_* 2015-11-22 10:44:46 +01:00
messages.c leak: do not create new message_type objects in test_cleanup 2015-10-15 08:29:20 +02:00
messages.h refactor free_messagelist, fix leak in test_merge_split 2015-10-14 14:08:50 +02:00
messages.test.c correctly release messages created in test_merge_split 2015-10-14 20:21:38 +02:00
objtypes.h fix copyright notice 2015-01-30 22:10:29 +01:00
order.c fixed a crash 2015-10-14 22:06:40 +02:00
order.h leak: free per-locale cached order data (has additional refcount) 2015-10-13 23:25:44 +02:00
order.test.c call free_order for each remaining reference 2015-10-14 20:56:09 +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 refactoring: move parsing and allies code out of config.c 2015-11-24 18:52:09 +01:00
pool.h fix copyright notice 2015-01-30 22:10:29 +01:00
pool.test.c leaks: call cleanup, free triggers 2015-10-14 20:29:07 +02:00
race.c Merge branch 'master' into develop 2015-12-05 17:27:04 +01:00
race.h Merge branch 'master' into develop 2015-12-05 17:27:04 +01:00
race.test.c https://bugs.eressea.de/view.php?id=2166 2015-12-05 17:17:21 +01:00
region.c fix morale change when region owner changes 2015-11-12 16:09:26 +01:00
region.h Merge branch 'bug_2139' of https://github.com/stm2/server into stm2-bug_2139 2015-12-03 11:06:55 +01:00
render.h fix copyright notice 2015-01-30 22:10:29 +01:00
resources.c kill static caches for floating-point variables 2015-11-22 17:32:35 +01:00
resources.h fix indentation in every file 2015-01-30 20:37:14 +01:00
save.c Merge branch 'bug_2139' of https://github.com/stm2/server into stm2-bug_2139 2015-12-03 11:06:55 +01:00
save.h CID 22437 Unchecked return value from library 2015-11-04 11:45:13 +01:00
save.test.c unusual potion delay attribute can use a potion in another region? unclear what this code does, but fixing my bad assumption. 2015-11-22 14:36:05 +01:00
ship.c Merge branch 'massive_overload' of https://github.com/stm2/server into stm2-massive_overload 2015-11-27 12:40:17 +01:00
ship.h reduce maximum overload damage to 38% 2015-11-17 15:47:43 +01:00
ship.test.c introducing config_set and config_get so we don't have to refer to globals.parameters everywhere 2015-11-22 10:33:31 +01:00
skills.c replace all get_param_* for global.parameters with config_get_* 2015-11-22 10:44:46 +01:00
skills.h fix -Wconversion in reports.c, json.c 2015-05-15 11:19:26 +02:00
spell.c fix cb_insert comparison (new return value for success) 2015-11-05 13:01:48 +01:00
spell.h memory leak: free spell components and spells at exit 2015-10-13 22:02:58 +02:00
spell.test.c prepared test for nr_spell 2015-11-13 00:57: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 replace all get_param_* for global.parameters with config_get_* 2015-11-22 10:44:46 +01:00
teleport.h fix copyright notice 2015-01-30 22:10:29 +01:00
terrain.c do not leak terrain.herbs 2015-10-14 21:37:27 +02:00
terrain.h visual studio compilation fix 2015-10-14 22:09:11 +02: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 Merge branch 'monster_leftovers' of https://github.com/stm2/server into stm2-monster_leftovers 2015-11-25 14:25:42 +01:00
unit.h cleanup of config.c: move more code to other modules like unit.c and faction.c 2015-11-24 19:53:27 +01:00
unit.test.c cleanup of config.c: move more code to other modules like unit.c and faction.c 2015-11-24 19:53:27 +01:00
version.h fix morale change when region owner changes 2015-11-12 16:09:26 +01:00
xmlreader.c Merge branch 'master' into develop 2015-12-05 17:27:04 +01:00
xmlreader.h fix indentation in every file 2015-01-30 20:37:14 +01:00