Commit Graph
1990 Commits
Author SHA1 Message Date
Treeku 4e8eebb718 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/resources/objects/tangible/TangibleObject.java
2014-05-12 05:01:27 +01:00
Treeku 4fe246975c Fixed various bugs 2014-05-12 04:56:29 +01:00
Seefo 6cb8f40793 Small fix to last commit 2014-05-11 22:54:15 -04:00
Seefo f9e413239d Fixed a bug where respeccing wouldn't remove old abilities 2014-05-11 22:46:45 -04:00
Seefo e04ccfa965 Fixed a bug where a player would become 'grey' upon logging out 2014-05-11 22:00:17 -04:00
Seefo 1445086a58 Fixed a few bugs 2014-05-11 17:15:04 -04:00
Seefo 146df320b8 Fixed CollectionService system messages, added STF datatable to quickly obtain an entry from an STF 2014-05-11 16:21:34 -04:00
Seefo fd524a5a75 Fixed #650 and #651 2014-05-11 14:12:16 -04:00
Seefo c47ddf77df Fixed a container limit bug 2014-05-11 12:42:40 -04:00
Seefo bc25be3bed Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-11 12:24:07 -04:00
Seefo 6aca49baea Fixed container limit checks 2014-05-11 12:23:53 -04:00
Treeku 9b4272e434 Refactored ITNO 2014-05-11 16:55:52 +01:00
Treeku e052212ff2 Fixed some syntax errors 2014-05-11 16:00:29 +01:00
Treeku 60eee0d4dd Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-11 15:56:36 +01:00
Treeku e6c0866114 Engine changes 2014-05-11 15:20:15 +01:00
Treeku 67fda7163a Fixed staticService ordering 2014-05-11 12:06:08 +01:00
Treeku 4398a5ed93 Fixed another static spawn issue 2014-05-11 10:33:06 +01:00
Treeku c0481f258e Fixed static spawn issue 2014-05-11 10:19:49 +01:00
Treeku 7fd08bc7ad Baseline changes, cleaned some things 2014-05-11 09:54:50 +01:00
Treeku 837e07d822 Respawn functionality
(might want to be moved to spawnService)
2014-05-11 09:29:38 +01:00
Treeku 588e06b4ff Added respawnTime to MobileTemplate 2014-05-11 08:58:06 +01:00
Seefo 3218803ecb Updated lightsaber system messages, changed EquipmentService.canEquip to report why the actor cannot equip the item 2014-05-11 01:45:00 -04:00
Waverunner dd184b22b2 Merge pull request #647 from Mesagoppinmypants/patch-88
Updated Smoke Bomb
2014-05-10 21:53:40 -04:00
Waverunner f57444e942 Fixed setCustomizationVariable not updating customization byte array 2014-05-10 19:56:02 -04:00
Mesagoppinmypants 5651667ab8 Updated Smoke Bomb 2014-05-10 19:29:39 -04:00
Seefo 82d8108ac7 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-10 18:50:02 -04:00
Seefo fcd82aff4a Fixed looted color crystals 2014-05-10 18:49:51 -04:00
Waverunner d38bc9eb29 Changed CmdStartScene to use galacticTime
This should fix the time of day's being incorrect when using multiple
clients
2014-05-10 17:13:06 -04:00
Waverunner b5344eab07 Added bindLocation variable, clone location shows bind spot in yellow, fixed incap and db messages 2014-05-10 16:38:59 -04:00
Waverunner 994340373d Merge pull request #635 from tacef/master
Temp Fix for the Cloning Terminal
2014-05-10 15:35:47 -04:00
Waverunner 85c9fe0658 Merge pull request #636 from Mesagoppinmypants/patch-74
Added Conversation Script for Medical Droid
2014-05-10 15:35:32 -04:00
tacef 41a5bbf03f Updated Cloning Terminal so fee is level based 2014-05-10 20:11:06 +02:00
Ziggeh a6f1318f0a Merge pull request #644 from Mesagoppinmypants/patch-87
Fixed Right Bracelet of the Ghost Stats
2014-05-10 19:17:55 +02:00
Ziggeh 7e1a99f44d Merge pull request #643 from Mesagoppinmypants/patch-86
Fixed the Heroic Set Ghost Left Bracelet Stats
2014-05-10 19:17:25 +02:00
Ziggeh 96e10b5a86 Merge pull request #642 from Mesagoppinmypants/patch-85
Fixed the Heroic Set Ghost Ring's Stats
2014-05-10 19:17:07 +02:00
Mesagoppinmypants 285bda57bd Fixed Right Bracelet of the Ghost Stats
http://swg.wikia.com/wiki/The_Ghost_set?file=Bracelet.of.the.Ghost.%2528Right%2529.jpg
2014-05-10 12:52:07 -04:00
Mesagoppinmypants 28534df70c Fixed the Heroic Set Ghost Left Bracelet Stats
http://swg.wikia.com/wiki/The_Ghost_set?file=Bracelet.of.the.Ghost.%2528Left%2529.jpg
2014-05-10 12:50:17 -04:00
Mesagoppinmypants 79dbed0150 Fixed the Heroic Set Ghost Ring's Stats
http://swg.wikia.com/wiki/The_Ghost_set?file=Ring.of.the.Ghost.jpg
2014-05-10 12:47:40 -04:00
Ziggeh 81c966530c Merge pull request #641 from Mesagoppinmypants/patch-80
Fixed Necklace of the Ghost Stats
2014-05-10 18:42:19 +02:00
Mesagoppinmypants 654239c4ca Fixed Necklace of the Ghost Stats
http://swg.wikia.com/wiki/The_Ghost_set?file=Necklace.of.the.Ghost.jpg
2014-05-10 12:40:56 -04:00
Ziggeh 9ad17587b3 Changed Preparation Cooldown to a skillmod
Changed Preparation Cooldown to a skillmod on the Ghost Band
2014-05-10 18:39:03 +02:00
Ziggeh bbe6df11a0 Merge pull request #637 from Mesagoppinmypants/patch-75
Fixed Band of the Ghost Stats
2014-05-10 18:35:29 +02:00
Mesagoppinmypants a5b005b758 Fixed Band of the Ghost Stats
http://swg.wikia.com/wiki/The_Ghost_set?file=Band.of.the.Ghost.jpg
2014-05-10 12:28:56 -04:00
Ziggeh f025988ecd Merge pull request #633 from Mesagoppinmypants/patch-73
Strikethrough Now Shows Up on Character Sheet
2014-05-10 11:56:43 +02:00
Mesagoppinmypants 8d9968611b Added Conversation Script for Medical Droid 2014-05-09 23:33:11 -04:00
tacef 3d41026e51 Temp Fix for the Cloning Terminal
%DI now shows 5000, will be redone as soon as suiWindow is fixed
2014-05-10 03:37:39 +02:00
Waverunner 78b66512cc Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-09 19:18:08 -04:00
Waverunner bdfee34ff2 Bounty mission level accounts for failed attempts on target, added survey mission objective 2014-05-09 19:17:56 -04:00
Waverunner 377815835b Merge pull request #634 from tacef/master
Updated Cloning Conversation
2014-05-09 15:19:54 -04:00
tacef 283e4d694d Updated Cloningfee formula
to be more accurate to live
2014-05-09 17:07:48 +02:00