Mads Boddum d33499bb0f Merge holocore/quality_assurance into quality_assurance ...

Conflicts:
	src/resources/objects/creature/CreatureObject.java
	src/resources/objects/group/GroupObject.java
	src/resources/objects/tangible/TangibleObject.java
	src/services/collections/CollectionBadgeManager.java
	src/services/combat/CombatService.java
	src/services/commands/CommandService.java
	src/services/commands/EntertainmentService.java
	src/services/experience/SkillTemplateService.java
	src/services/group/GroupService.java
	src/services/objects/UniformBoxService.java

2016-09-26 15:45:13 +02:00

..

admin

Changed holocore_admin_datatable to contain only admin commands

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

badges

Updated all exploration bagdes coordinates

2016-04-21 20:54:38 +00:00

building

Updated buildings database

2016-07-09 18:05:54 +00:00

buildout

Merge holocore/quality_assurance into quality_assurance

2016-08-07 14:47:53 +02:00

chat

Added chat log

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

combat

Bit of work on the CU implementation of combat

2016-05-11 22:48:39 +02:00

creatures

Updated creatures database

2016-07-04 16:23:36 +00:00

experience

Merge holocore/quality_assurance into quality_assurance

2016-07-01 03:00:27 +02:00

faction

Updated faction_datatable.sdb

2016-08-06 11:56:21 +00:00

gcw

Removed GCW base terminals from gcw_base_object_talus.sdb

2016-07-23 00:47:33 +00:00

housing

Added holocore_housing_datatable.sdb

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

items

Changed "none" in weapon.sdb to "-"

2016-09-16 09:42:39 +00:00

loot

Added loot_items.sdb

2016-08-04 22:05:05 +00: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

patrol

Changed 'waypoint_id' column to 'waypoints'

2016-07-13 15:07:45 +02:00

player

Added a few new locations in player_spawns.sdb

2016-08-14 14:40:28 +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

Refactored gcw base and presence spawns

2016-07-16 22:20:16 +02:00

static

Merge holocore/quality_assurance into quality_assurance

2016-05-20 19:33:00 +02:00

weather

Added weather.sdb

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