projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-07-30 00:15:50 -04:00
Code Issues Projects Releases Wiki Activity
2,276 Commits 14 Branches 86 Tags
d0413bf5b0720e63e5ccbab618927bbdc846c19c
Commit Graph
129 Commits
Author SHA1 Message Date
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
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 e7f4616f9a Made intent factory broadcasts sequential and added additional awareness debug to details.js 2016-06-06 08:00:56 -05:00
Skyler Lehan 1a58d05ca7 Attempted to implement uninvitation, as sending null inviter data does not close the invitation dialog 2016-05-30 21:29:16 -04: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
Skyler Lehan d417b446d6 Added the declination messages sent to each character and handled the decline 2016-05-30 17:52:05 -04:00
Obique PSWG c788f58525 Fixed equipment transfer code 2016-05-30 15:03:37 -05:00
Skyler Lehan ef8ab0f4c6 Merge branch 'quality_assurance' of bitbucket.org:slehan/holocore into groups 2016-05-24 15:50:15 -04:00
Skyler Lehan 141b9e651d Implemented group kicking as well 
cmdDismissGroupMember
- command hook to send the kick event

GroupEventIntent
- added the GROUP_KICK intent

GroupServices
- fixed the brace on handleMakeLeader
- added handleKick
 2016-05-24 14:57:22 -04:00
Skyler Lehan 311cb5b693 Leadership changes for NGE-111 
groupMakerLeader.js
- serves as the command hook for the make leader command

GroupService.java
- now handles the GROUP_MAKE_LEADER intent
- added handleMakeLeader to take care of switching the leader to another character
- refactored sending invites out to sendInvite, one that allows the passage of the current groupID, and one that sets it to -1 for group creation
- handleGroupLeave also filled in
 2016-05-19 12:59:59 -04:00
Skyler Lehan 45942bbf9e Fixed logic for disband and leave group commands. 2016-05-18 18:22:45 -04:00
Skyler Lehan 17b4ac76b5 Hopefully fixed the tabs 2016-05-18 18:19:08 -04:00
Skyler Lehan d8db483fd4 Started on groups NGE-111 
GroupEventIntent
- Added the GROUP_LEAVE event to the GroupEventType enum to flag for the leaveGroup command

GameManager
- reenabled the GroupService

GroupService
- added a check for the GROUP_LEAVE event type
- created the method handleGroupLeave which will process a player leaving a group and disband if necessary, currently just stubbed
 2016-05-18 17:57:25 -04:00
Obique PSWG cb981d7029 Merged in M4SS/holocore/weapon-equip (pull request #224) 
Added support for equipping/unequipping weapons
 2016-05-18 15:41:36 -05:00
Mads Boddum 63ba8b59ec Added support for equipping/unequipping weapons 2016-05-18 13:23:38 +02:00
Obique PSWG a7241a03f3 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2016-05-16 20:08:51 -05:00
Obique PSWG be478632f6 Merged in M4SS/holocore/biographies (pull request #221) 
Biographies
 2016-05-16 14:58:57 -05:00
Obique PSWG 072e055d8f Added observers output to the details script 2016-05-16 10:13:17 -05:00
Obique PSWG 4577fd826c Redid observers and awareness and fixed NPCs inside buildings 2016-05-15 17:14:55 -05:00
Mads Boddum 7995258231 Added a 1025 character limit for biographies 2016-05-15 15:23:50 +02:00
Mads Boddum 472d8a460d Fixed an issue where the biography wouldn't be saved once set 2016-05-15 14:25:18 +02:00
Mads Boddum 2125f07b1e Added biography request responses and setting biography 2016-05-15 11:51:54 +02:00
Obique PSWG f89dde84b2 Added health information to the qatool detail script 2016-05-13 16:23:48 -05:00
Obique PSWG f3aae4fa1c Added easier way of doing damage in scripts and fixed CombatAction implementation 2016-05-09 09:15:32 -05:00
Obique PSWG ad557b14e4 Created CombatService, the supporting items for combat, as well as basic combat 2016-05-07 23:23:20 -05:00
Obique PSWG 173bf1d9cd Added a /qatool details command to examine objects 2016-05-04 18:00:31 -05:00
Mads Boddum 64f18f7f06 Fixed issues where any in-game object could be picked up and being able to exceed container volume limits 2016-04-22 21:57:35 +02:00
Mads Boddum 66b992a294 Moved backwards compatibility with Basic dance to load_creature script 2016-04-05 19:46:38 +02:00
Mads Boddum 3b2728b17e Added a script that's executed when a CreatureObject is loaded from the database 2016-04-05 19:45:27 +02:00
Mads Boddum 14aed8ce8f Implemented dancing fully 2016-04-03 02:05:58 +02:00
dennise1975 c9afd33e7c Profession Starter Clothing: Added UniformBoxService and ItemDatabase, updated radials and CharacterCreationService 2016-03-03 20:59:59 -06:00
Mads Boddum 74a158a882 Armour can now be equipped 2016-02-22 20:15:58 +01:00
Obique PSWG e98c35a63c Fixed equip/unequip bug 2016-01-18 01:24:46 -06:00
Undercova PSWG 906ecac9bf Fixed /pvp command so it doesnt enable/disable god mode anymore 2016-01-07 21:27:26 +00:00
Mads Boddum d8afee0c35 Merge branch 'quality_assurance' of https://bitbucket.org/projectswg/holocore into CORE-137-travel 
Conflicts:
	src/resources/objects/SWGObject.java
	src/resources/objects/creature/CreatureObject.java
	src/utilities/IntentFactory.java
 2015-10-25 08:14:34 +01:00
Waverunner 1d4516b68c Merge branch 'groups_wip' into quality_assurance 2015-10-13 09:36:55 -04:00
Waverunner 4c1b895298 Added core grouping system for CORE-111 - Groups are now implemented 2015-10-13 09:35:18 -04:00
Mads Boddum f5d8eeaa70 Fixed an issue which prevented galaxy-wide system messages from being broadcasted 2015-10-09 18:57:47 +02:00
Mads Boddum 478d374548 Refactored the broadcast command scripts to use the IntentFactory 2015-10-08 22:27:38 +02:00
Mads Boddum 62c518e45c Renamed galManager in transferItemMisc to galacticManager for overall consistency 2015-10-08 13:55:16 +02:00
Mads Boddum 764a3814ab Fixed an incorrect function name in transferItemMisc 2015-10-08 13:54:00 +02:00
Mads Boddum 26da373c54 Fixed incorrect function declaration in purchaseTicket.js 2015-10-08 13:42:44 +02:00
Mads Boddum 1d8dcb94e6 Merged quality_assurance into CORE-137-travel 2015-10-08 08:55:29 +02:00
Mads Boddum 74c98a14ca Removed unnecessary semi-colons from travel-related scripts 2015-10-07 21:52:19 +02:00
Mads Boddum 9fa2f61235 Renamed the function in purchaseTicket to executeCommand 2015-10-07 21:51:45 +02:00
Waverunner b49b544af2 Added in basic ability to join groups 2015-10-05 17:39:02 -04:00
Waverunner 00fc0d8737 Renamed command scripts function "execute" to "executeCommand" and changed declaration to no longer be assigned as a variable for simplicity 2015-10-04 17:40:40 -04:00
Mads Boddum 72d73ef4e7 Merged quality_assurance into CORE-137-travel 2015-09-29 11:37:34 +02:00
Z61 3c1ec6aa65 Merged projectswg/holocore into quality_assurance 2015-09-27 16:07:23 -04:00