Treeku e8a1959f9d Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 ...

Conflicts:
	scripts/radial/vehicle.py
	src/main/NGECore.java
	src/resources/objects/creature/CreatureObject.java
	src/resources/objects/player/PlayerObject.java
	src/resources/objects/tangible/TangibleObject.java
	src/services/SimulationService.java
	src/services/combat/CombatService.java
	src/services/object/ObjectService.java

2014-04-18 21:10:53 +01:00

..

battlefield_marker

…

building

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

2014-04-18 21:10:53 +01:00

cell

…

construction_contract

…

counting

…

creature

Tidied radials

2014-04-13 21:46:51 +01:00

draft_schematic

…

factory

…

group

…

guild

…

installation

Tidied radials

2014-04-13 21:46:51 +01:00

intangible

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

2014-04-18 21:10:53 +01:00

jedi_manager

…

manufacture_schematic

…

mission

…

mobile

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

2014-04-18 21:10:53 +01:00

object/base

…

path_waypoint

…

player

…

player_quest

…

resource_container

…

ship

…

soundobject

…

static

…

tangible

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

2014-04-18 21:10:53 +01:00

token

…

universe/base

…

waypoint

…

weapon

Updated weapons to use the WeaponType datatable

2014-04-16 18:42:25 +02:00

client_battlefield_marker_outline_object.py

…

client_path_object.py

…

clientstructurefootprintobject.py

…