Alec Harley 6bce80ffa5 Merged in alecharley/dsrc-1.2 (pull request #1) ...

Prevent client crash when placing TCG relaxation pool

Approved-by: SWG Source <[email protected]>

2018-06-09 14:56:06 +00:00

..

battlefield_marker

Fixed merge issues.

2018-03-26 01:21:00 +01:00

building

Prevent client crash when placing TCG relaxation pool

2018-06-07 21:11:37 +00:00

cell

Fixed merge issues.

2018-03-26 01:21:00 +01:00

construction_contract

Fixed merge issues.

2018-03-26 01:21:00 +01:00

creature

Fixed merge issues.

2018-03-26 01:21:00 +01:00

draft_schematic

tcg refactor and addition of tcg vendors

2018-06-07 17:10:38 -07:00

factory

Fixed merge issues.

2018-03-26 01:21:00 +01:00

group

Fixed merge issues.

2018-03-26 01:21:00 +01:00

guild

Fixed merge issues.

2018-03-26 01:21:00 +01:00

installation

Fixed merge issues.

2018-03-26 01:21:00 +01:00

intangible

Fixed issue with Heavy Vaksai not generating properly.

2018-05-30 07:30:56 +01:00

jedi_manager

Fixed merge issues.

2018-03-26 01:21:00 +01:00

manufacture_schematic

Fixed merge issues.

2018-03-26 01:21:00 +01:00

mission

Fixed merge issues.

2018-03-26 01:21:00 +01:00

mobile

tcg refactor and addition of tcg vendors

2018-06-07 17:10:38 -07:00

object/base

Fixed merge issues.

2018-03-26 01:21:00 +01:00

path_waypoint

Fixed merge issues.

2018-03-26 01:21:00 +01:00

player

Fixed merge issues.

2018-03-26 01:21:00 +01:00

player_quest

Fixed merge issues.

2018-03-26 01:21:00 +01:00

resource_container

Fixed merge issues.

2018-03-26 01:21:00 +01:00

ship

Fixed merge issues.

2018-03-26 01:21:00 +01:00

soundobject

Fixed merge issues.

2018-03-26 01:21:00 +01:00

static

altered pointer to s02 particle from s01

2018-05-24 09:03:27 -07:00

tangible

fix for lack of colouration on the Katarn armour sets

2018-06-09 06:54:25 -07:00

token

Fixed merge issues.

2018-03-26 01:21:00 +01:00

universe/base

Fixed merge issues.

2018-03-26 01:21:00 +01:00

waypoint

Fixed merge issues.

2018-03-26 01:21:00 +01:00

weapon

large scale merge of the v1.1 delta files

2018-05-22 10:41:30 -07:00

battlefield_marker_object_template.tdf

Fixed merge issues.

2018-03-26 01:21:00 +01:00

building_object_template.tdf

Fixed merge issues.

2018-03-26 01:21:00 +01:00

cell_object_template.tdf

Fixed merge issues.

2018-03-26 01:21:00 +01:00

construction_contract_object_template.tdf

Fixed merge issues.

2018-03-26 01:21:00 +01:00

creature_object_template.tdf

update to get the snow speeder familiar closer to being functional

2018-05-12 04:10:12 -07:00

draft_schematic_object_template.tdf

Fixed merge issues.

2018-03-26 01:21:00 +01:00

dummy.tpf

Fixed merge issues.

2018-03-26 01:21:00 +01:00

factory_object_template.tdf

Fixed merge issues.

2018-03-26 01:21:00 +01:00

group_object_template.tdf

Fixed merge issues.

2018-03-26 01:21:00 +01:00

guild_object_template.tdf

Fixed merge issues.

2018-03-26 01:21:00 +01:00

installation_object_template.tdf

Fixed merge issues.

2018-03-26 01:21:00 +01:00

intangible_object_template.tdf

Fixed merge issues.

2018-03-26 01:21:00 +01:00

jedi_manager_object_template.tdf

Fixed merge issues.

2018-03-26 01:21:00 +01:00

manufacture_schematic_object_template.tdf

Fixed merge issues.

2018-03-26 01:21:00 +01:00

mission_data_object_template.tdf

Fixed merge issues.

2018-03-26 01:21:00 +01:00

mission_list_entry_object_template.tdf

Fixed merge issues.

2018-03-26 01:21:00 +01:00

mission_object_template.tdf

Fixed merge issues.

2018-03-26 01:21:00 +01:00

object_template.tdf

Fixed merge issues.

2018-03-26 01:21:00 +01:00

player_object_template.tdf

Fixed merge issues.

2018-03-26 01:21:00 +01:00

player_quest_object_template.tdf

Fixed merge issues.

2018-03-26 01:21:00 +01:00

resource_container_object_template.tdf

Fixed merge issues.

2018-03-26 01:21:00 +01:00

ship_object_template.tdf

Fixed merge issues.

2018-03-26 01:21:00 +01:00

static_object_template.tdf

Fixed merge issues.

2018-03-26 01:21:00 +01:00

tangible_object_template.tdf

Fixed merge issues.

2018-03-26 01:21:00 +01:00

token_object_template.tdf

Fixed merge issues.

2018-03-26 01:21:00 +01:00

universe_object_template.tdf

Fixed merge issues.

2018-03-26 01:21:00 +01:00

vehicle_object_template.tdf

Fixed merge issues.

2018-03-26 01:21:00 +01:00

waypoint_object_template.tdf

Fixed merge issues.

2018-03-26 01:21:00 +01:00

weapon_object_template.tdf

Fixed merge issues.

2018-03-26 01:21:00 +01:00