projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-02 03:15:52 -04:00
Code Issues Projects Releases Wiki Activity
1,467 Commits 11 Branches 4 Tags
6184d2142008cfb01154dae0ce84f64ad90fa3bc
Commit Graph
347 Commits
Author SHA1 Message Date
Waverunner 6184d21420 Merge remote-tracking branch 'origin/master' into Wave_Missions 
Conflicts:
	src/main/NGECore.java
	src/protocol/swg/chat/ChatFriendsListUpdate.java
	src/services/MissionService.java
 2014-04-19 18:33:02 -04:00
Treeku 506e1f160e Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-19 00:39:51 +01:00
Waverunner b6158a4014 leaveChatChannel removes from list of players channels 2014-04-18 18:14:59 -04: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
CharonInferar 2b4527e165 Conversation menu improvements 
SUI window functionality
storage of items in collections
 2014-04-18 04:45:12 +02: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 857198f32d Merge pull request #462 from Ziggeh/master 
Weapon particle effects, misc enhancements
 2014-04-16 19:02:10 -04: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 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
CharonInferar d123415605 Improvements on loot system 
Loot icon
Loot system messages
 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 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
Ziggeh af2f1d6dc4 Merge remote-tracking branch 'upstream/master' 2014-04-16 16:46:46 +02:00
Ziggeh a385b87e3b Weapons - Fixed #446 2014-04-15 02:35:30 +02:00
Ziggeh 6898380330 Weapons - getDamageType() now returns a cleaner string 2014-04-15 01:19:30 +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 9f75c370ab Merge pull request #424 from Ziggeh/master 
Refactored WeaponObject
 2014-04-14 16:34:55 +01:00
Treeku db3f0368a0 Items now have cooldowns and play anims 
Grenades, heal stims, heavy weapons.

Heavy weapons seem to be considered usable items and it calls the heavy
weapon command dependent on the template in template_command_mapping.

You can't fire it from the toolbar due to a checkbox.
 2014-04-14 11:55:40 +01:00
Treeku db33827e18 Setting serial sets SERIAL option to true 2014-04-14 11:02:00 +01:00
CharonInferar 0c1aebb58a someone changed serial number data type 2014-04-13 23:12:32 +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
Treeku b968b9ad1f Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-13 19:41:33 +01: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 7cee1990b5 Serial number uses attribute 2014-04-13 16:33:18 +01:00
Light2 cf9bcf66f9 Fixed vehicles 2014-04-13 17:17:25 +02:00
Treeku 432700ab20 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-13 13:19:57 +01:00
Treeku b436353904 godLevel is now set and used 2014-04-13 13:17:23 +01:00
Treeku 33614f4c48 Moved factionStatus from CREO to TANO 2014-04-13 11:06:27 +01:00
CharonInferar 5331cd67dc Increased TANO persistence version fix 2014-04-13 05:05:18 +02:00
CharonInferar fa00c85290 Swoop is mountable for further tests 2014-04-13 03:50:45 +02:00
Treeku 60972655dd Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	src/services/command/CommandService.java
	src/services/object/ObjectService.java
 2014-04-13 00:49:58 +01:00
Treeku 03c5201cf4 Command fixes, command removing 2014-04-13 00:29:30 +01:00
Treeku eeb1ea54af Flytext, System, Comms now use ProsePackages 2014-04-13 00:27:02 +01:00
Light2 83aa0ab2b0 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-13 00:20:00 +02:00
Light2 5510ace39a fixed #411 2014-04-13 00:19:47 +02:00
Seefo 6f791819e6 Fixed some housing bugs and Tusken Raider mobile template - see extended 
Fixed a housing issue where the structure management terminal would be
returned in the item list and could be deleted via the delete all items
radial.

Fixed item list to display proper names of objects.

Fixed the Tusken Raider mobile template to display the proper creature
name and changed their default weapons from an E11 and a T21 to a Tusken
Rifle.
 2014-04-12 18:13:11 -04:00