projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-19 09:02:54 -04:00
Code Issues Projects Releases Wiki Activity
3,273 Commits 11 Branches 4 Tags
05dca03015b0f447e9efcbfb70e64ab6428a8d6a
Commit Graph
3273 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CharonInferar 05dca03015 Little fix for WeaponObject Commit 2014-08-09 02:36:10 +02:00
CharonInferar 1047348e1a Merge remote-tracking branch 'origin/master' into RifleBugFix 2014-08-09 02:24:17 +02:00
CharonInferar eff80089a1 Merge remote-tracking branch 'upstream/master' 2014-08-09 02:23:05 +02:00
CharonInferar e6e973285d Merge pull request #1114 from Treeku/WeaponObjectRefactor 
Weapon object refactor
 2014-08-09 02:21:41 +02:00
CharonInferar d010a6b3f3 Analyzed rifle bug 2014-08-09 02:20:58 +02:00
Treeku e634b5e62e Refactored WeaponObject 2014-08-09 01:04:47 +01:00
CharonInferar 16e2528569 Merge remote-tracking branch 'upstream/master' 2014-08-09 01:36:45 +02:00
CharonInferar 560df308de Revert "Fix of Rifle bug part1" 
This reverts commit e79d1ad9d0.
 2014-08-09 01:35:47 +02:00
CharonInferar e79d1ad9d0 Fix of Rifle bug part1 2014-08-09 01:33:01 +02:00
Zing a740d4700e Merge pull request #1106 from Iosnowore-Kun/master 
Removed Level Restriction From GCW Scout Trooper Boots and Gloves And Added Armor Restriction Like They Were On Live, Also Fixed Some Officer Roadmap Rewards
 2014-08-08 14:24:44 -07:00
Treeku dddf1d2c44 Merge pull request #1 from ProjectSWGCore/master 
Revert "Refactored WeaponObject"
 2014-08-08 22:15:17 +01:00
Treeku 51c14284eb Revert "Refactored WeaponObject" 
This reverts commit 6b8461f1a5.
 2014-08-08 21:53:18 +01:00
Treeku 6b8461f1a5 Refactored WeaponObject 2014-08-08 20:21:26 +01:00
CharonInferar cda47597a9 Merge pull request #1112 from CharonInferar/LairUpdate 
Added Lair template overloads and Boss spawns for lairs
 2014-08-08 18:32:24 +02:00
CharonInferar d3a7d47b1a Added Lair template overloads and Boss spawns for lairs 
- Content devs can now add lairCRC vectors and bosses
- The boss spawns will only work after the invasion commit because then
lairs will get health bars and the lair will spawn more waves
 2014-08-08 18:25:57 +02:00
Iosnowore-Kun 3e9bc0cab9 Merge branch 'ProjectSWGCore-master' 2014-08-08 12:09:42 -04:00
Iosnowore-Kun 27acd64ffe Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 into ProjectSWGCore-master 2014-08-08 12:09:03 -04:00
Iosnowore-Kun 0fececd1d7 Fixed Mistake In Previous Commit 2014-08-08 12:00:09 -04:00
[email protected] 891af42ddd Added No Trade to More Roadmap Rewards 2014-08-08 11:56:27 -04:00
Waverunner 92a207056f Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	src/resources/objects/creature/CreatureObject.java
 2014-08-08 10:05:09 -04:00
Waverunner 3003a3b62e Fixed wrong SWG collection type for Skills and added missing params causing a crash 2014-08-08 10:02:48 -04:00
Waverunner 327a794044 Merge pull request #1110 from zingzing175/master 
Fxied GCW Rank commands not being rewarded, Fixed GCW rank armor stats. Reverted commit d9ca531 (causes crash on zone in) Added /server admin command needs.
 2014-08-08 10:01:32 -04:00
Zing dff394c077 Configured /server admin command for server related needs. 
Added initiateStop to NGECore.
 2014-08-07 23:49:20 -07:00
Zing 04f41a0f41 Revert "Removed printAnalysis for CREO3 baseline, Added SWGList for Skills" 
This reverts commit d9ca531c5d.
 2014-08-07 21:47:43 -07:00
Zing 5cbdfa7551 Merge pull request #2 from ProjectSWGCore/master 
pull
 2014-08-07 21:37:46 -07:00
