Commit Graph
109 Commits
Author SHA1 Message Date
Waverunner 6fc258a8f8 Waypoint color can be changed now, added missing starports to planet map, player flags now work 2013-12-15 13:14:36 -05:00
Light2 f9a04c30ea shutdown command fix 2013-12-15 02:51:59 +01:00
Light2 8f1c15102c Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-15 02:15:20 +01:00
Light2 60373502e1 Added shutdown command, added character limit 2013-12-15 02:15:08 +01:00
Waverunner 86c202f5db Added player flags 2013-12-14 20:02:49 -05:00
Light2 1e68c71177 Fixed spawning in the buildout buildings, fixed gm permissions, added command to lock and unlock server for gms 2013-12-15 01:31:15 +01:00
Light2 9a67e1c7a3 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	.gitignore
2013-12-14 21:42:46 +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
Waverunner 124473472b Static shuttle and transports no longer return null errors (ie ACLO Bunker) 2013-12-09 17:15:33 -05: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
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 93ba62cd4f fix note bubbles for dance (both for starting and stopping) 2013-12-09 10:36:21 +01: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 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
darkk1138 a2c94acaf8 optimise /bandflo script, it just didn't look right to me. :p 2013-12-07 21:32:15 +01:00
darkk1138 131092de60 Merge branch 'master' into darkk_ent
Conflicts:
	src/resources/objects/creature/CreatureMessageBuilder.java
	src/resources/objects/creature/CreatureObject.java
2013-12-07 16:37:52 +01:00
darkk1138 9683f4c164 add startdance, stopdance, flourish and bandflourish commands 2013-12-07 16:34:19 +01:00
Ziggeh 64f332bea2 Supply Drop now uses the correct crate 2013-12-07 02:19:31 +01:00
Ziggeh abf7e90329 Deleted another unused command script 2013-12-07 02:17:20 +01:00
Ziggeh aa0fe46fba Fixed Supply Drop command for officers.
The Tactical Supply Drop command was removed from the game and was
merged with the Medical Supply Drop and then became Supply Drop.

The script can properly check if the actor has the tactical serum
expertise box or not.
2013-12-06 23:21:31 +01:00