projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-06 21:12:59 -04:00
Code Issues Projects Releases Wiki Activity
2,337 Commits 11 Branches 4 Tags
2c4ceb7a87b56ef83f8566c47395f4c2b76d3bc2
Commit Graph
2337 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bronco69 2c4ceb7a87 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-06-04 02:44:19 +02:00
Bronco69 0a2e4d26d5 SkillMod "healing health" added 
skillMod working now. same as "healing action"
now Officer "Last Stand" works perfect and grants health + action on
death of officer => not for group yet
 2014-06-04 02:44:11 +02:00
Treeku 29a07b1b54 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-06-04 01:38:12 +01:00
Treeku e8104467a3 Minor movement changes for vehicles 2014-06-04 01:00:28 +01:00
Treeku e1a02b477d Caught exception in lootService temporarily 2014-06-04 00:56:44 +01:00
Treeku d1bae969c7 Fixed arrayOutOfBounds error with bounties 2014-06-03 20:08:39 +01:00
CharonInferar e19a345b58 Merge pull request #779 from CharonInferar/RLS_Update 
Rls quick fix
 2014-06-03 20:52:05 +02:00
CharonInferar 1886b6ca93 Fixed animal hide rack, added Bio-Linking for all objects 
Dropping schematics is prevented by :
https://github.com/projectswg/engine/blob/master/src/engine/resources/objects/Baseline.java#L446

All objects can be bio-linked now
 2014-06-03 20:48:53 +02:00
CharonInferar 32fcf9fbf3 Merge remote-tracking branch 'origin/master' into RLS_Update 2014-06-03 14:38:37 +02:00
CharonInferar 197635fed3 fix 2014-06-03 14:35:15 +02:00
Treeku a21e905c40 Fixed officer_1a.py error 2014-06-03 02:08:30 +01:00
Ziggeh 65d598f72c Fixed spy roadmap script 2014-06-03 02:06:25 +02:00
Treeku 42e0c248c5 Merge pull request #773 from Mesagoppinmypants/patch-101 
Updated Officer Roadmap Script
 2014-06-02 22:15:38 +01:00
Mesagoppinmypants 253cef954d Updated Officer Roadmap Script 2014-06-02 17:14:13 -04:00
Treeku fbf10fdd3f Merge pull request #772 from Mesagoppinmypants/patch-100 
Added Issued Spy Ring Roadmap Reward
 2014-06-02 22:01:40 +01:00
Mesagoppinmypants fa4163f597 Added Issued Spy Ring Roadmap Reward 
Scripted with correct stats.
 2014-06-02 16:56:40 -04:00
Treeku 099f75fbb2 Merge pull request #771 from Mesagoppinmypants/patch-99 
Added Roadmap Reward Spy Issued Backpack
 2014-06-02 21:53:52 +01:00
Mesagoppinmypants 2e45d69a87 Added Roadmap Reward Spy Issued Backpack 
Scripted with correct stats.
 2014-06-02 16:53:08 -04:00
Treeku 73ec9a5766 Merge pull request #770 from Mesagoppinmypants/patch-98 
Scripted Spy Roadmap Reward Necklace
 2014-06-02 21:49:41 +01:00
Mesagoppinmypants 0f0aa1048d Scripted Spy Roadmap Reward Necklace 
Scripted with correct stats.
 2014-06-02 16:48:40 -04:00
Treeku f6fdcb6b65 Merge pull request #768 from Mesagoppinmypants/patch-96 
Added Roadmap Reward Belt of the Spy
 2014-06-02 21:45:47 +01:00
Treeku bf585c0e84 Merge pull request #767 from Mesagoppinmypants/patch-95 
Added Spy Roadmap Clicky
 2014-06-02 21:45:35 +01:00
Mesagoppinmypants e383b52a05 Added Roadmap Reward Belt of the Spy 
Scripted with correct stats.
 2014-06-02 16:44:04 -04:00
