projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-03 18:13:11 -04:00
Code Issues Projects Releases Wiki Activity
447 Commits 11 Branches 4 Tags
948a4bdb0d32e15c8eb67c58b5464a9fc12a8a93
Commit Graph
290 Commits
Author SHA1 Message Date
Treeku 948a4bdb0d Fixed minor merge blip 2013-12-12 14:44:34 +00: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
Treeku 001bf1b390 Renamed ListObject -> Delta. Guild null fix 
Delete your ODB for this
 2013-12-12 14:17:50 +00:00
Treeku 2ff1a8e803 Minor profession resource adjustment 2013-12-12 13:17:10 +00:00
Treeku ed8e5c0ec5 Fixed GCW Zone transactions 2013-12-12 12:34:30 +00:00
Treeku ba3954d9fb Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-12 11:56:42 +00:00
Treeku e190bc78f6 Added ChangeRoleIcon (gold icons), fixed titles 2013-12-12 11:54:52 +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 c33fcc6715 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-11 12:34:20 +00:00
Treeku 62167880ac Buff callbacks run in a separate schedule 2013-12-11 12:31:51 +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 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 bd7bb1a01b Fixed buff stacks 
Stackable buffs will no longer have their stack count reset when
exceeding the cap.
 2013-12-10 20:06:56 +01:00
Ziggeh 9bfe52763e Jedi - Fixed Soothing Aura 2013-12-10 20:05:17 +01:00
Light2 140848e3ab Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-10 17:40:21 +01:00
Light2 4ffc7138c9 Updated engine 2013-12-10 17:37:20 +01: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
darkk1138 03d6be9f62 Merge branch 'master' of github.com:ProjectSWGCore/NGECore2 2013-12-10 00:08:54 +01:00
Ziggeh e3d4fd8aaa Added Profession Master Badges 2013-12-10 00:07:39 +01:00
darkk1138 64a0e2898d correct xp, still not right though 2013-12-09 23:30:16 +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
Treeku f4e9bd626b Unknown opcodes should be significantly reduced 2013-12-09 20:38:41 +00:00
Treeku fc3cde90a7 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-09 20:26:40 +00:00
Treeku a2f74f550d Deleted unneeded file 2013-12-09 20:26:18 +00:00
Light2 69642c0f60 Fixed loading of server templates and refactored child object spawns, update engine 2013-12-09 21:17:54 +01:00
darkk1138 6177ed69f3 remove flawed field audience 2013-12-09 18:15:34 +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 53871fcbb6 Cut warnings down 2013-12-09 11:11:18 +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
Treeku 59e58ebf27 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-09 09:46:08 +00:00
Treeku ae1aa9a425 Moved enumerations somewhere tidier 2013-12-09 09:45:21 +00:00
darkk1138 93ba62cd4f fix note bubbles for dance (both for starting and stopping) 2013-12-09 10:36:21 +01:00
Treeku 51207c5803 Server templates should load correctly again 2013-12-09 08:48:53 +00:00
Treeku 9453b85477 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-09 08:45:41 +00:00
Treeku 09beefe817 FactionService fixes 2013-12-09 08:43:06 +00:00
Waverunner 64a01d4d88 getNearestTravelPoint takes into account more than 1 travel point now 2013-12-08 15:48:39 -05:00
Ziggeh 6f42cb6ebb Merge remote-tracking branch 'upstream/master' 2013-12-08 19:06:48 +01:00
Light2 8e82bb238b Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-08 19:04:58 +01:00
Light2 d9997bd796 fixed loading of server templates 2013-12-08 19:04:43 +01:00