projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-28 13:12:54 -04:00
Code Issues Projects Releases Wiki Activity
3,297 Commits 11 Branches 4 Tags
dd2d4cfe9354813383f2935c4ca8a2b5fdd00afa
Commit Graph
3297 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Waverunner dd2d4cfe93 Fixed wrong directory location from commit #e16e037 2014-08-09 13:15:57 -04:00
Waverunner 90fc62ccff Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-08-09 13:06:44 -04:00
Waverunner 4615f10537 Fixed skills set not being initialized 2014-08-09 13:06:28 -04:00
tacef a8a824b8a7 Merge pull request #1122 from tacef/master 
Changed Several Customtemplates to use Datatable for weapontype
 2014-08-09 17:57:49 +02:00
tacef f50d0a394a Changed Several Customtemplates to use Datatable for weapontype 2014-08-09 17:56:50 +02:00
CharonInferar 311592d4b0 Merge pull request #1120 from CharonInferar/RifleBugFix2 
Fixed RifleBug preliminarily
 2014-08-09 17:54:04 +02:00
CharonInferar 4af373b44e Fixed RifleBug preliminarily 2014-08-09 17:52:54 +02:00
tacef 03a5b13749 Merge pull request #1119 from tacef/master 
Added Customscripts for Starter Clothings
 2014-08-09 15:14:43 +02:00
tacef b9a17dd384 Added Customscript for Entertainer boots 2014-08-09 15:13:12 +02:00
tacef d7e768c898 Added Customscripts for Starter clothings 
Removed NoTrade from Jedi Training Polearm
 2014-08-09 15:13:00 +02:00
tacef 1113012ef1 Merge pull request #1117 from tacef/master 
Added Standard Issued Clothing box
 2014-08-09 09:11:30 +02:00
tacef f03b39cc7e Added Standard Issued Clothing box 
Todo: Custom scripts for some items.
 2014-08-09 09:09:43 +02:00
Viaron 611ab2f119 Changed /setRank System Messages 2014-08-09 02:11:04 -04:00
Viaron 9ab377d5ee Changed /credits Command 2014-08-09 02:08:04 -04:00
Viaron d0ee346f02 Changed Admin Command System Messages 
Changed /broadcastGalaxy
Changed /broadcastPlanet
Temporarily disabled /broadcast
 2014-08-09 01:54:32 -04:00
Viaron b67ba22d75 Updated other Admin Command System Messages 2014-08-09 01:31:45 -04:00
Viaron 01406dbce0 Changed Teleport Command(s) System Messages 2014-08-09 01:22:49 -04:00
Viaron 79ab866a69 Changed /server System Messages 2014-08-09 01:13:47 -04:00
Viaron 3834ff7394 Merge branch 'master' of https://github.com/projectswgcore/ngecore2 2014-08-09 00:48:13 -04:00
CharonInferar 4a99e3c36f Merge pull request #1116 from CharonInferar/RifleBugFix 
Removed rifles from frog temporarily to prevent client-lockups
 2014-08-09 02:56:29 +02:00
CharonInferar 0ce705ec8a Commit to kick pull request (Github bug) 
self-explanatory
 2014-08-09 02:53:02 +02:00
CharonInferar 73180b5f83 Removed rifles from frog temorarily to prevent client-lockups 2014-08-09 02:48:14 +02:00
CharonInferar 20329e752d Merge pull request #1115 from CharonInferar/RifleBugFix 
Little fix for Weapon Object commit
 2014-08-09 02:38:55 +02:00
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