projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-16 06:13:45 -04:00
Code Issues Projects Releases Wiki Activity
1,097 Commits 11 Branches 4 Tags
cc1ce8bf2ce494c6246bfae9ddffff81d7d744ce
Commit Graph
1097 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Waverunner cc1ce8bf2c Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-06 16:30:14 -04:00
Waverunner 438c960d88 Buffs refactored to use DatatableVisitor on server load 
Originally, everytime a new Buff instance was created, it would loop
through the Datatable Visitor everytime. Now it's only done once on
server startup and put into a buffMap. A copy of the base buff is then
done through the constructor of Buff class should a new instance of that
buff type needs to be created from the one inside the map.
 2014-04-06 16:29:31 -04:00
Light2 25eefbd989 fixed #388 2014-04-06 21:43:58 +02:00
Light2 b350bad2da Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-06 21:20:26 +02:00
Light2 96bed77202 some AI fixes 2014-04-06 21:19:16 +02:00
Seefo de28fe1fc6 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-06 14:58:06 -04:00
Seefo 540c6b20de Fixed armour calculation bug when wearing a Jedi robe 2014-04-06 14:57:53 -04:00
Waverunner 730b446f02 Change holoemote cooldown to seconds 2014-04-06 14:42:02 -04:00
Treeku 74b1c107af Minor cooldown fix 2014-04-06 19:36:42 +01:00
Treeku 4f56b40d84 Changed cooldowns to correctly use a float 2014-04-06 19:30:11 +01:00
Treeku f23c6be71d Removed check preventing new skillMods showing 2014-04-06 18:49:41 +01:00
Seefo 61ef24cbac Revert "Cleaned up calculateArmorProtection in the Equipment Service a bit" 
This reverts commit 62166f0929.
 2014-04-06 13:34:45 -04:00
Seefo 62166f0929 Cleaned up calculateArmorProtection in the Equipment Service a bit 2014-04-06 13:33:53 -04:00
Waverunner eb9624533f Fixed #300: (Misc) Clicking on profession icon does not alterate within list 2014-04-06 12:52:44 -04:00
Waverunner 1fbf0613a7 Fixed #386: Wookies/Ithorians cant gain CL 90 via frog 
Added option to load resources or not too (enabled by default)
 2014-04-06 12:11:27 -04:00
Seefo 5c34a3644e Updated some Jedi robe scripts and fixed a concurrency error 2014-04-06 12:01:32 -04:00
Seefo e0eb5c3c5f Updated Player Object version 2014-04-06 11:44:19 -04:00
Waverunner 47c6eb2f45 Merge pull request #390 from Mesagoppinmypants/patch-1 
Added Lava Cannon to Frog
 2014-04-06 11:19:31 -04:00
Mesagoppinmypants ba457e9f24 Added Lava Cannon to Frog 
Added a heavy weapon to frog for commando abilities that require a heavy weapon.
 2014-04-06 11:16:34 -04:00
Waverunner 1865c48ad6 Fixed Error: target cannot be resolved to a variable 2014-04-06 11:03:32 -04:00
Waverunner 07656074c4 Merge pull request #389 from CharonInferar/ResourceSpawn 
Resource spawn
 2014-04-06 10:52:05 -04:00
CharonInferar bd64d7fe9f Master update 2014-04-06 14:59:39 +02:00
CharonInferar 1ae5167b70 Diff is empty counter 2 2014-04-06 14:55:35 +02:00
CharonInferar 858df9e80b Diff is empty counter 2014-04-06 14:54:59 +02:00
CharonInferar c6836dead9 Clean up 
SurveyCommand is now done fully over the Jython interface consistent to
client command handling
 2014-04-06 14:49:22 +02:00
CharonInferar a5ba92cbf1 Bug fix 
Picking up sampling a previously sampled resource, will add the stack to
the according container.
 2014-04-06 14:27:55 +02:00
Treeku 9e83367db7 Changed when callbacks used, impv off buff removal 2014-04-06 09:48:26 +01:00
Treeku 06ecc10be9 Removed premature buff return preventing stacking 
This check is already handled more thoroughly further down where it either adds it as a stack or removes it.
 2014-04-06 08:03:03 +01:00
CharonInferar da6af6177f Put updated OMR from master back in 2014-04-06 04:55:55 +02:00
CharonInferar 348b6b7f55 Cleanup of options.cfg 
Used kneel py for spawning tools, replaced it with original
 2014-04-06 04:44:40 +02:00
CharonInferar b5ba0bb688 Fixed 3 classes 2014-04-06 04:19:24 +02:00
Seefo 7ce731d919 Fixed problem where commands that didn't have required abilities wouldn't work 2014-04-05 22:16:25 -04:00
CharonInferar e448a41bb0 Merge remote-tracking branch 'origin/master' into ResourceSpawn 
Conflicts:
	src/main/NGECore.java
	src/services/DevService.java
	src/services/command/CommandService.java
 2014-04-06 03:59:55 +02:00
CharonInferar 913aa1d89c Merge remote-tracking branch 'upstream/master' 2014-04-06 02:18:43 +02:00
CharonInferar afe16d04b1 Last step 2014-04-06 02:12:56 +02:00
CharonInferar bd6544c2c1 Diff is empty workaround 2014-04-06 02:12:07 +02:00
CharonInferar 96685e43b8 Reverted BaseSWGCommand 2014-04-06 02:10:15 +02:00
CharonInferar 065fe79945 Clean up of code 
Cleaned up some classes
Moved functionalities into more appropriate methods/classes
 2014-04-06 02:08:55 +02:00
Waverunner 2b4523b5bd Admin ability added for GM's 2014-04-05 19:34:40 -04:00
Waverunner 92dfe6602c Added Required Abillity check for commands 2014-04-05 19:25:18 -04:00
Seefo d74bfae9c1 Fixed #378 2014-04-05 18:57:24 -04:00
Waverunner fe340f5930 Fixed #378: Drillmaster applied to target. 2014-04-05 18:45:16 -04:00
Waverunner 36be2c9b37 Merge pull request #381 from Ziggeh/master 
Fixed Nutrient Injection
 2014-04-05 18:18:33 -04:00
Seefo d881268f89 More cleanup 2014-04-05 14:45:42 -04:00
Seefo 0dde17fa24 Cleaned up some code in the Equipment Service 2014-04-05 14:41:21 -04:00
Seefo 890d395e3a Fixed an armour calculation bug 2014-04-05 14:37:42 -04:00
Treeku 586c652ac6 Fixed null pointer exception 2014-04-05 19:06:03 +01:00
Seefo 01a7852936 Added the ability to add items to a bonus set via STF Name, added Heroism Bonus Set, added Heroism Jewlery set to frog 2014-04-05 12:40:51 -04:00
Seefo 33c27ffc21 Fixed armour calculation when wearing a Jedi robe/cloak and when you have less than 3 armour pieces equipped 2014-04-05 12:08:06 -04:00
Bronco69 357106fa06 Spy - expertise scripts reworked 
All commands and skills for expertise changed and checked
 2014-04-05 11:53:34 +02:00