Commit Graph
3348 Commits
Author SHA1 Message Date
Waverunner d192dbea93 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-08-10 13:06:22 -04:00
Waverunner df8d6e64cb Added missing logs folder 2014-08-10 13:05:56 -04:00
tacef be29cd025e Merge pull request #1132 from tacef/master
Fixed Typo's in Standard Issued box and trader shirt
2014-08-10 18:04:20 +02:00
tacef 1c351d723e Fixed Typo's in Standard Issued box and trader shirt 2014-08-10 18:03:44 +02:00
CharonInferar c23bb42d4f Merge pull request #1131 from CharonInferar/Invasions
Respawn temp fix
2014-08-10 17:59:35 +02:00
CharonInferar 92057107b0 Respawn fix
- Disabled respawn for static NPCs for now
2014-08-10 17:57:13 +02:00
Waverunner 0f801210ba Added bounty droids to CBT 2014-08-10 17:52:33 +02:00
Waverunner b66786eae7 Added bounty droids to CBT 2014-08-10 10:53:31 -04:00
CharonInferar e2e0a4d843 Merge pull request #1129 from CharonInferar/Invasions
GCW Invasions partial commit 1
2014-08-10 15:45:12 +02:00
CharonInferar 724ab44bfb Extended clean up 2014-08-10 15:32:16 +02:00
CharonInferar 30b521c8bf Cleaned up classes 2014-08-10 15:17:01 +02:00
CharonInferar 058a3549e7 Merge remote-tracking branch 'origin/master' into Invasions 2014-08-10 14:28:41 +02:00
CharonInferar 1cd1e95783 Fixes NPC respawn and more
- Static NPCs now respawn with a cloned AI behaviour
- Setgodmode toinvasion teleports to the current invasion city
- Clean up of classes
2014-08-10 14:22:15 +02:00
tacef 661e3db88d Merge pull request #1127 from tacef/master
Updated Standard Issued Clothing box
2014-08-10 12:55:20 +02:00
tacef c62e3295c7 Removed Misnamed script 2014-08-10 12:53:58 +02:00
tacef a9e01dd940 Added Trader Belt custom script
Fixed typo's in several custom scripts
2014-08-10 12:53:21 +02:00
tacef e086501289 Merge pull request #31 from ProjectSWGCore/master
Fork update
2014-08-10 08:36:21 +02:00
Viaron cd559c9ffb Fixed small /credits bug 2014-08-10 00:51:14 -04:00
Zing c832899be7 Merge pull request #1125 from Obique/master
Added null check to get rid of 'NULL Session' spam
2014-08-09 15:50:26 -07:00
Obique e38affbe64 Added null check to get rid of 'NULL Session' spam 2014-08-09 17:26:38 -05:00
Obique d8272b925a Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-08-09 17:20:38 -05:00
Obique 55998f3dc4 Changed ObjectService so that 'SelectCharacter' only outputs when there is an issue 2014-08-09 17:17:06 -05:00
Obique a99582da9e Improved logging for NULL Session errors 2014-08-09 17:16:29 -05:00
Waverunner 2e75847600 Changed it so new players granted level 5
This fixes problem that prevents players not being able to level up
since they are technically considered -1 when they are first created
which is why setgodmode level 1 would allow exp gains.
2014-08-09 17:43:26 -04:00
tacef a8ed410b6a Merge pull request #30 from ProjectSWGCore/master
Fork update
2014-08-09 22:40:03 +02:00
Waverunner e4cacd26ec Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-08-09 16:36:22 -04:00
Waverunner b39ee0de2a Added logging for exceptions that are never caught (disabled by default) 2014-08-09 16:35:58 -04:00
tacef f2c37d9931 Merge pull request #29 from ProjectSWGCore/master
Fork update
2014-08-09 22:35:43 +02:00
Waverunner 7fc3f71549 Merge pull request #1123 from Obique/master
Fixed the character reuse bug
2014-08-09 16:33:33 -04:00
Obique 90e526dabe Fixed the character reuse issue in the engine 2014-08-09 15:19:25 -05:00
Obique b606fd7bb9 Fixed null pointer exceptions being thrown with objectMutex issues 2014-08-09 15:17:30 -05:00
Obique ca7d0f1751 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-08-09 14:47:29 -05:00
Waverunner dd2d4cfe93 Fixed wrong directory location from commit #e16e037 2014-08-09 13:15:57 -04:00
Obique 80ae2392ed Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-08-09 12:10:34 -05: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
Obique 2ae903285d Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-08-09 11:32:09 -05:00
CharonInferar 0f8466bf44 Merge conflict resolve 2014-08-09 18:17:01 +02: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