Commit Graph
233 Commits
Author SHA1 Message Date
Light2 5fd06f87c1 added missing templates 2013-12-14 21:45:24 +01:00
Light2 9a67e1c7a3 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	.gitignore
2013-12-14 21:42:46 +01:00
Light2 5d824324c4 merge 2013-12-14 21:41:00 +01:00
Light2 896b342972 Fixed crash caused by buildings, fixed weapon object superclass, added equipment and appearance equipment deltas 2013-12-14 21:25:31 +01:00
Waverunner 46ba2151b7 Added default quest object scripts, fixed waypoint system messages 2013-12-12 15:22:55 -05:00
Treeku b6c9e74859 Merge branch 'master' of https://github.com/xbang21/NGECore2 into xbang21-master
Conflicts:
	src/services/combat/CombatCommands.java
2013-12-12 14:34:24 +00:00
xbang21 d54033a0c6 Finished Medic Buffs and Debuffs
Medic buff times with expertise tested and work properly in and out of a
group
2013-12-11 20:15:02 -05:00
Waverunner 26b7bbbff4 Merge pull request #139 from DAK-/master
Bounty Hunter: Return Fire, Take Cover & Armor Sprint
2013-12-11 15:49:36 -08:00
Treeku cfcd5206b7 Fixed /pvp 2013-12-11 17:23:15 +00:00
DAK- 5f88bab13b Bounty Hunter: Take Cover & Armor Sprint
Registered commands, added buff and command scripts.
Buffs apply, needs further testing.
2013-12-11 04:48:45 -06:00
DAK- 251b159b13 Bounty Hunter: Return Fire
Buff and command works, cools down and is modified by skill mods, (i.e.
from "Enforcer set")
2013-12-11 03:20:55 -06:00
Waverunner 5515618b0f Merge pull request #130 from Ziggeh/master
Fixed stackable buffs, Bounty Hunter expertise and the healing potency for LSJ
2013-12-10 16:26:31 -08:00
Waverunner 685566857b Fixed credits in setgodmode 2013-12-10 19:24:07 -05:00
Waverunner d6eedfd2ce Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-10 18:53:47 -05:00
Waverunner 1065c70c55 friendAdd and friendRemove update PlayerObject FriendList now 2013-12-10 18:53:42 -05:00
Wefi 06d22cae9e Added "Addability" to Setgodmode and experimenting with Mediate
Use /Setgodmod addability <String format> IE bh_sh3
2013-12-10 17:33:56 -06:00
darkk1138 5f616ed5f0 fix wrong performance id check for dances 2013-12-10 23:14:14 +01:00
Ziggeh ce31a0d95c Bounty Hunter - Fixed Ambush CD reduction expertise 2013-12-10 20:13:32 +01:00
Ziggeh 9127cd7fc6 Bounty Hunter - Fixed Assault CD reduction expertise 2013-12-10 20:13:03 +01:00
Ziggeh 0500ffe803 Bounty Hunter - Fixed heal CD reduction expertise 2013-12-10 20:10:50 +01:00
Treeku 82a7bbaa9a Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-10 05:45:49 +00:00
Treeku 95648bc262 Fixed setgodmode 2013-12-10 05:44:56 +00:00
Treeku d83e8b1e1e Merge pull request #123 from Ziggeh/master
Added profession badges and changed healing CD reduction to be done through scripts
2013-12-09 15:26:29 -08:00
Ziggeh e3d4fd8aaa Added Profession Master Badges 2013-12-10 00:07:39 +01:00
Waverunner 124473472b Static shuttle and transports no longer return null errors (ie ACLO Bunker) 2013-12-09 17:15:33 -05:00
darkk1138 c19e2e20ba Merge branch 'master' of github.com:ProjectSWGCore/NGECore2 2013-12-09 22:54:57 +01:00
darkk1138 14f75cc1b4 dancers can now gain experience by performing flourishes
(calculations might still be off though. :p)
2013-12-09 22:54:21 +01:00
Light2 69642c0f60 Fixed loading of server templates and refactored child object spawns, update engine 2013-12-09 21:17:54 +01:00
darkk1138 760aea96f2 fix SWGList on audience, however, the old field needs removing.
depend inspire on watching
2013-12-09 18:09:40 +01:00
darkk1138 471fab10d8 refactored slightly.. wasted a lot of time with that. :p 2013-12-09 17:19:53 +01:00
darkk1138 a5b31ac5a5 add preliminary watch/stopwatching implementation 2013-12-09 16:04:33 +01:00
darkk1138 c0ba5ba1c0 add expertise stubs for entertainer 2013-12-09 13:52:01 +01:00
Treeku 3a66043f70 Collections can use radial_filename=collection
In an object that is always a collection that can be added to
collections, you can put this in setup():

object.setAttachment('radial_filename', 'collection')

Then define use(core, actor, object) and make it use addCollection().
2013-12-09 10:52:04 +00:00
Treeku 94bb6f9a66 Fixed use(), needs radial_filename to be 'usable'
If use() is broken in any of your object scripts, add the following to
setup():

object.setAttachment('radial_filename', 'usable')
2013-12-09 10:30:09 +00:00
darkk1138 93ba62cd4f fix note bubbles for dance (both for starting and stopping) 2013-12-09 10:36:21 +01:00
Waverunner 64a01d4d88 getNearestTravelPoint takes into account more than 1 travel point now 2013-12-08 15:48:39 -05:00
Ziggeh 95b46419bc Merge remote-tracking branch 'upstream/master' 2013-12-08 18:59:10 +01:00
Light2 f2200711cf Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/services/SimulationService.java
2013-12-08 18:21:50 +01:00
Light2 93195f7d5f Added dynamic lair spawns, fixed equip exploit, fixed some bugs and client crashes, updated engine 2013-12-08 18:17:01 +01:00
darkk1138 4e78f9064e Merge branch 'master' of github.com:ProjectSWGCore/NGECore2 2013-12-08 17:25:20 +01:00
darkk1138 6471d7e118 add /groupdance command 2013-12-08 17:25:04 +01:00
Waverunner 9d7892188c FindFriend added, Bank tips no longer produces an error 2013-12-08 11:08:24 -05:00
Ziggeh 47a2706432 Cleaned up waypoint scripts 2013-12-08 15:12:43 +01:00
Ziggeh 8b21e32f6a Added First Aid Training (commando) 2013-12-08 12:16:26 +01:00
Ziggeh bba4153f47 Heal CD reduction is now done through scripts 2013-12-08 05:51:03 +01:00
Waverunner ba858e2c28 Friend Notification only on login/logout now, Chat messages for ignored players no longer display
Use Travel Ticket for travel tickets added
2013-12-07 22:37:51 -05:00
Waverunner 576c03db14 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-07 17:59:03 -05:00
Waverunner ae0b06f917 Fixed MissionObject Delta's, Synchronized MissionObject, Fixed MissionListRequest Opcode 2013-12-07 17:58:49 -05:00
Waverunner 7fbd1206ab Merge pull request #113 from Ziggeh/master
Some general fixes
2013-12-07 14:31:34 -08:00
Ziggeh 4039379583 Fixed creating waypoints through planetary map 2013-12-07 23:12:41 +01:00