projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-27 12:12:51 -04:00
Code Issues Projects Releases Wiki Activity
918 Commits 11 Branches 4 Tags
dc03c31276f7c8e7739b9847bcdcf0fb8cf97fbe
Commit Graph
918 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Light2 dc03c31276 fixed #337 and removed some lock contention 2014-03-31 01:18:52 +02:00
Seefo ba3b423ea6 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-30 16:23:40 -04:00
Seefo 86fd82c5a8 Added command to change customization of objs 2014-03-30 16:23:29 -04:00
Light2 c7875503d6 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-30 22:05:07 +02:00
Light2 814f800dbf Added cleanup method for creature ODB. 2014-03-30 22:04:20 +02:00
Seefo 523e409e99 Temp fix for being stuck in combat 2014-03-30 15:37:00 -04:00
Waverunner bf0d27f8b2 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-30 15:09:55 -04:00
Waverunner 64bfdb2b8b Added pistol to frog, more work on chat channels 2014-03-30 15:09:48 -04:00
Light2 6c1df547b4 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-30 21:02:57 +02:00
Light2 7bb65bb0bf Added /teleporttarget GM command 2014-03-30 21:02:45 +02:00
Seefo f5853e622e Added random lightsaber colours to frog 2014-03-30 14:29:44 -04:00
Seefo dc8e4c5db0 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-30 14:19:00 -04:00
Seefo 248d325c6b Added customization variables 2014-03-30 14:18:48 -04:00
Light2 10e42e31d8 Small fix 2014-03-30 20:09:06 +02:00
Light2 a744deb07f optimised collision detection 2014-03-30 20:02:35 +02:00
Seefo 8b4d7ae4da Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-29 20:21:10 -04:00
Seefo c71c4bf075 Added NPC stuff, read extended 
Added a jedi_master npc, added support for custom weapons for creatures.
 2014-03-29 20:20:57 -04: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
Light2 a6d91379fe temp fix for /pvp bug, fixed null pointer on buffing ai 2014-03-30 00:54:09 +01:00
Seefo bad39e8fc3 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-29 19:31:25 -04:00
Seefo 6d96545dd9 #283 should be fixed 2014-03-29 19:31:13 -04:00
Waverunner 4609a05780 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-29 19:09:53 -04:00
Waverunner 75f72fe7dc Fixed #314 2014-03-29 19:09:45 -04:00
Seefo 19e42e6e40 Fixed #293 (Flying AI) 2014-03-29 19:04:29 -04:00
Waverunner f9dfc0a766 Fixed #313 2014-03-29 18:36:31 -04:00
Waverunner 00d8f277f1 Cloning Window sent on zone-in if dead 2014-03-29 17:47:06 -04:00
Waverunner 352cc1cd5e Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-29 16:48:01 -04:00
Waverunner dfab6ac265 Fixed #308 and added foundation work for chat channels 2014-03-29 16:47:05 -04:00
Seefo 26053c7baa Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-29 16:11:21 -04:00
Seefo 85582bdd29 Fixed a trade bug and a /open bug 2014-03-29 16:11:10 -04:00
Light2 308c6c30d2 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-29 21:01:00 +01:00
Light2 4fe5e6614e temp fix for /pvp 2014-03-29 21:00:51 +01:00
Light2 e7cf35d749 Merge pull request #302 from Ziggeh/master 
CombatService - Added method for drain heals
 2014-03-29 20:04:32 +01:00
Ziggeh 3ad4aad96d Armor - Protection is added to character sheet 2014-03-29 19:48:07 +01:00
Seefo 8268359ec2 Reverted temporary fix for #295 b/c #295 is fixed 2014-03-29 14:09:54 -04:00
Seefo 7a75e5ef0b Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-29 14:01:12 -04:00
Seefo 68ebfae145 Fixed expertise exploit 2014-03-29 14:01:00 -04:00
Light2 dce91cc2d2 reverted fix 2014-03-29 18:56:59 +01:00
Light2 7376be7b95 fixed bug where character wouldnt gain any abilities on using the frog to get lvl 90 2014-03-29 18:42:24 +01:00
Light2 dfd7f1e9a9 Fixed bug where group wouldnt show up when player loaded a new scene 2014-03-29 18:32:29 +01:00
Light2 c8600fe6e1 fixed concurrency error 2014-03-29 18:21:05 +01:00
Light2 7878e2a589 fixed bug where revive window was showing up for the medic 2014-03-29 18:19:59 +01:00
Light2 b930a66573 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-29 17:35:44 +01:00
Light2 d7784f4d25 Added exception handling for AI 2014-03-29 17:35:31 +01:00
Ziggeh 21149a55af Merge remote-tracking branch 'upstream/master' 2014-03-29 17:00:09 +01:00
Seefo 01ffdb3c42 Fixed healing of AI, temp fix for faction error 2014-03-29 11:59:19 -04:00
Ziggeh 5ea7a1497d Merge remote-tracking branch 'upstream/master' 2014-03-29 14:17:58 +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