projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-15 00:07:39 -04:00
Code Issues Projects Releases Wiki Activity
1,420 Commits 11 Branches 4 Tags
ff6c2d7d4c9279c7bcd9951a670ac284158a6853
Commit Graph
122 Commits
Author SHA1 Message Date
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
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
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
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 977f18e533 Fixed error 2014-04-03 16:54:38 +01:00
Treeku d187b0b3ea Removed skillModUpdateCounter functions 2014-04-03 16:46:12 +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 2ac9872498 Speedbuff fix moved from java to skillMod script 2014-03-31 17:29:10 +01:00
Light2 dc03c31276 fixed #337 and removed some lock contention 2014-03-31 01:18:52 +02:00
Waverunner f6bf134bad Fixed #266 and added stealth for GM 2014-03-29 20:08:21 -04:00
Waverunner 75f72fe7dc Fixed #314 2014-03-29 19:09:45 -04:00
Light2 4fe5e6614e temp fix for /pvp 2014-03-29 21:00:51 +01:00
Treeku 9ff669832b calculatePvpStatus() used for everything, more... 
This ensures nothing is ever missed out of the pvpStatus calculation,
such as faction standing.  It should calculate the following:

On Leave/neutral players should be #16

Combatant players should be #35

Opposing faction SF players should be #55

Opposing Combatant NPCs should be #19

Ally SF NPCs (ie.; hoth commandos) should be #4

Enemy SF NPCs (ie. hoth resistance) should be #7

Same faction NPCs should be #0 (pink)

Attackable NPCs should be #1

Aggressive NPCs should be #2 or #3

NPCs you have negative faction standing with should be #2 or #3
 2014-03-29 09:29:34 +00:00
Waverunner ac2f2e1e17 Put cast for calculatePvpStatus in CreatureObject 2014-03-28 22:05:38 -04:00
Treeku fac85f55d5 CreatureObject uses calculatePvpStatus() 2014-03-28 23:25:32 +00:00
Light2 397a35ebad fixed null pointer at disconnect 2014-03-28 20:36:11 +01:00
Seefo f9990a2bd5 Fixed some stuff 2014-03-28 07:09:16 -04:00
Seefo 1a0b36e8f3 Fixed #197, #250, and #233 2014-03-27 17:07:14 -04:00
Seefo 7970be3656 Fixed #126, updated git ignore list 2014-03-26 22:02:19 -04:00
Waverunner c31c24d7ec Remove print in stopPerformance 2014-03-26 20:16:33 -04:00
Waverunner d15b0d83e9 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	src/services/EntertainmentService.java
 2014-03-26 20:08:30 -04:00
Waverunner 66e29893ac Added holoemotes, work on imagedesign, bug fixes, new visitor class 2014-03-26 19:53:04 -04:00
Seefo e60ffb32c5 Fixed #245, also uncommented skill mod deltas 2014-03-26 19:20:05 -04:00
Light2 c3772e3246 Added xp gain on killing NPCs, fixed some bugs, added 2 new config options 2014-03-26 23:37:10 +01:00
Light2 d1a7f20177 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	src/resources/objects/creature/CreatureMessageBuilder.java
	src/resources/objects/creature/CreatureObject.java
	src/services/PlayerService.java
 2014-03-25 20:14:16 +01:00
Light2 3e265ed6c5 some bug fixes, updated engine with support for new .trn versions, refactored some code with new Java 8 syntax, changed compiler to java 8 2014-03-25 20:08:01 +01:00
Waverunner c4093f215c Created new SkillMod class for SWGList, minor fix to Inspiration buff applying to self 
Line 1181 in CreatureMessageBuilder needs to be uncommented. When it is,
after a couple skill mod delta's are sent, a crash occurs. I'm unsure on
how to fix it.
 2014-03-24 16:25:37 -04:00