projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-27 17:57:22 -04:00
Code Issues Projects Releases Wiki Activity
1,453 Commits 11 Branches 4 Tags
670a2d57a2b49d40db867ea1029211894fbcf10f
Commit Graph
1453 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CharonInferar 670a2d57a2 Loot added 
added loot
 2014-04-19 01:51:42 +02:00
CharonInferar be6713f75c Merge remote-tracking branch 'upstream/master' 2014-04-18 22:50:15 +02: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 89a9494a3b options.cfg set to default values 2014-04-18 21:52:05 +02:00
CharonInferar 814ebe6cf3 Menu functionality improved 
Lootkit implemented
Loot price and further stats considered
 2014-04-18 21:52:04 +02:00
CharonInferar 73a3c98660 Conversation menu improvements 
SUI window functionality
storage of items in collections
 2014-04-18 21:52:03 +02:00
CharonInferar e32cb2da0b Junk Dealer Conversation menu added 2014-04-18 21:52:03 +02:00
CharonInferar ab7f12591d Merge pull request #475 from CharonInferar/JunkDealer 
Junk dealer added
 2014-04-18 21:22:24 +02:00
CharonInferar 8adea112f3 options.cfg set to default values 2014-04-18 21:16:56 +02:00
CharonInferar 69266f2896 Merge remote-tracking branch 'origin/master' into JunkDealer 2014-04-18 21:07:52 +02:00
CharonInferar 0eb5cf05f4 Merge remote-tracking branch 'upstream/master' 2014-04-18 21:06:38 +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
CharonInferar 29ce1d42a5 Merge pull request #473 from tacef/master 
Added Generic House Small Style 02, looks clean
 2014-04-18 18:27:52 +02: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
CharonInferar e911eebdce Junk Dealer Conversation menu added 2014-04-17 04:10:58 +02: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
Waverunner 2127ff1f6f Removed import in GroupChat and PlanetChat scripts 2014-04-16 17:57:15 -04: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
Seefo c4be8f160a Fixed an error in the setgodmode command 2014-04-16 19:48:25 +02: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
Seefo 9bed860429 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-16 13:35:31 -04:00
Seefo 77bea7604e Fixed an error in the setgodmode command 2014-04-16 13:35:00 -04:00
CharonInferar 87e425b290 Merge pull request #460 from CharonInferar/SurveyingFix 
Attempt to stabilize Surveyservice
 2014-04-16 19:34:17 +02:00
CharonInferar c78a213e2b Merge remote-tracking branch 'origin/master' into SurveyingFix 2014-04-16 19:31:52 +02:00
CharonInferar c54cfc855a Merge remote-tracking branch 'upstream/master' 2014-04-16 19:30:48 +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
Light2 416cee922b Merge pull request #426 from Freddiec/master 
Added: Tantive Speeder and Barc Speeder
 2014-04-16 18:15:52 +02:00
CharonInferar d123415605 Improvements on loot system 
Loot icon
Loot system messages
 2014-04-16 18:14:10 +02:00
Ziggeh 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
Ziggeh 9fd7efa2a1 Weapons - Created datatable of WeaponTypes 2014-04-16 18:14:08 +02:00
Ziggeh d2da758fdb Weapons - Fixed #446 2014-04-16 18:14:08 +02:00
Ziggeh d85183165f Weapons - getDamageType() now returns a cleaner string 2014-04-16 18:14:07 +02:00
Ziggeh afbc121975 Misc - Added Hoth armor setbonus 2014-04-16 18:14:07 +02:00
Ziggeh f788ae45b4 Items - Created scripts for Spy starter clothing 2014-04-16 18:14:07 +02:00
Ziggeh 81d10609b1 Items - Created scripts for Smuggler starter clothing 
The items lack the proper colour but the rest is fine.
 2014-04-16 18:14:06 +02:00
Ziggeh 042bd06059 Weapons - Updated starter weapons 2014-04-16 18:14:06 +02:00
Ziggeh 23f424ee51 Misc - Added system messages to Dire Fate 2014-04-16 18:14:05 +02:00