Iosnowore Kun 8fecec9d56 Fixed Some Errors In Previous Commit 2014-08-08 00:26:30 -04:00
Iosnowore Kun f4bf11522b Added No Trade To Most Roadmap Rewards and Added More Trader Rewards 
Also removed the spy roadmap belt because it doesn't have one in the
item_rewards ToC
 2014-08-08 00:22:48 -04:00
Zing bae95657d8 Fixed GCW rank commands not being rewarded, 
Fixed GCW rank armor stats.
 2014-08-07 21:15:05 -07:00
Viaron 8ae66375da Added Transfer of Several Admin Commands by Zing 2014-08-07 23:27:21 -04:00
Iosnowore Kun 73621353a5 Fixed Some More Officer Roadmap Reward Mistakes 2014-08-07 23:19:17 -04:00
Iosnowore Kun 298fd1694e Removed Stats for Scout Trooper Helmet Considering It's a Crafted Armor Piece 2014-08-07 23:06:45 -04:00
Iosnowore Kun 72fba9b5bc Revert "Revert "Removed Level Restriction From GCW Scout Trooper Boots and Gloves And Added Armor Restriction Like They Were On Live"" 
This reverts commit 3ee4733c41.
 2014-08-07 22:45:36 -04:00
Ziggeh 67e823078e Merge pull request #1105 from ProjectSWGCore/revert-1104-master 
Revert "Removed Level Restriction From GCW Scout Trooper Boots and Glove...
 2014-08-08 04:32:53 +02:00
Ziggeh 3ee4733c41 Revert "Removed Level Restriction From GCW Scout Trooper Boots and Gloves And Added Armor Restriction Like They Were On Live" 2014-08-08 04:32:44 +02:00
Ziggeh ced0b604e1 Merge pull request #1104 from Iosnowore-Kun/master 
Removed Level Restriction From GCW Scout Trooper Boots and Gloves And Added Armor Restriction Like They Were On Live
 2014-08-08 04:29:02 +02:00
Iosnowore Kun d6d78dcbb7 Fixed Officer Pistol Roadmap Reward 2014-08-07 22:14:26 -04:00
Iosnowore Kun 5f72a08f92 Removed Level Restriction From GCW Scout Trooper Boots and Gloves And Added Armor Restriction Like They Were On Live 2014-08-07 22:06:57 -04:00
Iosnowore Kun 5d4dbe1e76 Merge branch 'ProjectSWGCore-master' 2014-08-07 21:26:41 -04:00
Waverunner d9ca531c5d Removed printAnalysis for CREO3 baseline, Added SWGList for Skills 2014-08-07 17:56:30 -04:00
Waverunner 79de1c89ce Fixed group decline message being sent to invited instead of leader 2014-08-07 17:21:52 -04:00
tacef cdd85219e8 Merge pull request #1101 from tacef/master 
Changed Removed Frogbuilding placed Frog only
 2014-08-07 20:17:26 +02:00
tacef 83d97679a7 Changed Removed Frogbuilding placed Frog only 2014-08-07 20:16:41 +02:00
tacef 25d301d406 Merge pull request #1100 from tacef/master 
Fixed Readded Frogbuilding in Mos Espa
 2014-08-07 19:35:53 +02:00
tacef aabe5c5b9a Fixed Readded Frogbuilding in Mos Espa 2014-08-07 19:34:45 +02:00
Waverunner 544b8194fe Merge pull request #1087 from voronius/master 
Fix for 139 - bug of inspiration buff stacking
 2014-08-07 10:29:57 -04:00
tacef e2321b83f4 Merge pull request #1088 from tacef/master 
Added Dantooine Lairs
 2014-08-06 19:55:38 +02:00
tacef 92cf013629 Added Dantooine Lairs 
Added Baby Bol NPC's
Changed Several Lairs to be more acurate to Live
 2014-08-06 19:52:58 +02:00
voronius 76b552bc29 Fix for 139 part 2 
Inspiration buffs should no longer stack -
https://www.youtube.com/upload. Removed a new file I shouldn't have
commited.
 2014-08-06 20:20:29 +03:00
voronius 3b1568339d Fix for issue 136 
Fix for issue 136. Inspiration buffs should no longer stack.
 2014-08-06 20:05:04 +03:00
tacef ec694a911c Merge pull request #1082 from tacef/master 
Added Corellian Lairs
 2014-08-06 13:56:04 +02:00