Commit Graph
6324 Commits
Author SHA1 Message Date
Mads Boddum 095e8e1868 Initial work on groupchat 2016-09-11 01:11:52 +02:00
Obique PSWG 0e3ff745e5 Merged in M4SS/holocore/change_dance (pull request #282)
NGE-431 - Added support for /changeDance command
2016-09-10 13:43:10 -05:00
Obique PSWG b8436640df Fixed two private member accesses in SkillService 2016-09-10 09:10:57 -05:00
Mads Boddum f7228b236b Fixed a couple of bugs with watching an entertainer 2016-09-10 03:37:12 +02:00
Mads Boddum cc68b1933d Merge holocore/quality_assurance into watch_performer 2016-09-09 17:45:49 +02:00
Mads Boddum e0427a4cec Added support for /changeDance command 2016-09-09 17:39:37 +02:00
Obique PSWG 75ceb9987c Added cleanup intent so that creatureobject is not null during PE_DISAPPEAR 2016-09-09 09:41:10 -05:00
Obique PSWG 6b2e94b009 Added logging for when TCP port binding fails 2016-09-09 09:40:57 -05:00
Mads Boddum 1c23a32ddc Added ability to stop watching a performer 2016-09-09 06:40:09 +02:00
Skyler Lehan eb6f61b913 NGE-168: sends a player a message if they already have the item 2016-09-08 23:04:32 -04:00
Obique PSWG a88615b5dc Merged in M4SS/holocore/ent_xp (pull request #281)
NGE-427 - Entertainer XP
2016-09-08 21:26:45 -05:00
Mads Boddum 3ef10e69a4 Added missing WatchIntent and cmdWatch script 2016-09-09 04:00:07 +02:00
Mads Boddum 9b5f7df5ad Added support for /watch command 2016-09-09 03:58:10 +02:00
Obique PSWG b4d5f046e0 Merged in M4SS/holocore/flourishes (pull request #280)
Flourishes
2016-09-08 20:20:40 -05:00
Mads Boddum dfb99db22f Merge origin/flourishes into ent_xp 2016-09-09 02:31:57 +02:00
Mads Boddum 53c41897cf Performing now gives a more correct amount of XP 2016-09-09 02:31:28 +02:00
Mads Boddum 3281f3d630 Fixed a logic error with flourishes that allowed for /flourish 0 2016-09-09 00:09:08 +02:00
Mads Boddum d45289b41b Refactored flourish command from script to callback and enhanced performance of logic 2016-09-09 00:08:27 +02: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 d9ff1baa14 Added missing break statement in EntertainmentService 2016-09-08 21:20:22 +02:00
Mads Boddum fc3eb8f6c4 Initial ent XP work 2016-09-08 21:11:08 +02:00
Mads Boddum 633675c3b6 Added basic support for flourishes 2016-09-08 18:33:12 +02:00
Mads Boddum 0f68d025bb Created FlourishIntent 2016-09-08 18:11:12 +02:00
Undercova PSWG cdc97f2ca0 Merged in M4SS/holocore/nge_411_ (pull request #279)
Bugfix NGE-411 - Characters missing commands
2016-09-06 06:41:50 +02:00
Mads Boddum 2d338a2275 Fixed an issue with a helper method that caused skill data to be parsed incorrectly 2016-09-06 05:53:17 +02:00
Mads Boddum dae8c86eba Fixed feedback system messages when spawning static items 2016-09-06 05:23:56 +02:00
Mads Boddum 3ad86cf415 Fixed an issue with weapon elementals on static item weapons preventing proper spawning 2016-09-06 03:19:01 +02:00
Mads Boddum 914fbf49e1 Merge holocore/quality_assurance into static_items 2016-09-06 03:14:01 +02:00
Obique PSWG 846dc4ffa0 Merged in Undercova/holocore (pull request #278)
Added factional requirements for a few wearable items
2016-08-30 09:37:57 -05:00
Mads Boddum fb54786f31 Merge holocore/quality_assurance into buffs
Conflicts:
	src/resources/objects/creature/CreatureObject.java
	src/resources/objects/player/PlayerObject.java
	src/services/galaxy/GameManager.java
2016-08-29 05:27:10 +02:00
Undercova PSWG cf7378ba41 Added factional requirements for a few wearable items 2016-08-28 02:38:50 +00:00
Obique PSWG bd46d9d8fc Merged in M4SS/holocore/container_fix (pull request #276)
Container fixes
2016-08-25 11:41:16 -05: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
Mads Boddum b806baf079 Fixed an issue where the volume of a container always equaled the maximum capacity 2016-08-25 16:20:44 +02:00
Obique PSWG 046e2bdeb5 Merged in M4SS/holocore/entservice_fix (pull request #275)
Fixed an issue where relogging while dancing as a non-entertainer would start giving you XP
2016-08-25 08:50:38 -05:00
Mads Boddum 071676711b Fixed an issue where relogging while dancing as a non-entertainer would start giving you XP 2016-08-25 15:48:00 +02:00
Obique PSWG e5c5ec9992 Merged in M4SS/holocore/entservice_fix (pull request #274)
Fixed an issue where a failed login would cause an exception in EntertainmentService
2016-08-24 09:57:13 -05:00
Mads Boddum 52e37615ba CreatureObject null check in EntertainmentService consumes less space 2016-08-24 16:52:02 +02:00
Mads Boddum 77f8998fc7 Fixed an issue where a failed login would cause an exception in EntertainmentService 2016-08-24 16:48:15 +02:00
Obique PSWG bffcbdea27 Merged in M4SS/holocore/entservice_fix (pull request #272)
Fixed an issue where the EntertainerService was receiving ServerManagementIntents and casting them wrongly
2016-08-24 08:06:12 -05:00
Mads Boddum 03a1e131bf Fixed an issue where the EntertainerService was receiving ServerManagementIntents and casting them wrongly 2016-08-24 15:03:52 +02:00
Mads Boddum e07626ad3d Added support to StaticItemService for more object types 2016-08-24 14:59:07 +02:00
Undercova PSWG 7eefcab91f Merged in Undercova/holocore (pull request #271)
Clicky collections
2016-08-22 16:34:17 +02:00
Undercova PSWG f948241274 Changed columns in collection_clicky.sdb 2016-08-22 14:26:29 +00:00
Undercova PSWG 3431c2d7aa Updated collection_clicky.sdb 2016-08-22 14:18:16 +00:00
Undercova PSWG 5a370c0eba Renamed sdb for clicky collections 2016-08-22 14:17:48 +00:00
Mads Boddum 246f1d61c4 Added a requester field to CreateStaticItemIntent 2016-08-22 06:01:57 +02:00