CharonInferar 0f8466bf44 Merge conflict resolve

2014-08-09 18:17:01 +02:00

..

battlefield_marker

…

building

Fixed Typo in Mustafarian Bunker

2014-08-05 21:03:42 +02:00

cell

…

construction_contract

…

counting

…

creature

Added Tracking Droids, refined Bounty Missions

2014-05-03 18:03:00 -04:00

draft_schematic

…

factory

RE Factory Crates, PUP procs, Multi-color junk

2014-06-10 02:53:49 +02:00

group

…

guild

…

installation

Added more content, tweaked AI resources and buffs

2014-08-02 00:06:22 +02:00

intangible

[Added] Vehicles, TCG and normal ones

2014-07-06 21:03:08 -05:00

jedi_manager

…

manufacture_schematic

…

mission

…

mobile

Merge pull request #1036 from zingzing175/master

2014-07-15 08:58:49 -04:00

object/base

…

path_waypoint

…

player

…

player_quest

…

resource_container

…

ship

…

soundobject

…

static

…

tangible

Merge conflict resolve

2014-08-09 18:17:01 +02:00

token

…

universe/base

…

waypoint

…

weapon

Merge pull request #1122 from tacef/master

2014-08-09 17:57:49 +02:00

client_battlefield_marker_outline_object.py

…

client_path_object.py

…

clientstructurefootprintobject.py

…