projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-03 04:16:19 -04:00
Code Issues Projects Releases Wiki Activity
747 Commits 11 Branches 4 Tags
5b2ce53cb3dace7138cf00a7a578db95fc7f2981
Commit Graph
747 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Waverunner 5b2ce53cb3 Merge pull request #229 from ProjectSWGCore/Wave_Entertainer 
Merge Wave_Entertainer
 2014-03-23 16:06:38 -04:00
Seefo c0fcda14df Fixed issue #114 2014-03-23 16:04:57 -04:00
Waverunner 0f390c063b No exp for entertainer above 90, fixed unity radial, changed giveItems 2014-03-23 15:59:29 -04:00
Seefo bd228e971a Fixed issue #227 and #202 2014-03-23 15:03:44 -04:00
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
Waverunner 679f427759 Merge pull request #223 from Ziggeh/master 
Scripts - Roadmap rewards are now located in profession roadmap scripts
 2014-03-23 14:06:55 -04:00
Waverunner e2a09f12d4 Roadmap Rewards use giveItem, roadmap rewards call script based on profession 2014-03-23 14:04:21 -04:00
Waverunner cf5c36dd29 Added Buff Workshop Collection, hologram variable to creatureobject 
(Added) BuffWorkshop Collection
(Code) Added hologram variable to CreatureObject
(BugFix) Inspiration ticks stop at max duration
 2014-03-23 13:42:18 -04:00
Treeku 554bba531a Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-23 16:53:11 +00:00
Treeku 7d8725d60b Added buffer to buff funcs, added buff checks 2014-03-23 16:49:59 +00:00
Seefo d00aa83050 Fixed a few exploits. See extended. 
Skills obtained through the expertise system are now validated to make
sure they are legitimate expertise skills.
Player expertise points are also now factored in instead of letting the
client do all the calculations.
Command "setcurrentskilltitle" now checks if the player has obtained the
skill title to prevent abuse of the command.
 2014-03-23 12:27:42 -04:00
Treeku 51899bef77 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-23 15:09:27 +00:00
Treeku efdb69ff57 Fixed major counter-type collection bugs 2014-03-23 15:08:46 +00:00
Ziggeh 7f5c7dc03a Officer - Fixed Tactics Duration 2014-03-23 07:07:27 +01:00
Ziggeh a024ea8fee Jedi - Jedi Strike ACR was incorrectly affecting Flurry 2014-03-23 06:54:42 +01:00
Ziggeh edd91900e6 Bounty Hunter - Added Ambush Damage/Critical/Action cost 2014-03-23 06:53:06 +01:00
Ziggeh 9a82b2cd46 Bounty Hunter - Added Assault Damage 2014-03-23 06:38:41 +01:00
Ziggeh b36fc0eb95 Scripts - Roadmap rewards are now located in profession roadmap scripts 2014-03-23 06:26:32 +01:00
Treeku 0798fe4545 Merge pull request #222 from Ziggeh/master 
Fixed medic buffs and added some beginner items
 2014-03-23 04:54:32 +00:00
Ziggeh a87bc2c202 Items - Initiate Robe 2014-03-23 05:30:42 +01:00
Ziggeh 312dcd28f6 Items - Medic Pistol 2014-03-23 05:15:01 +01:00
Ziggeh 109a808108 Items - Modified DL-44 2014-03-23 05:13:29 +01:00
Ziggeh 1acefc8c38 Medic - Buffs are now applied correctly 2014-03-23 05:09:22 +01:00
Ziggeh 8f7e47bec4 Items - Bounty Hunter Carbine 2014-03-23 05:05:23 +01:00
Ziggeh a720e3c465 Items - Spy Carbine 2014-03-23 05:03:11 +01:00
Ziggeh 3c8886b937 Items - Jedi Training Polearm 2014-03-23 05:02:24 +01:00
Ziggeh d6e62341ae Items - Officer's Sidearm 2014-03-23 04:59:38 +01:00
Ziggeh f351fee408 Items - Commando Carbine 2014-03-23 04:58:18 +01:00
Ziggeh 984ddf3acb Items - Issued Pistol 2014-03-23 04:57:43 +01:00
Waverunner d841de2fa0 Merge pull request #220 from Ziggeh/master 
Fixed some officer buffs and a permanent buff duration issue
 2014-03-22 22:20:14 -04:00
