Light2
87db82f6fa
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-04-06 22:58:01 +02:00
Light2
e6d336836c
fixed action/health regen bug
2014-04-06 22:57:48 +02:00
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
540c6b20de
Fixed armour calculation bug when wearing a Jedi robe
2014-04-06 14:57:53 -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
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
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
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
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
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
Seefo
415ee013c3
Fixed abilities not being granted upon using frog to reach level 90
2014-04-05 00:21:19 -04:00
Seefo
52e92f7da9
Fixed delta related crash
2014-04-05 00:03:17 -04:00
Seefo
6502471e19
Fixed crashing temporarily
2014-04-04 20:06:04 -04:00
Seefo
973ab6da62
Fixed zoning error
2014-04-04 13:32:48 -04:00
Treeku
ab3c32e15d
Changed sendListDelta a bit
2014-04-04 18:02:45 +01:00
Treeku
abb68a74b6
Temp fix for skills crash
2014-04-04 17:01:20 +01:00
Treeku
49e7acb947
StaticService now supports custom objectIds
...
If there's a problem with the id it should be detected due to the objectId db.
2014-04-04 10:42:52 +01:00
Waverunner
9e80b5eeae
Added basis for server-side cooldown checks, added warmup checks, closed #273
...
Note that cooldown check is currently used only for the holoemote
command. To add a cooldown to any command, all you have to do is
CreatureObject.addCooldown(name). In this commit I also moved some
cooldown variables from CombatCommand to BaseSWGCommand since many
non-combat commands had cooldowns (Wookie Roar, Holo-Emotes). I also put
in a warmup cooldown (time before command is called) for non-combat
commands.
2014-04-03 19:23:31 -04:00
Light2