Waverunner d108353614 Merge remote-tracking branch 'origin/master' into Wave_Entertainer ...

Conflicts:
	src/services/BuffService.java
	src/services/collections/CollectionService.java

2014-03-23 14:32:45 -04:00

..

ai

more work on AI, added odb for object id(should hopefully fix object id duplicates), fixed tons of bugs

2014-03-10 00:33:34 +01:00

chat

Buff Windows now close, changed formula used for stats on inspiration buffs, minor changes overall to entertainer

2014-03-16 13:01:30 -04:00

collections

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

2014-03-23 14:32:45 -04:00

combat

Fixed error

2014-03-16 00:45:48 +00:00

command

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

2014-03-10 00:42:19 +01:00

gcw

Target's Pvp Status Calculation

2014-01-04 20:54:55 +00:00

guild

Guild names now show when examining another player

2014-02-19 18:31:03 -05:00

map

Made all callScript functions consistent

2014-03-19 18:26:15 +00:00

object

Fixed bug with previous buildout id change

2014-03-19 23:07:57 +00:00

retro

Fixed retroservice error

2014-01-05 15:49:43 +00:00

spawn

more work on AI, added odb for object id(should hopefully fix object id duplicates), fixed tons of bugs

2014-03-10 00:33:34 +01:00

sui

radialFilename comes from script func if possible

2014-03-21 16:41:00 +00:00

trade

Enabled heroic dungeons, fixed radials

2014-03-19 22:07:29 +00:00

travel

Made all callScript functions consistent

2014-03-19 18:26:15 +00:00

AttributeService.java

Added buffs, added total play time to character sheet

2013-08-11 18:18:12 +02:00

BuffService.java

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

2014-03-23 14:32:45 -04:00

CharacterService.java

Made all callScript functions consistent

2014-03-19 18:26:15 +00:00

ConnectionService.java

Added Inspiration ticks, effects for Multi-Tier Performance Abilities

2014-03-22 11:47:37 -04:00

EntertainmentService.java

Added Buff Workshop Collection, hologram variable to creatureobject

2014-03-23 13:42:18 -04:00

EquipmentService.java

Forgot to unstage file

2014-03-13 18:57:09 -04:00

GroupService.java

Fixed buff duration check, fixed group buffs

2014-03-22 02:07:53 +00:00

InstanceService.java

Instance lockouts cleared at 6AM GMT

2014-03-21 16:34:33 +00:00

LoginService.java

Reverted Changes

2014-03-12 15:19:27 -04:00

MissionService.java

Refactored disconnect handling, updated engine

2013-12-15 23:49:12 +01:00

PlayerService.java

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

2014-03-23 14:32:45 -04:00

ScriptService.java

Made all callScript functions consistent

2014-03-19 18:26:15 +00:00

SimulationService.java

Temp quadtree remove() fix

2014-03-19 20:37:37 +00:00

SkillModService.java

Cut warnings down

2013-12-09 11:11:18 +00:00

SkillService.java

Fixed a few exploits. See extended.

2014-03-23 12:27:42 -04:00

StaticService.java

Made all callScript functions consistent

2014-03-19 18:26:15 +00:00

TerrainService.java

fixed startup crash

2014-03-10 03:44:51 +01:00

WeatherService.java

Added weather

2013-11-21 15:17:32 +01:00