projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-05 20:12:51 -04:00
Code Issues Projects Releases Wiki Activity
905 Commits 11 Branches 4 Tags
de79b23e3cb4cbb327949b8d9698532af37ac35f
Commit Graph
603 Commits
Author SHA1 Message Date
Light2 de79b23e3c Small fix 2014-03-30 21:12:03 +02:00
Light2 d8c0b4f7df optimised collision detection 2014-03-30 21:12:03 +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
Ziggeh e39b6b498d CombatService - Added method for drain heals 
run() in the combat ability scripts now take the damage done post
mitigation etc as an argument instead of null.
 2014-03-29 06:52:03 +01:00
Waverunner ac2f2e1e17 Put cast for calculatePvpStatus in CreatureObject 2014-03-28 22:05:38 -04:00
Waverunner c33bbe291b Combat check before starting trading session 2014-03-28 21:57:00 -04:00
Waverunner 28edaec3ff Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-28 21:42:06 -04:00
Waverunner 1676324972 Fixed #285 
Also added in owner ID delta as possible fix for characters showing as
sitting state
 2014-03-28 21:41:57 -04:00
Seefo 20da16ace0 Decreased LD time before removal (5->1 min) 2014-03-28 21:22:42 -04:00
Seefo 39a9e78ef6 Temporary fix for #295 2014-03-28 21:20:11 -04:00
Treeku 9c30dbc695 Fixed expertise abilities 2014-03-29 00:19:20 +00:00
Treeku fac85f55d5 CreatureObject uses calculatePvpStatus() 2014-03-28 23:25:32 +00:00
Treeku aae66c8f11 calculatePvpStatus() returns 0 if no faction 2014-03-28 23:15:07 +00:00
Light2 d9c94f74fc fixed client crash 2014-03-28 22:03:08 +01:00
Light2 397a35ebad fixed null pointer at disconnect 2014-03-28 20:36:11 +01:00
Light2 f0a61f030d Fixed ODB save error 2014-03-28 20:02:54 +01:00