projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-17 07:02:54 -04:00
Code Issues Projects Releases Wiki Activity
2,828 Commits 16 Branches 86 Tags
069ebdcf49e5cd07e55aa7eba3d0d0abd590cd2f
Commit Graph
2828 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Obique PSWG 069ebdcf49 Removed some child radius code and temporarily reverted a create/destroy update in update containment 2016-11-04 13:06:10 -05:00
Obique PSWG f7d5fbf335 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2016-10-31 14:45:18 -05:00
Obique PSWG 522cf2b95b Removed portion of test case temporarily to allow code to compile 2016-10-31 14:44:51 -05:00
Obique PSWG 3904877e19 Merged in slehan/holocore/nge-453 (pull request #348) 
Fixed an issue where items without levels could not be equipped
 2016-10-31 19:33:10 +00:00
Skyler Lehan 2e6bbfa67d (Resolved a dumb code writing issue)^2 2016-10-31 15:31:50 -04:00
Skyler Lehan 7ab731368c Resolved a dumb code writing issue :) 2016-10-31 15:06:46 -04:00
Skyler Lehan 4a4db753a8 Fixed an issue where items without levels could not be equipped 2016-10-31 14:57:56 -04:00
Obique PSWG 417192f4ff Merged in M4SS/holocore/buff_expiration (pull request #347) 
Fixed a concurrency issue where buffs weren't expiring
 2016-10-31 16:43:10 +00:00
Obique PSWG 60cad3b777 Merged in M4SS/holocore/logout_fix (pull request #345) 
Fixed an issue where characters with no name were logged out and disappeared
 2016-10-31 16:42:38 +00:00
Obique PSWG 2bc93cea07 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2016-10-31 09:50:15 -05:00
Mads Boddum 8cb2b10d58 Added scope to a case in ConnectionService 2016-10-31 15:47:30 +01:00
Mads Boddum a377819c3f Put some common buff logic into a method 2016-10-31 15:45:53 +01:00
Mads Boddum 6dcede67cc Fixed a concurrency issue where buffs weren't expiring 2016-10-31 15:12:25 +01:00
Obique PSWG a5e718d6d6 Merged in slehan/holocore/nge-453 (pull request #327) 
NGE-453 resolved
 2016-10-31 13:26:56 +00:00
Obique PSWG 25b393465b Merged in M4SS/holocore/action_cost (pull request #343) 
NGE-468 - Ability action cost
 2016-10-31 13:23:10 +00:00
Skyler Lehan 28d91b4f6e Using required_combat_level instead 2016-10-31 08:54:43 -04:00
Obique PSWG a129d4e339 Merged in M4SS/holocore/container_content (pull request #344) 
NGE-440 - Containers don't show content
 2016-10-31 12:30:58 +00:00
Obique PSWG d4431796ba Merged in M4SS/holocore/hide_spawners (pull request #346) 
Added admin permissions and applied them to spawners
 2016-10-31 12:29:21 +00:00
Skyler Lehan 1882999d14 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into nge-453 2016-10-31 08:28:14 -04:00
Skyler Lehan a24f1c5c15 Removed unneeded attribute 2016-10-31 08:27:37 -04:00
Mads Boddum 392f190665 Added admin permissions and applied them to spawners 2016-10-31 09:36:02 +01:00
Mads Boddum 22801e2619 Adjusted a code comment in ConnectionService 2016-10-31 08:21:35 +01:00
Mads Boddum 9673230d26 Fixed an issue where characters with no name were logged out and disappeared 2016-10-31 08:19:43 +01:00
Mads Boddum 518ad8b2c6 Fixed an issue where backpack contents were invisible 2016-10-31 07:45:02 +01:00
Mads Boddum 7fce795ba0 Implemented action costs for combat commands 2016-10-31 06:28:53 +01:00
Obique PSWG 31b19adef0 Added speed check config option 2016-10-29 23:08:25 -05:00
Obique PSWG 902cbf62a4 Added distanceTo function in Location with primitive x/y/z 2016-10-29 23:02:44 -05:00
Obique PSWG 6611640d07 Fixed spawner service reloading NPCs whenever any config value changes 2016-10-29 20:06:06 -05:00
Obique PSWG 539ea9e49d Suppressed Move Failure print for logged out creature objects 2016-10-29 13:38:01 -05:00
Obique PSWG 85c37226ee Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2016-10-29 13:31:24 -05:00
Obique PSWG 57e441f970 Fixed some equip/unequip issues 2016-10-29 13:31:11 -05:00
Undercova PSWG eab7b10230 Merged in M4SS/holocore/expertise_training (pull request #342) 
NGE-160 - Expertise Training
 2016-10-29 08:56:44 +00:00
Mads Boddum 8bc33ac932 Merge holocore/quality_assurance into expertise_training 
Conflicts:
	src/services/experience/SkillService.java
	src/services/experience/SkillTemplateService.java
	src/services/player/CharacterCreationService.java
 2016-10-29 08:09:36 +02:00
Mads Boddum 730632f9bc Added support for overwriting an existing buff 2016-10-29 07:50:17 +02:00
Mads Boddum 44633a1010 Fixed expertise point allocation check 2016-10-28 20:13:20 +02:00
Obique PSWG 07eb924bd4 Fixed infrequent zone in crash where buildouts were loaded slowly 2016-10-28 12:31:57 -05:00
Mads Boddum 0b1f42c985 Fixed an issue where the XP multiplier didn't affect the XP flytext 2016-10-28 17:46:49 +02:00
Mads Boddum a89f47d306 Added support for mark >1 expertise abilities 2016-10-28 16:28:34 +02:00
Mads Boddum c0677c1472 Fixed an issue where transfering items felt unresponsive 2016-10-28 16:25:31 +02:00
Mads Boddum cc4708b300 Added support for a XP multiplier, set XP-MULTIPLIER in features.cfg 2016-10-28 10:09:34 +02:00
Mads Boddum 28b6f59c99 Fixed an issue where an exploit check prevented training lots of expertise at once 2016-10-28 09:44:29 +02:00
Obique PSWG 72ea75ce9d Possibly fixed test case failing occasionally 2016-10-27 13:51:22 -05:00
Obique PSWG d60486d8ad Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into alpha 2016-10-27 13:28:44 -05:00
Obique PSWG 51b6cc3f17 Merged in M4SS/holocore (pull request #341) 
Fixed an issue where backpacks could not be unequipped
 2016-10-27 18:28:36 +00:00
Obique PSWG 2db2e3666d Fixed warnings 2016-10-27 13:25:44 -05:00
Mads Boddum 0a7a978c44 Added admin command /grantSkill for giving yourself a skill 2016-10-27 20:23:41 +02:00
Mads Boddum 05758b00f2 Added expertise parent checking to prevent exploits 2016-10-27 20:23:05 +02:00
Obique PSWG d20ab1e428 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into alpha 
Conflicts:
	src/services/faction/FactionService.java
 2016-10-27 13:22:24 -05:00
Obique PSWG 6d8973ef45 Awareness updates where all tests pass and it functions in-game 2016-10-27 13:16:51 -05:00
Mads Boddum c80b12df88 Manager.addChildService() and removeChildService() are now protected and final 2016-10-27 19:53:51 +02:00