Marc
/
server
forked from github/server
1
0
Fork 0
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 removing the core directory (moving to res and scripts). 2014-07-28 14:27:30 +02:00
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
CMakeLists.txt separate the game into a static library shared by server and tests. 2015-01-10 17:27:18 +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 move bindings into src/ make the code compile from scratch again. 2014-02-22 00:32:59 -08:00
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 remove obsolete commands (PRAY) and parameters 2014-06-21 07:34:36 -07:00
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 move bindings into src/ make the code compile from scratch again. 2014-02-22 00:32:59 -08:00
bind_gmtool.c move magic out of kernel, into src. 2014-11-01 12:57:01 +01:00
bind_gmtool.h move bindings into src/ make the code compile from scratch again. 2014-02-22 00:32:59 -08:00
bind_hashtable.c use cmake for autoconf, slim down platform.h 2014-03-15 19:29:11 +01:00
bind_hashtable.h move bindings into src/ make the code compile from scratch again. 2014-02-22 00:32:59 -08:00
bind_locale.c directions can now be read from json configuration. 2014-06-15 22:17:08 -07:00
bind_locale.h begin binding locales (need to init_locales in the right place, still). 2014-06-14 07:52:32 -07:00
bind_log.c bindings for error logging, phase 1. 2014-06-13 13:02:03 -07:00
bind_log.h bindings for error logging, phase 1. 2014-06-13 13:02:03 -07:00
bind_message.c refactoring: special directions into their own file (vortex.c). 2014-08-27 21:30:24 +02:00
bind_message.h move bindings into src/ make the code compile from scratch again. 2014-02-22 00:32:59 -08:00
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 move bindings into src/ make the code compile from scratch again. 2014-02-22 00:32:59 -08:00
bind_region.c do not try setting luxury demand on oceans. 2015-01-01 10:12:03 +01:00
bind_region.h move bindings into src/ make the code compile from scratch again. 2014-02-22 00:32:59 -08:00
bind_settings.c move magic out of kernel, into src. 2014-11-01 12:57:01 +01:00
bind_settings.h clean up indentation. 2014-06-12 17:38:45 -07:00
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 move bindings into src/ make the code compile from scratch again. 2014-02-22 00:32:59 -08:00
bind_sqlite.c save game id in the data file, not name of XML file 2014-07-23 11:54:51 +02:00
bind_storage.c update to latest version of storage library. 2014-11-03 22:29:04 +01:00
bind_storage.h move bindings into src/ make the code compile from scratch again. 2014-02-22 00:32:59 -08:00
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 MSVC: disable level 4 warning C4100 for tolua-generated code (unused variable) 2014-08-14 19:39:17 +02:00
bind_unit.c move magic out of kernel, into src. 2014-11-01 12:57:01 +01:00
bind_unit.h move bindings into src/ make the code compile from scratch again. 2014-02-22 00:32:59 -08:00
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 remove -Cef, parse any arguments as a file to run. 2014-04-24 14:41:04 +02:00
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 resolve naming conflict on windows. 2014-07-03 12:20:50 -07:00
callback.test.c resolve naming conflict on windows. 2014-07-03 12:20:50 -07:00
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
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 remove old SQL patch code, we have sqlite now. 2014-06-11 22:21:52 -07:00
console.h remove old SQL patch code, we have sqlite now. 2014-06-11 22:21:52 -07:00
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 I am killing the core/ directory. 2014-02-18 05:45:00 +01:00
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 fix astral space special direction, vortex (translation issue). 2014-09-29 21:19:07 +02:00
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 I am killing the core/ directory. 2014-02-18 05:45:00 +01:00
eressea.pkg MSVC: disable level 4 warning C4100 for tolua-generated code (unused variable) 2014-08-14 19:39:17 +02:00
eressea.pkg.c MSVC: disable level 4 warning C4100 for tolua-generated code (unused variable) 2014-08-14 19:39:17 +02:00
game.pkg MSVC: disable level 4 warning C4100 for tolua-generated code (unused variable) 2014-08-14 19:39:17 +02:00
game.pkg.c MSVC: disable level 4 warning C4100 for tolua-generated code (unused variable) 2014-08-14 19:39:17 +02:00
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 I am killing the core/ directory. 2014-02-18 05:45:00 +01:00
helpers.c Beim Aufräumen was vergessen. 2015-01-09 16:00:11 +01:00
helpers.h move bindings into src/ make the code compile from scratch again. 2014-02-22 00:32:59 -08:00
items.c rename to gettoken, use more widely, add a basic test. 2014-12-22 16:28:17 +01:00
items.h I am killing the core/ directory. 2014-02-18 05:45:00 +01:00
json.c move magic out of kernel, into src. 2014-11-01 12:57:01 +01:00
json.h remove obsolete commands (PRAY) and parameters 2014-06-21 07:34:36 -07:00
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 update cmake to compile without sqlite3, curses or libxml2 installed. 2014-06-11 20:30:34 -07:00
listbox.h update cmake to compile without sqlite3, curses or libxml2 installed. 2014-06-11 20:30:34 -07:00
locale.pkg MSVC: disable level 4 warning C4100 for tolua-generated code (unused variable) 2014-08-14 19:39:17 +02:00
locale.pkg.c MSVC: disable level 4 warning C4100 for tolua-generated code (unused variable) 2014-08-14 19:39:17 +02:00
log.pkg MSVC: disable level 4 warning C4100 for tolua-generated code (unused variable) 2014-08-14 19:39:17 +02:00
log.pkg.c MSVC: disable level 4 warning C4100 for tolua-generated code (unused variable) 2014-08-14 19:39:17 +02:00
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 remove static variables optimizations, they create global state that is bad for testing 2014-06-17 23:10:55 -07:00
market.h I am killing the core/ directory. 2014-02-18 05:45:00 +01:00
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 reorganized directory structure. 2014-08-27 06:40:35 +02:00
platform.h try to allow visual studio to build with all warnings (/WAll) enabled. 2015-01-12 22:53:21 +01:00
process.pkg MSVC: disable level 4 warning C4100 for tolua-generated code (unused variable) 2014-08-14 19:39:17 +02:00
process.pkg.c MSVC: disable level 4 warning C4100 for tolua-generated code (unused variable) 2014-08-14 19:39:17 +02:00
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 save game id in the data file, not name of XML file 2014-07-23 11:54:51 +02:00
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 MSVC: disable level 4 warning C4100 for tolua-generated code (unused variable) 2014-08-14 19:39:17 +02:00
settings.pkg.c MSVC: disable level 4 warning C4100 for tolua-generated code (unused variable) 2014-08-14 19:39:17 +02:00
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 move skill_t into a separate file, give it unit tests. 2014-06-20 23:59:04 -07:00
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 refactoring: special directions into their own file (vortex.c). 2014-08-27 21:30:24 +02:00
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 I am killing the core/ directory. 2014-02-18 05:45:00 +01:00
sqlite.c make race::_name a string, not an array of strings. add a test for rc_name. 2014-08-24 23:58:29 +02:00
stdafx.h I am killing the core/ directory. 2014-02-18 05:45:00 +01:00
study.c additional tests for the parser. 2014-12-22 16:45:56 +01:00
study.h move skill_t into a separate file, give it unit tests. 2014-06-20 23:59:04 -07:00
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 reorganized directory structure. 2014-08-27 06:40:35 +02:00
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 cleaning out config.c, there is too much code in there. 2014-08-31 16:50:37 +02:00
upkeep.test.c cleaning out config.c, there is too much code in there. 2014-08-31 16:50:37 +02:00
vortex.c try to allow visual studio to build with all warnings (/WAll) enabled. 2015-01-12 22:53:21 +01:00
vortex.h fix compilation warning on gcc. 2014-09-29 21:22:44 +02:00
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 refactoring and tests for wormhole module. 2014-09-29 23:19:59 +02:00
xmlreport.c reorganized directory structure. 2014-08-27 06:40:35 +02:00
xmlreport.h I am killing the core/ directory. 2014-02-18 05:45:00 +01:00