CharonInferar e448a41bb0 Merge remote-tracking branch 'origin/master' into ResourceSpawn ...

Conflicts:
	src/main/NGECore.java
	src/services/DevService.java
	src/services/command/CommandService.java

2014-04-06 03:59:55 +02:00

..

battlefield_marker

Added serverside templates

2013-07-08 15:03:08 +02:00

building

Fixed additional recursion errors

2014-03-15 22:28:41 -04:00

cell

Added serverside templates

2013-07-08 15:03:08 +02:00

construction_contract

Added serverside templates

2013-07-08 15:03:08 +02:00

counting

Added serverside templates

2013-07-08 15:03:08 +02:00

creature

Added posture checks, radial script for player objects, bug fixes

2014-03-19 15:56:52 -04:00

draft_schematic

Added serverside templates

2013-07-08 15:03:08 +02:00

factory

Added serverside templates

2013-07-08 15:03:08 +02:00

group

Added serverside templates

2013-07-08 15:03:08 +02:00

guild

Added serverside templates

2013-07-08 15:03:08 +02:00

installation

Added serverside templates

2013-07-08 15:03:08 +02:00

intangible

Clean up of code

2014-04-06 02:08:55 +02:00

jedi_manager

Added serverside templates

2013-07-08 15:03:08 +02:00

manufacture_schematic

Added serverside templates

2013-07-08 15:03:08 +02:00

mission

Added serverside templates

2013-07-08 15:03:08 +02:00

mobile

Finished NPC conversations, fixed disconnect bug, fixed AI atk speed check

2014-04-02 18:12:08 +02:00

object/base

Added serverside templates

2013-07-08 15:03:08 +02:00

path_waypoint

Added serverside templates

2013-07-08 15:03:08 +02:00

player

Added serverside templates

2013-07-08 15:03:08 +02:00

player_quest

Added serverside templates

2013-07-08 15:03:08 +02:00

resource_container

Added serverside templates

2013-07-08 15:03:08 +02:00

ship

Added serverside templates

2013-07-08 15:03:08 +02:00

soundobject

Added serverside templates

2013-07-08 15:03:08 +02:00

static

Added serverside templates

2013-07-08 15:03:08 +02:00

tangible

Merge remote-tracking branch 'origin/master' into ResourceSpawn

2014-04-06 03:59:55 +02:00

token

Added serverside templates

2013-07-08 15:03:08 +02:00

universe/base

Added serverside templates

2013-07-08 15:03:08 +02:00

waypoint

Added serverside templates

2013-07-08 15:03:08 +02:00

weapon

Items - Medic Pistol

2014-03-23 05:15:01 +01:00

client_battlefield_marker_outline_object.py

Added serverside templates

2013-07-08 15:03:08 +02:00

client_path_object.py

Added serverside templates

2013-07-08 15:03:08 +02:00

clientstructurefootprintobject.py

Added serverside templates

2013-07-08 15:03:08 +02:00