Commit Graph
993 Commits
Author SHA1 Message Date
Treeku ed78dd459b Minor changes 2014-04-19 08:57:14 +01:00
Treeku b4a6ac5334 Fixed a chat crash bug 2014-04-19 08:30:12 +01:00
Treeku b050065649 Languages implemented, added OOB to spatialchat 2014-04-19 03:27:08 +01:00
Treeku 506e1f160e Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-19 00:39:51 +01:00
Treeku 7d40523833 Various vehicle fixes 2014-04-19 00:39:38 +01:00
Waverunner b6158a4014 leaveChatChannel removes from list of players channels 2014-04-18 18:14:59 -04:00
Treeku 65099a4ddf Safety improvement 2014-04-18 22:39:47 +01:00
Treeku 50e88d2300 Cut down a few warnings 2014-04-18 22:38:07 +01:00
Treeku bcbcbde34a Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/resources/objects/tangible/TangibleObject.java
2014-04-18 21:29:57 +01:00
Treeku e8a1959f9d Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	scripts/radial/vehicle.py
	src/main/NGECore.java
	src/resources/objects/creature/CreatureObject.java
	src/resources/objects/player/PlayerObject.java
	src/resources/objects/tangible/TangibleObject.java
	src/services/SimulationService.java
	src/services/combat/CombatService.java
	src/services/object/ObjectService.java
2014-04-18 21:10:53 +01:00
CharonInferar 69266f2896 Merge remote-tracking branch 'origin/master' into JunkDealer 2014-04-18 21:07:52 +02:00
CharonInferar 4f60260e53 Menu functionality improved
Lootkit implemented
Loot price and further stats considered
2014-04-18 20:57:56 +02:00
Treeku f58b7b6a5b Overhauled Mounts (still buggy) 2014-04-18 19:09:45 +01:00
tacef 9975656a97 Added Generic House Small Style 02 2014-04-18 18:16:36 +02:00
CharonInferar 2b4527e165 Conversation menu improvements
SUI window functionality
storage of items in collections
2014-04-18 04:45:12 +02:00
Levarrishawk d25ac73965 Enabled loading of all Kashyyyk TRNs
Enabled loading of all kashyyyk terrains by default.   Begun adding
"gate" transportation.
2014-04-17 22:32:18 -04:00
Waverunner 9252ebaaea Added Enter & Leave Messages for ChatRooms as well as info stats for the
room
2014-04-17 16:01:12 -04:00
Waverunner 8379c2f87b Changed Elemental to Enum 2014-04-16 19:42:49 -04:00
Waverunner 857198f32d Merge pull request #462 from Ziggeh/master
Weapon particle effects, misc enhancements
2014-04-16 19:02:10 -04:00
Waverunner da20b779cf Temporarily Fixes #442: Position secured cant be removed
The problem related to doSelfBuff always calling and thinking that the
position secured buff wanted to be added all the time, which isn't the
case. Right now I added a hasBuff check to doSelfBuff for the position
secured buff which will remove the buff. I didn't want to flat out just
remove a buff no matter what command was called because that would
affect any buffs that wanted to be refreshed and not removed.
2014-04-16 18:51:32 -04:00
Ziggeh a998b3ec44 Cleaned up CombatService and fixed buff exceptions 2014-04-17 00:46:00 +02:00
Ziggeh c7930f8281 Implemented elemental particle effects, #434 2014-04-17 00:25:54 +02:00
Ziggeh d810b60c4a WeaponObject now uses the WeaponType datatable 2014-04-16 23:29:17 +02:00
Waverunner ff6c2d7d4c Added GroupChat, PlanetChat, and basic chat channels 2014-04-16 16:52:11 -04:00
CharonInferar d820b3f90e Measures to stabilize Surveyservice
Transformed apparent non-entity-connected object-relational dependencies
into looser coupled ID-keyed relations to ensure referential integrity
Added null pointer checks
Removal of null elements out of survey tool collection
2014-04-16 19:48:24 +02:00
CharonInferar c78a213e2b Merge remote-tracking branch 'origin/master' into SurveyingFix 2014-04-16 19:31:52 +02:00
Seefo b0a4204a49 Fixed an issue where saber reflect would not be granted upon speccing it in expertise - fixed a vehicle radial bug 2014-04-16 13:27:12 -04:00
CharonInferar 2e30b791bf Measures to stabilize Surveyservice
Transformed apparent non-entity-connected object-relational dependencies
into looser coupled ID-keyed relations to ensure referential integrity
Added null pointer checks
Removal of null elements out of survey tool collection
2014-04-16 19:25:07 +02:00
Ziggeh 2a5855f5ef Updated weapons to use the WeaponType datatable 2014-04-16 18:42:25 +02:00
CharonInferar d123415605 Improvements on loot system
Loot icon
Loot system messages
2014-04-16 18:14:10 +02:00
ZiggehandCharonInferar f97399c0b1 Revert "Added Katarn Armor to frog"
This reverts commit 8abfe0df41.
2014-04-16 18:14:10 +02:00
CharonInferar e3ed8a1ab6 Loot window added
Loot window implemented
Loot info effect added
2014-04-16 18:14:09 +02:00
ZiggehandCharonInferar 9fd7efa2a1 Weapons - Created datatable of WeaponTypes 2014-04-16 18:14:08 +02:00
ZiggehandCharonInferar d2da758fdb Weapons - Fixed #446 2014-04-16 18:14:08 +02:00
ZiggehandCharonInferar d85183165f Weapons - getDamageType() now returns a cleaner string 2014-04-16 18:14:07 +02:00
ZiggehandCharonInferar e4ce96dedb Items - Added Heroism items
Also added a Flamethrower to the frog since we didn't have one.
2014-04-16 18:14:04 +02:00
Treeku fcba41a40e Merge pull request #445 from Ziggeh/master
Added some setbonus scripts and other misc stuff
2014-04-16 16:41:41 +01:00
CharonInferar b36081e630 Improvements on loot system
Loot icon
Loot system messages
2014-04-16 17:18:59 +02:00
Ziggeh d1a0a3714b Revert "Added Katarn Armor to frog"
This reverts commit 8abfe0df41.
2014-04-16 16:47:10 +02:00
Ziggeh af2f1d6dc4 Merge remote-tracking branch 'upstream/master' 2014-04-16 16:46:46 +02:00
CharonInferar 37dc1a45c2 Loot window added
Loot window implemented
Loot info effect added
2014-04-16 05:23:30 +02:00
CharonInferar 6aad6a69d2 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 20:34:58 +02:00
CharonInferar 161a64bcd0 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 20:34:58 +02:00
CharonInferar 67cf7d3c72 weapon work 2014-04-15 20:34:57 +02:00
CharonInferar b2965a8352 Looted weapons do get random stats now 2014-04-15 20:34:57 +02:00
CharonInferar 5bc314f569 Merge remote-tracking branch 'origin/master' into LootUpdate 2014-04-15 19:25:50 +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
Ziggeh d3215407f3 Weapons - Created datatable of WeaponTypes 2014-04-15 17:38:28 +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