Commit Graph
391 Commits
Author SHA1 Message Date
Skyler Lehan 32ee12cb28 Silly copyright fixes 2016-09-12 13:09:15 -04:00
Skyler Lehan bd227797e1 NGE-418 + NGE-168 - fixed issues from PR code review 2016-09-12 13:00:20 -04:00
Skyler Lehan 99e0a028e8 NGE-168 + NGE-418 - Added the ability to to add a consumable collection item to your collections, still needs to be removed from your inventory 2016-09-11 23:01:50 -04:00
Skyler Lehan b62e66fc77 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into collections 2016-09-08 17:02:25 -04:00
Skyler Lehan bf5ed070d2 Started working on NGE-168, made it able to pick up the clicky collections in the world. 2016-09-08 15:39:14 -04:00
Mads Boddum c7051c059a Volume is no longer persisted and added SWGObject version 1 2016-08-25 17:34:49 +02:00
Mads Boddum 7e9f60b2b0 Fixed an issue where container volumes weren't being incremented and decremented 2016-08-25 17:13:10 +02:00
Mads Boddum b9fb59b66e Fixed an issue where volumes of containers weren't being incremented and decremented 2016-08-25 16:45:01 +02:00
Undercova PSWG 2480b83521 Merged in M4SS/holocore/cells_fix (pull request #264)
Fixed an awareness issue where rapidly entering and leaving a cell would spam system messages and eventually teleport
2016-08-15 18:47:58 +02:00
Mads Boddum 6bea160880 Fixed an awareness issue where rapidly entering and leaving a cell would spam system messages and eventually teleport 2016-08-15 18:22:45 +02:00
Mads Boddum 4db0d345e4 Fixed an issue with saving WeaponObjects 2016-08-14 03:12:18 +02:00
Mads Boddum acec33a46e Fixed an issue with loading WeaponObjects with no elemental damage 2016-08-12 16:22:18 +02:00
Mads Boddum 2cc68d3845 Fixed a problem with loading WeaponObject version 0 and implemented version 1 2016-08-12 03:26:11 +02:00
Undercova 03cc25510a Added item spawning 2016-08-10 22:59:43 +02:00
Mads Boddum 69eede133a Fixed a big issue where the hashcode of a CreatureObject would change depending on posture 2016-08-06 16:49:06 +02:00
Obique PSWG 8428a7baa0 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2016-07-15 22:08:11 -05:00
Obique PSWG df764d7b9c Fixed awareness issue with teleportation 2016-07-15 22:06:30 -05:00
Obique PSWG 610bde20cf Merged in slehan/holocore/groups (pull request #238)
Added temp fix to keep testing groups
2016-07-15 10:38:19 -05:00
Skyler Lehan 6de3955439 Removing comment 2016-07-14 17:26:10 -04:00
Obique PSWG ddd9fa3b16 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2016-07-13 08:12:05 -05:00
Obique PSWG dc0d8f0708 Fixed many awareness and observer issues 2016-07-13 08:11:34 -05:00
Obique PSWG 15953f1065 Fixed pvp flags and posture messages sending with buildouts or snapshots 2016-07-13 07:45:52 -05:00
Skyler Lehan 8521ae73ac NGE-111: fixed an issue with %TT being sent instead of the proper message, and temp fix to passing leadership 2016-07-12 19:35:35 -04:00
Obique PSWG 835e0e8266 Merged in slehan/holocore/groups (pull request #229)
Groups
2016-07-10 05:41:04 -05:00
Skyler Lehan 12038023c7 Fixed remaining issues in the PR for NGE-111 2016-07-05 18:07:14 -04:00
Skyler Lehan 223505257d Fixed issues in PR #229
groupMakeMasterLooter.js/groupUninvite.js
- Fixed issues with unnecessary spaces

GroupObject
- fixed unnecessary line breaks
- refactored loot rule from an int into an enum
- fixed sub int spacing
- fixed name on getLeaderId

GroupService
- fixed ScheduledExecutorService so that there is only one, and it spawns threads and puts the Future in the map of CreatureObject to Future
- changed types for logoffTimers to a map
- commented out the loot stuff for now
- refactored a good chunk of handleInvite to another method
2016-06-19 20:06:51 -04:00
Obique PSWG b1fc65207b Ordered SWGObject attributes and fixed terrain in getWorldLocation 2016-06-12 10:03:07 -05:00
Skyler Lehan 6cb69ebd43 Made some formatting changes to GroupObject 2016-06-07 07:27:13 -04:00
Skyler Lehan dcce3068a9 Went through and fixed any formatting changes, and made sure it was thread safe. 2016-06-07 07:24:33 -04:00
Obique PSWG a675e308b7 Fixed transform issue after relog 2016-06-06 19:53:44 -05:00
Skyler Lehan cfe88e0032 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into groups
# Conflicts:
#	src/resources/objects/group/GroupObject.java
2016-06-06 19:25:02 -04:00
Obique PSWG ee31170088 Improved DataTransform code in SWGObject 2016-06-06 10:54:54 -05:00
Obique PSWG 79f7048a92 Fixed errors in GroupObject 2016-06-06 08:08:29 -05:00
Obique PSWG 703f6f44f2 Fixed slots, moveToContainer, and simplified awareness functions 2016-06-06 08:03:33 -05:00
Obique PSWG 777b37af81 Fixed friends list updating right away 2016-06-06 07:58:11 -05:00
Skyler Lehan 337ccd4b37 Fixed a few bugs in regards to the automatic logout group removal and fixed some duplicate messages being sent. 2016-06-02 17:33:13 -04:00
Obique PSWG 43af96e047 Re-did container permissions 2016-06-02 06:01:55 -05:00
Obique PSWG 1652656bcb Fixed equipment list bug 2016-06-01 08:53:48 -05:00
Obique PSWG 6a56c4ff15 Fixed equip/unequip into inventory 2016-05-31 12:03:33 -05:00
Obique PSWG f2f7e35177 Fixed CREO equipment and SWGObject.removeObject 2016-05-31 11:38:20 -05:00
Skyler Lehan 124bb68220 Added handling for looting and loot master setting, however the makeMasterLooter command is not being seen by holocore 2016-05-30 19:54:48 -04:00
Obique PSWG 681386f326 Added backwards compatability with version 1 2016-05-30 16:29:50 -05:00
Obique PSWG 27a50d6b4e Increased QuadTree sensitivity slightly 2016-05-30 15:53:16 -05:00
Obique PSWG c788f58525 Fixed equipment transfer code 2016-05-30 15:03:37 -05:00
Obique PSWG ffb158db7d Decreased QuadTree sensitivity 2016-05-30 14:20:47 -05:00
Skyler Lehan 7203cf6310 Fixed the issue with getting the disband message twice
GroupObject
- getGroupMemberObjects() returns a HashSet now

GroupService
- uses a HashSet for sendGroupSystemMessage
2016-05-30 14:25:39 -04:00
Skyler Lehan abc0b640fb More work for NGE-111, mostly minor fixes
GroupObject
- fixed some formatting issues
- added method to get the CreatureObjects of each GroupMember in the group
- removed mark/unmarkPlayerForLogoff and the TimerTask for them (moved to GroupService instead)

GroupService
- fixed the message sending methods
- GroupService now tracks if players log in and out and removes them as necessary

- still need to make sure the "disband" message is only being sent once, this stems from the leader being in GroupMembers twice
- need to make sure all appropriate messages are being sent to the players, like when leadership changes etc
2016-05-30 13:34:49 -04:00
Obique PSWG 83d4ae2098 Fixed a weird issue with object IDs generated overlapping others 2016-05-30 09:21:23 -05:00
Obique PSWG 576b2bd8be Added parent to serialized output 2016-05-30 00:16:48 -05:00
Skyler Lehan 6f467523a4 GroupObject
- remove member is now checks to make sure that if one of two GroupMembers leaves, then the group should disband
- added method disbandGroup to destroy the group

GroupService
- instead of doing its own disbanding, that responsibility was refactored to GroupObject
2016-05-29 19:15:46 -04:00