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

..

building

Serial number uses attribute

2014-04-13 16:33:18 +01:00

cell

Removed BaseObject (delete ODB again)

2013-12-14 23:25:15 +00:00

craft

second commit

2014-04-13 22:46:02 +02:00

creature

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

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

deed

Structure terminal work

2014-04-11 04:14:29 +02:00

factorycrate

second commit

2014-04-13 22:46:02 +02:00

group

Rare loot system stage added

2014-04-10 17:04:52 +02:00

guild

Instance implementation

2014-03-19 19:43:29 +00:00

harvester

Serial number uses attribute

2014-04-13 16:33:18 +01:00

installation

Serial number uses attribute

2014-04-13 16:33:18 +01:00

intangible

Removed BaseObject (delete ODB again)

2013-12-14 23:25:15 +00:00

loot

Loot window added

2014-04-16 18:14:09 +02:00

manufacture

second commit

2014-04-13 22:46:02 +02:00

mission

Added baseline inheritance (delete ODBs)

2013-12-14 21:58:50 +00:00

player

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

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

resource

Harvesters introduced

2014-04-11 02:25:07 +02:00

ship

Added baseline inheritance (delete ODBs)

2013-12-14 21:58:50 +00:00

staticobject

Removed BaseObject (delete ODB again)

2013-12-14 23:25:15 +00:00

tangible

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

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

tool

Measures to stabilize Surveyservice

2014-04-16 19:25:07 +02:00

universe

Removed BaseObject (delete ODB again)

2013-12-14 23:25:15 +00:00

waypoint

Added baseline inheritance (delete ODBs)

2013-12-14 21:58:50 +00:00

weapon

Implemented elemental particle effects, #434

2014-04-17 00:25:54 +02:00

Buff.java

Fixed most warnings

2014-04-10 11:52:09 +01:00

BuffItem.java

Fixed a bug where players who had an ent buff on logout couldnt login

2014-04-01 15:49:08 +02:00

DamageOverTime.java

Added DoTs, added buff stacks, fixed several combat bugs, added several commands and buffs

2013-09-29 19:17:16 +02:00

Delta.java

Flytext, System, Comms now use ProsePackages

2014-04-13 00:27:02 +01:00

IDelta.java

Renamed ListObject -> Delta. Guild null fix

2013-12-12 14:17:50 +00:00

ObjectMessageBuilder.java

some bug fixes + updated engine with networking fixes

2013-12-28 19:16:51 +01:00

SkillMod.java

Updated SkillMod.java to work with a map

2014-04-03 16:57:51 +01:00

SWGList.java

Fixed some stuff

2014-03-28 07:09:16 -04:00

SWGMap.java

Removed check preventing new skillMods showing

2014-04-06 18:49:41 +01:00

SWGMultiMap.java

Renamed ListObject -> Delta. Guild null fix

2013-12-12 14:17:50 +00:00