Treeku 72660b87ec Merge pull request #766 from Mesagoppinmypants/patch-94 
Added Spy Roadmap Carbine
 2014-06-02 21:32:26 +01:00
Treeku eb24b3a8da Merge pull request #765 from Mesagoppinmypants/patch-93 
Added Spy Roadmap Pistol
 2014-06-02 21:32:10 +01:00
Mesagoppinmypants b438d6948d Added Spy Roadmap Clicky 
Added the Spy Clicky Roadmap reward.
 2014-06-02 16:31:38 -04:00
Mesagoppinmypants fd80966222 Added Spy Roadmap Carbine 
Added the Spy Carbine Roadmap reward with accurate details.
 2014-06-02 16:27:30 -04:00
Treeku 7674198e59 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-06-02 21:24:50 +01:00
Mesagoppinmypants ffeff7012b Added Spy Roadmap Pistol 
Added the Spy Pistol Roadmap reward with accurate details.
 2014-06-02 16:21:49 -04:00
Treeku 1f18e8c585 Combat ends if no defenders 
Some commands put you in combat even without a defender, so this will
end that combat after a few seconds.
 2014-06-02 17:58:13 +01:00
CharonInferar 758afe3509 Merge pull request #764 from CharonInferar/RLS_Update 
RLS update
 2014-06-02 16:41:38 +02:00
CharonInferar 5687471ff4 Merge remote-tracking branch 'origin/master' into RLS_Update 2014-06-02 16:23:26 +02:00
Ziggeh 87e3a0f1ee Merge pull request #752 from Mesagoppinmypants/patch-92 
Updated Spy Roadmap Script
 2014-06-02 11:55:01 +02:00
Light2 5afdafae86 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-06-02 00:08:35 +02:00
Light2 c3ad54ac8f more work on bazaar categories 2014-06-02 00:08:22 +02:00
Treeku ba4912de02 Merge pull request #757 from tacef/master 
More Work on NPC Scripts
 2014-06-01 21:30:23 +01:00
CharonInferar 515410703a Fix 2014-06-01 22:21:38 +02:00
tacef 9ac74b48c5 More Work on Junkdealer Scripts 
Added some Junkdealers to moenia, mos espa und nyms stronghold.
 2014-06-01 21:28:42 +02:00
CharonInferar 0bbe63e760 Master merge 2014-06-01 20:53:37 +02:00
CharonInferar b768272ef2 Biolinking and buff item procs added 
Rare buff items now have a working proc
 2014-06-01 20:29:36 +02:00
tacef fc361c867c Merge pull request #10 from ProjectSWGCore/master 
Fork Update
 2014-06-01 20:06:40 +02:00
tacef 18318d8715 More Work on NPC scripts 
Added Junkdealers to Corellia( a lot Coords missing)
Added Junkdealers to Naboo(a lot Coords missing)
 2014-06-01 14:19:55 +02:00
tacef 26a0052c8e More Work on NPC scripts 
Added some Junkdealers to Tatooine
Added Junkdealsers to Planetary Map
 2014-06-01 11:11:08 +02:00
tacef 9a54b2ec5c More Work on NPC Scripts 
Added Reb recruiters(rotation need to be worked on)
Moved Recruiters to factional_recruiters file
Added Rec recruiters to planetary map
 2014-06-01 09:12:14 +02:00
Light2 e8b6a46701 fixed item categories 2014-06-01 01:49:48 +02:00
Light2 69238ffddb fixed cast error 2014-05-31 22:53:44 +02:00
Treeku da7f7c1f2c Fixed NumberFormatException 2014-05-31 21:32:40 +01:00
Treeku 76b5f7e4d5 Fixed minor error 2014-05-31 21:14:41 +01:00
Treeku 8910f726d1 Added reuseTime cooldowns for objects not in table 2014-05-31 21:09:51 +01:00
Treeku edf94a5c60 Merge pull request #754 from tacef/master 
More Work on NPC's
 2014-05-31 20:40:07 +01:00