Ziggeh b6f89c1139 Officer - Inspiration and Drillmaster are now added to the group 2014-03-23 03:09:47 +01:00
Ziggeh 993f9b657e Officer - Scatter is now added to the group 2014-03-23 03:06:57 +01:00
Ziggeh ac7136edc7 Officer - Fixed buff duration and errors 2014-03-23 02:59:25 +01:00
Ziggeh a3e7b10372 Buffs - Permanent duration buffs now correctly replace non-permanent version 2014-03-23 02:46:47 +01:00
Waverunner 640973da22 Merge remote-tracking branch 'origin/Wave_Collections' into Wave_Entertainer 2014-03-22 12:14:38 -04:00
Waverunner d5f91ab3a1 Merge remote-tracking branch 'origin/master' into Wave_Entertainer 
Conflicts:
	scripts/commands/colorlights.py
	scripts/commands/dazzle.py
	scripts/commands/firejet.py
	scripts/commands/smokebomb.py
	scripts/commands/ventriloquism.py
 2014-03-22 11:56:54 -04:00
Waverunner ffc9aec1b1 Added Inspiration ticks, effects for Multi-Tier Performance Abilities 
(BugFix) Build-A-Buff applies correct stats now
-- NOTE: Stats that the player does not have yet may not show in
character sheet but the server will recognize still recognize their new
stats
(Added) Inspiration Ticks
(BugFix) Inspiration Buffs time corresponds to the players inspiration
ticks.
(BugFix) "Watch" on radial menu working again
(Added) Put in the effects for the multi-tiered performance abilities
(Feature) You can now type /[performance effect] [tier number] to use
that specific effect
(BugFix) showFlyText boolean for showing to observers or not (fixes
other players exp gain shown to other players)
(Code) Few minor additions/fixes
 2014-03-22 11:47:37 -04:00
Waverunner ca1ff0b98f Fixed buffer for sendListDelta 2014-03-22 10:55:29 -04:00
Treeku d1fff9e069 Fixed buff duration check, fixed group buffs 
- The duration needed to be set on the buff object "before "the buff is
actually added.  Because of this, I made the distinction between setup(0
(setting up the buff object) and add() (adding the buff stats to the
player).

- Group buffs would add the buff based on each individual player's
skillmods instead of the buffer's.  Due to this, I made a "buffer"
parameter for doAddBuff().  If there is a buffer, regardless of it's a
buffer within our group, we can specify them, otherwise provide null.
 2014-03-22 02:07:53 +00:00
Treeku ecdbfd5f80 Fixed creature SWGLists 2014-03-21 23:44:39 +00:00
Treeku 2b6ada777c Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-21 16:41:46 +00:00
Treeku 54cc7c3bcc radialFilename comes from script func if possible 
This means any changes to the radial filename are retroactive.

It'll check server templates for getRadialFilename(), if not found,
it'll check the radial_filename attachment variable.
 2014-03-21 16:41:00 +00:00
Treeku 867ea8972a Instance lockouts cleared at 6AM GMT 2014-03-21 16:34:33 +00:00
Waverunner 38f8145fbd mis-spelled laser 2014-03-20 18:39:48 -04:00
Waverunner 3815cda6c1 Fixed system message errors from previous commit 2014-03-20 18:14:40 -04:00
Waverunner f914f47097 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-20 18:14:11 -04:00
Waverunner ca4e0559a1 Added performance effects, fixed band flos, minor ent service code changes 
(Bug Fix) Band Flourishes will now give experience
(Added) Performance Commands
(Code) Changed to ConcurrentHashMap for performance tables
 2014-03-20 18:00:13 -04:00
Waverunner 221317d51e Merge pull request #213 from Ziggeh/master 
Fixed some item attributes
 2014-03-20 14:48:39 -04:00
Waverunner b434b96f46 Merge remote-tracking branch 'origin/master' into Wave_Collections 2014-03-20 13:57:52 -04:00
Treeku 36458239d3 Added object tracking lists to instances 
Add objects with instance.getObjectList().add(object)

It's removed automatically when the instance closes.
 2014-03-20 15:29:04 +00:00