Treeku
6aa1295eb9
Updated variable labeling a bit for CREOs
2014-04-25 12:19:35 +01:00
Treeku
e8a1959f9d
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
...
Conflicts:
scripts/radial/vehicle.py
src/main/NGECore.java
src/resources/objects/creature/CreatureObject.java
src/resources/objects/player/PlayerObject.java
src/resources/objects/tangible/TangibleObject.java
src/services/SimulationService.java
src/services/combat/CombatService.java
src/services/object/ObjectService.java
2014-04-18 21:10:53 +01:00
Treeku
f58b7b6a5b
Overhauled Mounts (still buggy)
2014-04-18 19:09:45 +01:00
Waverunner
ff6c2d7d4c
Added GroupChat, PlanetChat, and basic chat channels
2014-04-16 16:52:11 -04:00
Light2
0ec275cf7b
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
...
Conflicts:
src/services/bazaar/BazaarService.java
2014-04-15 01:12:44 +02:00
Light2
bd0a30aa96
Added basic bazaar functionality - see extended
...
Categories are not working right now, Auctions and Vendors are not yet
implemented
2014-04-15 01:11:33 +02:00
Treeku
b968b9ad1f
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-04-13 19:41:33 +01:00
Seefo
1b1294136a
Fixed a bunch of vehicle bugs - will probably change the way vehicles are being handled soon to account for other vehicle templates
2014-04-13 13:37:54 -04:00
Treeku
7cee1990b5
Serial number uses attribute
2014-04-13 16:33:18 +01:00
Light2
cf9bcf66f9
Fixed vehicles
2014-04-13 17:17:25 +02:00
Treeku
432700ab20
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-04-13 13:19:57 +01:00
Treeku
33614f4c48
Moved factionStatus from CREO to TANO
2014-04-13 11:06:27 +01:00
CharonInferar
fa00c85290
Swoop is mountable for further tests
2014-04-13 03:50:45 +02:00
Treeku
03c5201cf4
Command fixes, command removing
2014-04-13 00:29:30 +01:00
Treeku
e91362a12f
Fixed most warnings
2014-04-10 11:52:09 +01:00
Waverunner
931404bf3f
Organized chat packets, disabled chat channels temporarily
2014-04-09 18:50:14 -04:00
Seefo
8025bc7ad0
Changes to housing, added real player lot count to character sheet
2014-04-09 11:56:56 -04:00
Treeku
615a998384
Made cooldowns more efficient
...
Isn't really necessary for them to have their own thread each.
There's an old trick from a time before thread pools were possible: System.currentTimeMillis().
2014-04-07 14:47:56 +01:00
Treeku
124fb6747f
Minor cooldown change
2014-04-06 22:52:45 +01: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
Seefo
890d395e3a
Fixed an armour calculation bug
2014-04-05 14:37:42 -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
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
Seefo
f6c03c19aa
Fixed remove skill mod error, some equipment stuff aswell
2014-04-03 13:42:53 -04:00
Treeku
0683983710
Added null check for removing skillMods
2014-04-03 18:01:52 +01:00
Treeku
40e17095f7
Fixed crash
2014-04-03 17:14:38 +01:00
Treeku
401c575ead
Fixed skillMod-related crash
2014-04-03 16:59:09 +01:00
Treeku
977f18e533
Fixed error
2014-04-03 16:54:38 +01:00
Treeku
4f45f62d0b
Updated skillMod baseline, removed old deltas
2014-04-03 16:51:20 +01:00
Treeku
d187b0b3ea
Removed skillModUpdateCounter functions
2014-04-03 16:46:12 +01:00
Treeku
ef1d499a97
Uncommented line in sendListDelta()
2014-04-03 16:39:32 +01:00
Treeku
121ec2b408
And one other thing
2014-04-03 16:36:30 +01:00
Treeku
de21f01934
Forgot something
2014-04-03 16:35:33 +01:00
Treeku
967aba6652
Fixed skillMods
2014-04-03 16:34:30 +01:00
Light2
4c5ff93385
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-04-02 18:12:20 +02:00
Light2
b245efdce6
Finished NPC conversations, fixed disconnect bug, fixed AI atk speed check
2014-04-02 18:12:08 +02:00
Waverunner
57922d6892
Fixed #336 , Fixed #320 , able to use basic dance
2014-04-01 17:26:46 -04:00
Light2
760e9726a9
more work on conversations
2014-04-01 15:31:14 +02:00
Treeku
f8036f8f83
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-03-31 17:29:36 +01:00
Treeku
2ac9872498
Speedbuff fix moved from java to skillMod script
2014-03-31 17:29:10 +01:00
Seefo
c3e784f76f
Buffs now fallback on ... read extended
...
Buffs now fallback onto buffs.iff if no script currently exists for the
buff.
2014-03-31 12:26:03 -04:00
Light2
dc03c31276
fixed #337 and removed some lock contention
2014-03-31 01:18:52 +02:00
Waverunner
235ee34056
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-03-29 20:08:29 -04:00
Waverunner
f6bf134bad
Fixed #266 and added stealth for GM
2014-03-29 20:08:21 -04:00
Light2
2568c94b9a
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-03-30 00:55:22 +01:00
Treeku