Commit Graph
1359 Commits
Author SHA1 Message Date
CharonInferar 06dbf59c63 cleanup 2014-04-15 19:38:43 +02:00
CharonInferar 5bc314f569 Merge remote-tracking branch 'origin/master' into LootUpdate 2014-04-15 19:25:50 +02:00
CharonInferar ca1d61a726 Merge remote-tracking branch 'upstream/master' 2014-04-15 19:19:31 +02:00
CharonInferar 58b56070cd preliminary armor drops test
Default weapon spawn fixed
Mobile templates must now assign weapon attack speed and weapon type
dueto it not being determinable from template
2014-04-15 19:15:12 +02:00
Bronco69 4522e36821 Added Commando roadmap rewards 2014-04-15 18:10:46 +02:00
Bronco69 8abfe0df41 Added Katarn Armor to frog 2014-04-15 13:08:00 +02:00
CharonInferar 4fa44e412d More loot items added
Tusken Raider Clothing
Gaffis
CDEF Rifles
Worked on weapon drops and giving them stats
Refactored the item scripts to use lists to  allow random templates
Tweaked the drop chances to be close to how they were in live
2014-04-15 04:34:50 +02:00
Light2 0ec275cf7b Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/services/bazaar/BazaarService.java
2014-04-15 01:12:44 +02:00
Light2 bd0a30aa96 Added basic bazaar functionality - see extended
Categories are not working right now, Auctions and Vendors are not yet
implemented
2014-04-15 01:11:33 +02:00
Treeku 53491a1072 Merge pull request #443 from Mesagoppinmypants/patch-21
Armor Sprint Now Grants Correct Ability
2014-04-14 22:26:38 +01:00
Mesagoppinmypants 48a3f85aef Armor Sprint Now Grants Correct Ability 2014-04-14 15:29:10 -04:00
CharonInferar 9824cbfdaf Merge remote-tracking branch 'origin/master' into LootUpdate 2014-04-14 20:01:19 +02:00
Mesagoppinmypants 2e3dd94bca Cloaked Recovery Now Grants At Correct Levels 2014-04-14 19:58:48 +02:00
Mesagoppinmypants b5578043c3 Improved Spys Fang Now Grants Abilities at Correct Levels 2014-04-14 19:58:48 +02:00
Mesagoppinmypants 076172061a Hidden Daggers Now Grants Correct Abilities 2014-04-14 19:58:47 +02:00
Mesagoppinmypants 942e8c6b0d Cloaked Attacks Now Grants Correct Abilities 2014-04-14 19:58:47 +02:00
CharonInferar 35383e0cf5 someone changed serial number data type 2014-04-14 19:58:46 +02:00
CharonInferar 15a2371aa6 restored file 2014-04-14 19:58:46 +02:00
CharonInferar 8b35a61c67 access modifer changed back 2014-04-14 19:58:45 +02:00
CharonInferar 83b701c01e more preparations
Preparations for crafting
2014-04-14 19:58:45 +02:00
CharonInferar 8077c517ff second commit 2014-04-14 19:58:44 +02:00
CharonInferar cbaf74a92e first commit of addidtions 2014-04-14 19:58:44 +02:00
Ziggeh f12ad61a9f Refactored WeaponObject
The scripting of weapons should be much, much easier now. See the
included examples in DevService.

Attributes such as attack speed and range are now being read/written to
the actual items attributes.
2014-04-14 19:58:43 +02:00
CharonInferar d355420012 weapon work 2014-04-14 19:57:06 +02:00
Treeku 0ab30e875d Merge pull request #440 from Mesagoppinmypants/patch-19
Cloaked Recovery Now Grants At Correct Levels
2014-04-14 16:45:00 +01:00
Treeku 999985360a Merge pull request #437 from Mesagoppinmypants/patch-16
Cloaked Attacks Now Grants Correct Abilities
2014-04-14 16:40:59 +01:00
Treeku 8e39e67378 Merge pull request #439 from Mesagoppinmypants/patch-18
Improved Spys Fang Now Grants Abilities at Correct Levels
2014-04-14 16:40:03 +01:00
Treeku ce8af845be Merge pull request #438 from Mesagoppinmypants/patch-17
Hidden Daggers Now Grants Correct Abilities
2014-04-14 16:39:35 +01:00
Treeku 9f75c370ab Merge pull request #424 from Ziggeh/master
Refactored WeaponObject
2014-04-14 16:34:55 +01:00
Mesagoppinmypants c87dfa3155 Cloaked Recovery Now Grants At Correct Levels 2014-04-14 10:52:54 -04:00
Mesagoppinmypants 7ed61990cb Improved Spys Fang Now Grants Abilities at Correct Levels 2014-04-14 10:23:46 -04:00
Mesagoppinmypants 3b1724c570 Hidden Daggers Now Grants Correct Abilities 2014-04-14 10:21:54 -04:00
Mesagoppinmypants aea6880442 Cloaked Attacks Now Grants Correct Abilities 2014-04-14 10:19:38 -04:00
CharonInferar c912dd75ef Looted weapons do get random stats now 2014-04-14 03:44:08 +02:00
CharonInferar 5374afe92b Merge pull request #425 from CharonInferar/Preparations
Preparations
2014-04-13 23:14:02 +02:00
CharonInferar 0c1aebb58a someone changed serial number data type 2014-04-13 23:12:32 +02:00
CharonInferar a99edcc2bc restored file 2014-04-13 23:08:29 +02:00
CharonInferar a95b8964f0 access modifer changed back 2014-04-13 23:03:40 +02:00
CharonInferar 7091c4bbb3 more preparations
Preparations for crafting
2014-04-13 22:59:31 +02:00
CharonInferar afcec36cc1 second commit 2014-04-13 22:46:02 +02:00
CharonInferar 1decfaa081 first commit of addidtions 2014-04-13 22:29:02 +02:00
CharonInferar 161a0a8859 Merge remote-tracking branch 'upstream/master' 2014-04-13 22:21:15 +02:00
Treeku b968b9ad1f Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-13 19:41:33 +01:00
CharonInferar 53c1ea65e9 merge conflict fix 2 2014-04-13 20:39:36 +02:00
Seefo 90fb528d5f Fixed #423 2014-04-13 14:38:42 -04:00
CharonInferar 27137c79c7 merge conflict fix 2014-04-13 20:13:20 +02:00
Seefo 1b1294136a Fixed a bunch of vehicle bugs - will probably change the way vehicles are being handled soon to account for other vehicle templates 2014-04-13 13:37:54 -04:00
Ziggeh 1fa24af10f Merge remote-tracking branch 'upstream/master' 2014-04-13 19:17:23 +02:00
Ziggeh cbefc25121 Refactored WeaponObject
The scripting of weapons should be much, much easier now. See the
included examples in DevService.

Attributes such as attack speed and range are now being read/written to
the actual items attributes.
2014-04-13 19:15:17 +02:00
Treeku e3c0332924 serverTemplates now load on login
Make sure your script setup() funcs don't have anything in them that
can't be run twice
2014-04-13 17:29:05 +01:00