server/src
Enno Rehling 091a8de6b6 Merge branch 'master' into develop
Conflicts:
	src/kernel/race.c
	src/spy.c
2017-04-22 18:38:34 +02:00
..
attributes WIP: reimplemented production modifiers. 2017-04-02 14:43:53 +02:00
items Test E2 items in E2 only. 2017-02-27 18:50:48 +01:00
kernel demon stealth: cloak as other race. 2017-04-22 18:33:47 +02:00
modules make region:set_resource do the right thing 2017-03-26 14:33:14 +02:00
races remove race.age from XML data (set in rc_create) 2017-02-20 21:19:58 +01:00
spells strip skillmod down to the essentials. 2017-04-02 20:17:39 +02:00
tools
triggers Be very strict about C standards. 2017-02-18 21:15:14 +01:00
util fix farsi names containing nzwj symbol. 2017-04-10 17:32:32 +02:00
CMakeLists.txt unit.has_attrib should not require the attribute to be registered. 2017-03-27 22:07:18 +02:00
academy.c kill autoconf.h, replace platform.h for C99 compatibility work 2017-01-26 18:03:48 +01:00
academy.h just a little bit of refactoring 2016-03-11 21:36:10 +01:00
alchemy.c Be very strict about C standards. 2017-02-18 21:15:14 +01:00
alchemy.h
alchemy.test.c WIP: remove GUARD_* flags. 2016-10-31 07:45:06 +01:00
battle.c Merge branch 'master' into develop 2017-03-11 14:41:25 +01:00
battle.h the LOMEM define has never been used, kill it. 2017-04-01 20:08:04 +02:00
battle.test.c change all magic resistance to use fractions. 2017-02-24 20:47:47 +01:00
bind_building.c remove dict from ships and buildings, too 2017-02-11 22:24:36 +01:00
bind_building.h
bind_config.c add a failing test for familiars (disabled). 2017-02-11 22:28:57 +01:00
bind_config.h
bind_eressea.c initialize game after loading config 2017-02-11 17:38:39 +01:00
bind_eressea.h
bind_faction.c remove attribs from rtype (it's only in rtype->construction that we use it?) 2017-03-17 22:46:10 +01:00
bind_faction.h
bind_gmtool.c kill autoconf.h, replace platform.h for C99 compatibility work 2017-01-26 18:03:48 +01:00
bind_gmtool.h
bind_locale.c add a lua binding to convert user-language strings to directions 2015-12-22 18:38:12 +01:00
bind_locale.h add a lua binding to convert user-language strings to directions 2015-12-22 18:38:12 +01:00
bind_message.c declutter config.h, use it sparingly. 2016-11-17 10:38:09 +01:00
bind_message.h
bind_monsters.c remove old & unused fix_famililar repair code. 2017-01-26 17:57:21 +01:00
bind_order.c declutter config.h, use it sparingly. 2016-11-17 10:38:09 +01:00
bind_order.h add missing files 2015-12-30 21:22:28 +01:00
bind_process.c move renumber command to a separate module. 2016-11-15 23:34:20 +01:00
bind_process.h
bind_region.c make region:set_resource do the right thing 2017-03-26 14:33:14 +02:00
bind_region.h
bind_ship.c better testing for some items. 2017-02-27 20:16:50 +01:00
bind_ship.h
bind_sqlite.c Revert "remove sqlite3 code and dependency" 2017-01-26 18:06:48 +01:00
bind_storage.c Be very strict about C standards. 2017-02-18 21:15:14 +01:00
bind_storage.h
bind_tolua.c Address MS Visual Studio 2015 update 1 breaking changes 2015-12-16 17:01:47 +01:00
bind_tolua.h
bind_unit.c unit.has_attrib should not require the attribute to be registered. 2017-03-27 22:07:18 +02:00
bind_unit.h
bindings.c enable process_orders to be done in steps. 2017-03-26 13:10:23 +02:00
bindings.h remove quicklist shim, use selist everywhere 2017-01-26 18:07:34 +01:00
building_action.c kill autoconf.h, replace platform.h for C99 compatibility work 2017-01-26 18:03:48 +01:00
calendar.c fix off-by-one calendar, bug 2288 2017-03-01 08:28:15 +01:00
calendar.h game.start in eressea.ini overrides calendar 2017-01-26 18:06:15 +01:00
chaos.c merge monster.c and monsters.c 2017-01-26 17:57:21 +01:00
chaos.h
config.pkg
config.pkg.c
console.c
console.h remove autoconf.h from platform.h, fix lots of includes 2016-11-25 20:15:11 +01:00
convert.c converter compiles fine, does nothing 2017-02-26 15:33:32 +01:00
creport.c Merge branch 'master' into develop 2017-03-26 21:01:21 +02:00
creport.h refactor cr_output_resources for easy testing. 2017-03-05 15:26:04 +01:00
creport.test.c BUG 2315: always use plural for resources 2017-03-26 20:32:46 +02:00
direction.c fix memory leak in umlaut.c with reference counting (sad). 2016-09-06 19:57:07 +01:00
direction.h
direction.test.c relocate the addtoken leak "test" to umlaut.test.c 2016-09-05 18:46:02 +02:00
donations.c continued work for MSVC compilation 2017-01-26 18:05:25 +01:00
donations.h refactor donations into a seaprate code module, add a basic test 2015-09-09 15:45:20 +02:00
donations.test.c more stbool.h includes, MSVC has no unlink 2017-01-26 18:05:26 +01:00
economy.c unused variable 2017-04-02 15:50:29 +02:00
economy.h adding simple test for MAKE <ITEM> 2017-02-15 17:09:23 +01:00
economy.test.c WIP: reimplemented production modifiers. 2017-04-02 14:43:53 +02:00
eressea.c remove remainders of the arena. 2017-02-27 18:21:41 +01:00
eressea.h
eressea.pkg
eressea.pkg.c
game.pkg remove autoconf.h from platform.h, fix lots of includes 2016-11-25 20:15:11 +01:00
game.pkg.c remove autoconf.h from platform.h, fix lots of includes 2016-11-25 20:15:11 +01:00
give.c BUG 2311: unit limits were not enforced by GIVE. 2017-03-11 20:03:49 +01:00
give.h more stbool.h includes, MSVC has no unlink 2017-01-26 18:05:26 +01:00
give.test.c BUG 2311: enforce all unit limits. 2017-03-11 20:30:17 +01:00
gmtool.c rename some configuration options. 2017-03-25 14:15:01 +01:00
gmtool.h support different editor codepages 2016-08-07 19:19:35 +02:00
gmtool_structs.h
guard.c bug 2292: allow packice to be guarded again. 2017-03-02 18:08:58 +01:00
guard.h bug 2292: only land regions can be guarded. 2017-03-02 12:39:21 +01:00
guard.test.c bug 2292: allow packice to be guarded again. 2017-03-02 18:08:58 +01:00
helpers.c remove rtype->uget funpointer, and lua callbacks. 2017-03-04 20:59:43 +01:00
helpers.h
inc
items.c prefer dice to dice_rand 2017-03-06 06:28:12 +01:00
items.h
json.c Be very strict about C standards. 2017-02-18 21:15:14 +01:00
json.h
json.test.c Be very strict about C standards. 2017-02-18 21:15:14 +01:00
jsreport.c remove BOM from UTF-8 files, replace Umlauts 2016-11-01 17:25:52 +01:00
jsreport.h
keyword.c Be very strict about C standards. 2017-02-18 21:15:14 +01:00
keyword.h Be very strict about C standards. 2017-02-18 21:15:14 +01:00
keyword.test.c coverity warning: NEGATIVE_RETURNS 2016-11-14 02:21:49 +01:00
laws.c fixing new coverity scan defects 2017-04-16 15:52:34 +02:00
laws.h enable process_orders to be done in steps. 2017-03-26 13:10:23 +02:00
laws.test.c implement fixed wage functions, select by constant value 2017-03-16 16:07:52 +01:00
lighthouse.c kill autoconf.h, replace platform.h for C99 compatibility work 2017-01-26 18:03:48 +01:00
lighthouse.h kill autoconf.h, replace platform.h for C99 compatibility work 2017-01-26 18:03:48 +01:00
lighthouse.test.c re-enable report tests. 2016-09-18 10:24:08 +02:00
listbox.c kill autoconf.h, replace platform.h for C99 compatibility work 2017-01-26 18:03:48 +01:00
listbox.h
locale.pkg add a lua binding to convert user-language strings to directions 2015-12-22 18:38:12 +01:00
locale.pkg.c add a lua binding to convert user-language strings to directions 2015-12-22 18:38:12 +01:00
log.pkg
log.pkg.c
magic.c change all magic resistance to use fractions. 2017-02-24 20:47:47 +01:00
magic.h change all magic resistance to use fractions. 2017-02-24 20:47:47 +01:00
magic.test.c clean up some tests. 2017-03-10 21:29:37 +01:00
main.c make --version exit immediately after (short) version info 2017-03-28 16:01:10 +02:00
market.c eliminate race.parameters. 2017-02-06 09:46:36 +01:00
market.h clean up and test various race.parameters 2017-02-04 23:16:16 +01:00
market.test.c matching test_setup and test_cleanup calls. 2017-03-11 12:57:02 +01:00
monsters.c BUG 2317: wyrms in E2 didn't move 2017-04-17 16:50:15 +02:00
monsters.h more stbool.h includes, MSVC has no unlink 2017-01-26 18:05:26 +01:00
monsters.test.c Be very strict about C standards. 2017-02-18 21:15:14 +01:00
morale.c gcc warning 2017-02-06 10:44:11 +01:00
morale.h
move.c Be very strict about C standards. 2017-02-18 21:15:14 +01:00
move.h kill autoconf.h, replace platform.h for C99 compatibility work 2017-01-26 18:03:48 +01:00
move.test.c reduce "translation not found" warnings in tests. 2017-03-10 21:43:36 +01:00
names.c set age_unit and name_unit funpointers in rc_create. 2017-02-20 22:07:36 +01:00
names.h remove autoconf.h from platform.h, fix lots of includes 2016-11-25 20:15:11 +01:00
names.test.c set age_unit and name_unit funpointers in rc_create. 2017-02-20 22:07:36 +01:00
piracy.c Neuer Befehlespräfix: ! zur Unterdrückung von Fehlern. 2017-03-25 11:18:48 +01:00
piracy.h fix piracy order aliasing issue #549 2016-09-01 20:40:07 +01:00
piracy.test.c Neuer Befehlespräfix: ! zur Unterdrückung von Fehlern. 2017-03-25 11:18:48 +01:00
platform.h fix duplicate _LP64 define 2017-03-26 17:41:53 +02:00
prefix.c kill autoconf.h, replace platform.h for C99 compatibility work 2017-01-26 18:03:48 +01:00
prefix.h Be very strict about C standards. 2017-02-18 21:15:14 +01:00
prefix.test.c static analysis warnings. 2016-11-23 18:56:40 +01:00
process.pkg move renumber command to a separate module. 2016-11-15 23:34:20 +01:00
process.pkg.c move renumber command to a separate module. 2016-11-15 23:34:20 +01:00
randenc.c kill autoconf.h, replace platform.h for C99 compatibility work 2017-01-26 18:03:48 +01:00
randenc.h
renumber.c additional testing for renumber. 2016-11-17 21:08:35 +01:00
renumber.h move renumber command to a separate module. 2016-11-15 23:34:20 +01:00
renumber.test.c more stbool.h includes, MSVC has no unlink 2017-01-26 18:05:26 +01:00
report.c BUG 2310: counting units and people. 2017-03-11 19:36:26 +01:00
report.h Add a good test for the NR. 2017-03-05 16:55:11 +01:00
report.test.c make region:set_resource do the right thing 2017-03-26 14:33:14 +02:00
reports.c make region:set_resource do the right thing 2017-03-26 14:33:14 +02:00
reports.h Merge pull request #672 from ennorehling/lighthouse-speedup 2017-03-11 16:17:37 +01:00
reports.test.c fix some memory leaks 2017-03-30 23:13:55 +02:00
settings.h decluttering settings.h 2017-03-31 21:37:30 +02:00
settings.pkg 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
settings.pkg.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
skill.c CID 22554: Improper use of negative value (REVERSE_NEGATIVE) 2015-10-30 12:40:48 +01:00
skill.h kill autoconf.h, replace platform.h for C99 compatibility work 2017-01-26 18:03:48 +01:00
skill.test.c remove invalid tests. uninitialized locales do not have default words 2015-11-01 05:35:10 +01:00
spells.c do not log an ERROR when a familiar as no equipment 2017-04-16 12:36:59 +02:00
spells.h
spells.test.c Be very strict about C standards. 2017-02-18 21:15:14 +01:00
spy.c Merge branch 'master' into develop 2017-04-22 18:38:34 +02:00
spy.h TARNE PARTEI creport test 2017-03-01 18:11:46 +01:00
spy.test.c Fix a crash in TARNE <race> 2017-04-17 20:11:44 +02:00
sqlite.c fix study.c teacher messaging 2017-01-26 18:58:29 +01:00
study.c fix some memory leaks 2017-03-30 23:13:55 +02:00
study.h increase MAXTEACHERS again (permament fix in 3.11) 2017-01-29 11:30:22 +01:00
study.test.c clean up some tests. 2017-03-10 21:29:37 +01:00
summary.c remove data_turn and gamename from global settings. 2017-03-13 09:19:37 +01:00
summary.h more stbool.h includes, MSVC has no unlink 2017-01-26 18:05:26 +01:00
summary.test.c delete files created by report_summary 2016-09-15 21:16:45 +02:00
teleport.c merge monster.c and monsters.c 2017-01-26 17:57:21 +01:00
teleport.h get_normalplane is unnecessary 2016-01-28 12:46:38 +01:00
test_eressea.c short and sweet math with fractions. 2017-02-24 17:51:35 +01:00
tests.c Fix a crash in TARNE <race> 2017-04-17 20:11:44 +02:00
tests.h clean up some tests. 2017-03-10 21:29:37 +01:00
tests.test.c clean up some tests. 2017-03-10 21:29:37 +01:00
travelthru.c fix study.c teacher messaging 2017-01-26 18:58:29 +01:00
travelthru.h remove BOM from UTF-8 files, replace Umlauts 2016-11-01 17:25:52 +01:00
travelthru.test.c kill autoconf.h, replace platform.h for C99 compatibility work 2017-01-26 18:03:48 +01:00
upkeep.c eliminate race.parameters. 2017-02-06 09:46:36 +01:00
upkeep.h
upkeep.test.c clean up some tests. 2017-03-10 21:29:37 +01:00
volcano.c change all magic resistance to use fractions. 2017-02-24 20:47:47 +01:00
volcano.h activate, fix and improve volcano test. 2016-08-26 17:26:26 +01:00
volcano.test.c use test_setup to start tests 2016-09-08 08:12:26 +02:00
vortex.c kill autoconf.h, replace platform.h for C99 compatibility work 2017-01-26 18:03:48 +01:00
vortex.h kill autoconf.h, replace platform.h for C99 compatibility work 2017-01-26 18:03:48 +01:00
vortex.test.c clean up some tests. 2017-03-10 21:29:37 +01:00
wormhole.c kill autoconf.h, replace platform.h for C99 compatibility work 2017-01-26 18:03:48 +01:00
wormhole.h
wormhole.test.c remove quicklist shim, use selist everywhere 2017-01-26 17:41:21 +01:00