Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
server/src
History
Enno Rehling 73e1632dee Merge branch 'bug-2059-force-leave' of github.com:badgerman/eressea into bug-2059-force-leave 
Conflicts:
	src/laws.c
	src/laws.test.c
2015-01-13 07:48:46 +01:00
..
attributes try to allow visual studio to build with all warnings (/WAll) enabled. 2015-01-12 22:53:21 +01:00
items shipspeed should be in ship.c, not in config.c 2014-12-25 18:16:24 +01:00
kernel try to allow visual studio to build with all warnings (/WAll) enabled. 2015-01-12 22:53:21 +01:00
modules avoid fix_demand hitting an endless loop, kill bad use of static variables. 2014-12-31 20:01:01 +01:00
races config cleanup contd. 2014-12-25 18:40:46 +01:00
spells corrected good dreams message 2015-01-12 18:22:00 +01:00
tools
triggers remove even more obsolete datafile version support. 2014-12-12 23:00:30 +01:00
util try to allow visual studio to build with all warnings (/WAll) enabled. 2015-01-12 22:53:21 +01:00
alchemy.c cleanup, fix a TODO, eliminate dead code. 2014-12-10 09:39:11 +01:00
alchemy.h fix gcc build, forward-declare structs in the header. 2014-11-01 13:10:22 +01:00
battle.c Erstmal nur der Burgenbonus 2015-01-09 15:53:14 +01:00
battle.h make tests more valgrind-friendly by not leaking memory 2014-12-12 11:32:12 +01:00
battle.test.c fix the castle bonus PR so it can pass gcc. 2015-01-12 20:23:25 +01:00
bind_building.c cleanup, fix a TODO, eliminate dead code. 2014-12-10 09:39:11 +01:00
bind_building.h
bind_config.c call init_locales after parse_json from Lua, downgrade missing string warnings during that to DEBUG (because it's quite common not to have them). 2015-01-08 20:55:29 +01:00
bind_config.h read keywords from json configuration, use German imperative forms. 2014-10-29 19:40:09 +01:00
bind_eressea.c I broke the Lua tests, must initialize resources in eressea.free_game binding 2014-12-31 00:20:19 +01:00
bind_eressea.h
bind_faction.c always nice to eliminate a few TODO's and kill some bitrot. 2014-12-09 23:27:05 +01:00
bind_faction.h
bind_gmtool.c move magic out of kernel, into src. 2014-11-01 12:57:01 +01:00
bind_gmtool.h
bind_hashtable.c
bind_hashtable.h
bind_locale.c
bind_locale.h
bind_log.c
bind_log.h
bind_message.c
bind_message.h
bind_monsters.c refactoring: move all monster-related code into monster.c 2014-11-11 16:53:56 +01:00
bind_process.c move magic out of kernel, into src. 2014-11-01 12:57:01 +01:00
bind_process.h
bind_region.c do not try setting luxury demand on oceans. 2015-01-01 10:12:03 +01:00
bind_region.h
bind_settings.c move magic out of kernel, into src. 2014-11-01 12:57:01 +01:00
bind_settings.h
bind_ship.c always nice to eliminate a few TODO's and kill some bitrot. 2014-12-09 23:27:05 +01:00
bind_ship.h
bind_sqlite.c
bind_storage.c update to latest version of storage library. 2014-11-03 22:29:04 +01:00
bind_storage.h
bind_tolua.c try to allow visual studio to build with all warnings (/WAll) enabled. 2015-01-12 22:53:21 +01:00
bind_tolua.h
bind_unit.c move magic out of kernel, into src. 2014-11-01 12:57:01 +01:00
bind_unit.h
bindings.c call init_locales after parse_json from Lua, downgrade missing string warnings during that to DEBUG (because it's quite common not to have them). 2015-01-08 20:55:29 +01:00
bindings.h
building_action.c remove even more obsolete datafile version support. 2014-12-12 23:00:30 +01:00
buildno.h Merge branch 'version-3-3' 2015-01-11 01:25:10 +01:00
callback.c try to allow visual studio to build with all warnings (/WAll) enabled. 2015-01-12 22:53:21 +01:00
callback.h
callback.test.c
chaos.c config cleanup contd. 2014-12-25 18:40:46 +01:00
chaos.h fix the loading of chaoscount attributes that I broke in the refactoring. 2014-12-13 17:31:55 +01:00
CMakeLists.txt separate the game into a static library shared by server and tests. 2015-01-10 17:27:18 +01:00
config.pkg read keywords from json configuration, use German imperative forms. 2014-10-29 19:40:09 +01:00
config.pkg.c read keywords from json configuration, use German imperative forms. 2014-10-29 19:40:09 +01:00
console.c
console.h
creport.c call init_locales after parse_json from Lua, downgrade missing string warnings during that to DEBUG (because it's quite common not to have them). 2015-01-08 20:55:29 +01:00
creport.h
direction.c call init_locales after parse_json from Lua, downgrade missing string warnings during that to DEBUG (because it's quite common not to have them). 2015-01-08 20:55:29 +01:00
direction.h
direction.test.c move magic out of kernel, into src. 2014-11-01 12:57:01 +01:00
economy.c BREED/PLANT/GROW are technically the same command, merge them. 2015-01-04 15:11:49 +01:00
economy.h fix struct declarations. 2014-11-03 17:32:55 +01:00
economy.test.c refactor tests for giving, add test for GIVE HERBS. 2014-11-03 08:33:07 +01:00
eressea.c Implement tests for magicpath. They are failing (Bug 2066). 2015-01-12 08:18:41 +01:00
eressea.h
eressea.pkg
eressea.pkg.c
game.pkg
game.pkg.c
give.c rename to gettoken, use more widely, add a basic test. 2014-12-22 16:28:17 +01:00
give.h refactor: eliminate the getunitpeasants global variable. 2014-12-12 20:53:39 +01:00
give.test.c add a utility function to test for message types. 2015-01-12 17:50:10 +01:00
gmtool.c remove the obsolete dungeons module. 2014-12-13 00:03:24 +01:00
gmtool.h fix gcc build, forward-declare structs in the header. 2014-11-01 13:10:22 +01:00
gmtool_structs.h
helpers.c Beim Aufräumen was vergessen. 2015-01-09 16:00:11 +01:00
helpers.h
items.c rename to gettoken, use more widely, add a basic test. 2014-12-22 16:28:17 +01:00
items.h
json.c move magic out of kernel, into src. 2014-11-01 12:57:01 +01:00
json.h
json.test.c properly free items at cleanup. 2014-12-30 23:49:50 +01:00
keyword.c BREED/PLANT/GROW are technically the same command, merge them. 2015-01-04 15:11:49 +01:00
keyword.h BREED/PLANT/GROW are technically the same command, merge them. 2015-01-04 15:11:49 +01:00
keyword.test.c make tests more valgrind-friendly by not leaking memory 2014-12-12 11:32:12 +01:00
laws.c Merge branch 'bug-2059-force-leave' of github.com:badgerman/eressea into bug-2059-force-leave 2015-01-13 07:48:46 +01:00
laws.h Bug 2059: building owners kick out anyone they don't HELP GUARD. 2015-01-13 07:32:23 +01:00
laws.test.c add a message to the unit that gets kicked, with tests 2015-01-13 07:43:30 +01:00
lighthouse.c call init_locales after parse_json from Lua, downgrade missing string warnings during that to DEBUG (because it's quite common not to have them). 2015-01-08 20:55:29 +01:00
lighthouse.h gcc/clang want structs to be defined before used in an argument list 2014-12-17 18:47:01 +01:00
listbox.c
listbox.h
locale.pkg
locale.pkg.c
log.pkg
log.pkg.c
magic.c free spellbooks correctly. 2014-12-31 01:38:49 +01:00
magic.h move magic out of kernel, into src. 2014-11-01 12:57:01 +01:00
magic.test.c all good tests cleanup after themselves. 2014-12-31 01:40:46 +01:00
main.c Implement tests for magicpath. They are failing (Bug 2066). 2015-01-12 08:18:41 +01:00
market.c
market.h
market.test.c fixed memory leaks in tests, thanks to valgrind 2014-12-30 23:34:24 +01:00
monster.c added a function that sets a monster's name to NULL if it is the name of its race. 2014-12-09 07:20:36 +01:00
monster.h added a function that sets a monster's name to NULL if it is the name of its race. 2014-12-09 07:20:36 +01:00
monsters.c config cleanup contd. 2014-12-25 18:40:46 +01:00
morale.c Refactoring morale into a separate module. 2014-12-10 19:04:02 +01:00
morale.h Refactoring morale into a separate module. 2014-12-10 19:04:02 +01:00
move.c shipspeed should be in ship.c, not in config.c 2014-12-25 18:16:24 +01:00
move.h shipspeed should be in ship.c, not in config.c 2014-12-25 18:16:24 +01:00
move.test.c more casual leak removal. 2014-12-31 01:00:10 +01:00
names.c Some additional TODO comments for things I want to tackle eventually. #comment-only 2015-01-10 17:05:10 +01:00
names.h
platform.h try to allow visual studio to build with all warnings (/WAll) enabled. 2015-01-12 22:53:21 +01:00
process.pkg
process.pkg.c
randenc.c refactoring: moving plagues out of config.c 2014-12-16 14:18:29 +01:00
randenc.h refactoring: moving plagues out of config.c 2014-12-16 14:18:29 +01:00
report.c Some additional TODO comments for things I want to tackle eventually. #comment-only 2015-01-10 17:05:10 +01:00
report.h
reports.c call init_locales after parse_json from Lua, downgrade missing string warnings during that to DEBUG (because it's quite common not to have them). 2015-01-08 20:55:29 +01:00
reports.h remove strlist from config.c, move it to reports.c (where it is used primarily). 2014-12-17 17:40:36 +01:00
reports.test.c try to allow visual studio to build with all warnings (/WAll) enabled. 2015-01-12 22:53:21 +01:00
settings.h Merge pull request #67 from badgerman/version-cleanup 2014-12-13 13:26:23 +01:00
settings.pkg
settings.pkg.c
skill.c call init_locales after parse_json from Lua, downgrade missing string warnings during that to DEBUG (because it's quite common not to have them). 2015-01-08 20:55:29 +01:00
skill.h
skill.test.c move magic out of kernel, into src. 2014-11-01 12:57:01 +01:00
spells.c remove dead code, move weight(unit) to unit.c 2014-12-25 19:40:40 +01:00
spells.h
spy.c fix running game-specific tests for E3, add them to the test suite. 2014-12-31 21:07:42 +01:00
spy.h
sqlite.c
stdafx.h
study.c additional tests for the parser. 2014-12-22 16:45:56 +01:00
study.h
summary.c added a function that sets a monster's name to NULL if it is the name of its race. 2014-12-09 07:20:36 +01:00
summary.h
test_eressea.c Implement tests for magicpath. They are failing (Bug 2066). 2015-01-12 08:18:41 +01:00
tests.c add a message to the unit that gets kicked, with tests 2015-01-13 07:43:30 +01:00
tests.h add a message to the unit that gets kicked, with tests 2015-01-13 07:43:30 +01:00
tests.test.c do not initialize resources in test_cleanup, that makes no sense. 2014-12-31 00:16:24 +01:00
upkeep.c refactoring: move all monster-related code into monster.c 2014-11-11 16:53:56 +01:00
upkeep.h
upkeep.test.c
vortex.c try to allow visual studio to build with all warnings (/WAll) enabled. 2015-01-12 22:53:21 +01:00
vortex.h
vortex.test.c make tests more valgrind-friendly by not leaking memory 2014-12-12 11:32:12 +01:00
wormhole.c Update wormholes to the module naming convention. 2014-12-13 16:43:35 +01:00
wormhole.h Update wormholes to the module naming convention. 2014-12-13 16:43:35 +01:00
wormhole.test.c
xmlreport.c
xmlreport.h