Mads Boddum 86a15abf45 Merge holocore/quality_assurance into quality_assurance ...

Conflicts:
	serverdata/buildout/areas.sdb
	serverdata/buildout/objects.sdb
	serverdata/static/spawns.sdb
	src/resources/HologramColour.java
	src/resources/objects/creature/CreatureObject.java
	src/resources/objects/player/PlayerObject.java
	src/resources/objects/tangible/TangibleObject.java
	src/utilities/BuildoutGenerator.java

2016-04-11 16:17:22 +02:00

..

admin

Changed holocore_admin_datatable to contain only admin commands

2016-01-04 23:42:30 +00:00

badges

Updated explorationBadges.sdb

2016-03-23 02:12:57 +00:00

building

Added several instances to buildings.sdb

2016-03-03 05:14:14 +00:00

buildout

Merge holocore/quality_assurance into quality_assurance

2016-04-11 16:17:22 +02:00

chat

Added chat log

2015-10-05 10:46:35 -05:00

collections

Added collection_consume.sdb

2016-03-23 02:25:50 +00:00

creatures

Fixed typo in Creature Database

2016-04-03 19:51:42 +00:00

faction

Added holocore_faction_datatable.sdb

2016-01-04 18:59:37 +00:00

housing

Added holocore_housing_datatable.sdb

2016-01-04 18:10:50 +00:00

items

Fixed wrong column type in item database

2016-03-04 03:32:07 +01:00

map

Fixed Kaadara misspell (blame SOE)

2016-01-24 03:09:12 +00:00

misc

Added SQL file missing from a previous commit

2016-03-02 09:12:15 -06:00

player

Changed the items for Wookiee and Ithorian professions in npe_uniformbox.sdb

2016-03-04 22:14:23 +00:00

quests

Added quests.sdb

2016-02-06 17:57:43 +00:00

radial

Profession Starter Clothing: Added UniformBoxService and ItemDatabase, updated radials and CharacterCreationService

2016-03-03 20:59:59 -06:00

spawn

Updated corellia.sdb

2016-04-06 06:51:17 +00:00

static

Merge holocore/quality_assurance into quality_assurance

2016-04-11 16:17:22 +02:00

weather

Added weather.sdb

2016-02-09 16:37:39 +00:00