Commit Graph
2544 Commits
Author SHA1 Message Date
Ziggeh f38253d404 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-06-07 18:50:03 +02:00
Ziggeh d20b480b3e Fixed NumberFormatException 2014-06-07 18:49:59 +02:00
Treeku f5ac8270c5 Merge pull request #843 from Mesagoppinmypants/master
Scripted More Armor
2014-06-07 17:31:01 +01:00
Treeku 7238bb4b60 Merge pull request #836 from tacef/master
Added some NPC scripts to Dathomir
2014-06-07 17:29:40 +01:00
Iosnowore Kun 64753bfa44 Scripted Regular Galactic Marine Armor 2014-06-07 11:30:29 -04:00
Iosnowore Kun b201abed15 Scripted Rebel Crusader Armor 2014-06-07 11:21:00 -04:00
Iosnowore Kun e57db3c52e Scripted Galactic Marine Armor 2014-06-07 11:16:02 -04:00
Iosnowore Kun 34490a6d2f Adde Rebel Assault Forest Camouflage Armor 2014-06-07 11:06:37 -04:00
Iosnowore Kun 6f1f739224 Scripted Imperial Forest Camouflage Armor 2014-06-07 10:57:01 -04:00
Iosnowore Kun 6a99f9d434 Added Rebel GCW Battle Armor 2014-06-07 10:38:28 -04:00
Iosnowore Kun 1a51499c0b Scripted All Katarn Armor Sets
- Added Neutral Katarn Armor
- Added Imperial Katarn Armor
- Added Rebel Katarn Armor
2014-06-07 10:28:22 -04:00
tacef 577fb32a7e Merge pull request #15 from ProjectSWGCore/master
Fork  update
2014-06-07 14:47:36 +02:00
tacef 25b37c7c70 Added some NPC scripts to Dathomir 2014-06-07 14:09:50 +02:00
Seefo 2b8ba3e101 Fixed a vehicle related crash 2014-06-07 08:05:48 -04:00
Treeku 9eae0485dc Updt engine, fixed #688 #750 #712 #729 & more 2014-06-07 12:30:47 +01:00
Ziggeh c4df3a77b8 Merge pull request #835 from tacef/master
Fixed some NPC Scripts
2014-06-07 13:27:22 +02:00
tacef 1c1a8bbf03 Fixed NPC Scripts 2014-06-07 13:25:25 +02:00
Ziggeh 51817f7da0 Merge pull request #833 from ProjectSWGCore/Ziggy
MobileTemplate update
2014-06-07 08:24:52 +02:00
Ziggeh f986b9594b Merge pull request #832 from tacef/master
NPC Update
2014-06-07 08:17:44 +02:00
tacef 106c73341f Update NPCS to fit recent changes to mobiletemplate and weapontemplate 2014-06-07 07:52:32 +02:00
Ziggeh 331c09e118 Revert "Attempt at fixing exception"
This reverts commit 721ee81677.
2014-06-07 07:38:38 +02:00
Treeku 8c53699da4 Fixed collection script error 2014-06-07 06:21:44 +01:00
Ziggeh 721ee81677 Attempt at fixing exception 2014-06-07 07:15:18 +02:00
Treeku dd3a77808c Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-06-07 05:53:57 +01:00
Treeku 71855f4f82 useObject() now takes account of customTemplates 2014-06-07 05:53:08 +01:00
Treeku e9fe6effda item/collection radials adds to collection auto 2014-06-07 05:37:02 +01:00
Treeku 82f618667f Added GCW flush with success bonus 2014-06-07 05:34:51 +01:00
tacef d73c54d212 Merge pull request #14 from ProjectSWGCore/Ziggy
Ziggy
2014-06-07 05:41:34 +02:00
Treeku bb28323a7a Merge pull request #831 from zingzing175/master
Junk Loot and Holocrons
2014-06-07 04:36:40 +01:00
Zing 606a375c78 Junk Loot.... 2014-06-06 20:32:02 -07:00
Ziggeh b87cfd1e55 Merge pull request #830 from Mesagoppinmypants/master
Added More Roadmap Rewards
2014-06-07 04:29:11 +02:00
Iosnowore Kun dae9da3dec Added More Roadmap Rewards 2014-06-06 22:26:20 -04:00
Ziggeh 2aa77f8ef0 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-06-07 04:21:51 +02:00
Ziggeh 74dc0fb10d Implemented GCW officer badges 2014-06-07 04:21:46 +02:00
Ziggeh 1a59641b0d Merge pull request #829 from Mesagoppinmypants/master
Started the Entertainer Roadmap Rewards
2014-06-07 03:58:52 +02:00
Iosnowore Kun f31c058122 Started the Entertainer Roadmap Rewards 2014-06-06 21:56:35 -04:00
Ziggeh 6dcefa6d08 Updated a couple of corellian NPC scripts 2014-06-07 03:20:05 +02:00
Ziggeh 6e608a25c5 MobileTemplate weapon refactor 2014-06-07 02:25:41 +02:00
Ziggeh 45b60afc8b Merge pull request #828 from Mesagoppinmypants/master
Updated Armor/Weapons
2014-06-07 00:20:21 +02:00
Iosnowore Kun b22c67e4e1 Fixed Some Armor Bugs 2014-06-06 17:40:38 -04:00
Iosnowore Kun 99cc68a065 Fixed Some Armor 2014-06-06 16:27:08 -04:00
Iosnowore Kun 96bd12a3e8 Fixed Some Weapons 2014-06-06 16:03:16 -04:00
Iosnowore Kun ec117e27e0 Added Spy Roadmap Armor 2014-06-06 15:46:33 -04:00
Treeku 32c8e0792b Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-06-06 20:26:58 +01:00
Treeku 8a98c77869 Fixed GCW Zone crash 2014-06-06 20:26:42 +01:00
tacef 12acdb8820 Merge pull request #13 from ProjectSWGCore/master
Fork update
2014-06-06 20:26:35 +02:00
Treeku 649cceaaee Merge pull request #826 from tacef/master
More NPC work
2014-06-06 19:24:22 +01:00
tacef 7993601239 Populated Krayt Cult Cave
Added Krayt cultists
Added Bone Gnasher
2014-06-06 20:22:00 +02:00
Treeku 1478879d51 Hopefully fixed #745 2014-06-06 18:48:49 +01:00
Treeku 3cb22a320d Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-06-06 18:32:01 +01:00