projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-13 03:13:09 -04:00
Code Issues Projects Releases Wiki Activity
6,324 Commits 16 Branches 86 Tags
dependabot/github_actions/actions/setup-java-3
Commit Graph
6324 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Obique PSWG f7ae87fdf5 Fixed unit test in TestAwarenessHandler 2016-11-14 19:30:15 -06:00
Obique PSWG d0402d614d Added printStackTrace function to Log 2016-11-14 18:22:05 -06:00
Obique PSWG e996c0022c Merged in M4SS/holocore/persist_stringids (pull request #354) 
Fixed an issue where name and detail string IDs for objects weren't persisted
 2016-11-15 00:18:22 +00:00
Mads Boddum e7bf8736f7 Fixed an issue where name and detail string IDs for objects weren't persisted 2016-11-15 01:15:43 +01:00
Obique PSWG 9a791d4c8a Reverted previous commit 2016-11-14 17:37:24 -06:00
Obique PSWG 58f9f73227 Merged in M4SS/holocore/new_objects (pull request #352) 
Fixed an issue where newly created objects didn't appear without a relog
 2016-11-14 23:33:17 +00:00
Mads Boddum 6174f4f97c Fixed an issue where newly created objects didn't appear without a relog 2016-11-14 23:57:28 +01:00
Christoph Neuwirth 119ad0d30d Merged projectswg/holocore into quality_assurance 2016-11-13 07:17:41 +01:00
Obique PSWG 9ee91e5b6c Removed extra prints in TestSWGList 2016-11-12 13:11:37 -06:00
Obique PSWG 00e0b039e3 Renamed SWGListTest 2016-11-12 13:11:20 -06:00
Obique PSWG 595d9b543f Fixed test case waits 2016-11-12 13:04:00 -06:00
Obique PSWG 8f9254ce10 Optimized point translation and rotation 2016-11-12 10:30:12 -06:00
Obique PSWG 46dab5df49 Fixed NGE-483 by fixing waypoint deletion crash 2016-11-12 09:34:33 -06:00
Christoph Neuwirth 07d0639c89 Merged projectswg/holocore into quality_assurance 2016-11-09 20:32:31 +01:00
Obique PSWG c0b79c8352 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2016-11-09 13:25:52 -06:00
Obique PSWG 35bb67772a Fixed NGE-483 by removing WaypointObject from awareness 2016-11-09 13:25:04 -06:00
Christoph Neuwirth 770cf0c9dd Merged projectswg/holocore into quality_assurance 2016-11-09 19:41:39 +01:00
Skyler Lehan f9439f264d Merged projectswg/holocore into quality_assurance 2016-11-08 17:01:55 -05:00
Obique PSWG 40a981d11f Merged in M4SS/holocore/hide_spawners (pull request #351) 
NGE-482 - Indoor spawners are visible to normal players and in no admin mode
 2016-11-05 17:27:11 +00:00
Obique PSWG 2205a3ee84 Temporarily disabled some unit tests 2016-11-04 13:43:44 -05:00
Obique PSWG aab3d07c5e Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2016-11-04 13:06:36 -05:00
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
Mads Boddum bbe8930ab1 Fixed an issue where indoors spawners were visible to non-admins 2016-11-04 10:28:02 +01:00
Skyler Lehan 71c4de6c8b Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2016-11-02 08:24:03 -04:00
Obique PSWG 524b26df56 Merged in Undercova/holocore (pull request #350) 
Content update
 2016-11-02 02:20:00 +00:00
Undercova e8e54fab6d Added more sub spawn databases 
Added event spawn databases
Changed gcw related spawn databases to use common spawner format
 2016-11-02 03:14:34 +01:00
Undercova a988105ab3 Adjusted several columns in item database to INTEGER 2016-11-02 03:13:21 +01:00
Undercova 534df552b4 Fixed typo in humanoid.sdb 2016-11-02 03:11:08 +01:00
Mads Boddum 41b9d86d65 Added delay before sending ShowLootBox to make sure objects are created first 2016-11-01 05:50:53 +01:00
Mads Boddum e9a0c14279 Merge holocore/quality_assurance into showlootbox 
Conflicts:
	src/network/PacketType.java
	src/resources/commands/callbacks/TransferItemCallback.java
	src/services/commands/BuffService.java
	src/services/experience/SkillTemplateService.java
	src/services/objects/StaticItemService.java
	test/resources/objects/awareness/TestAwarenessHandler.java
 2016-11-01 05:09:05 +01:00
Mads Boddum 2aaea95665 Merged quality_assurance into showlootbox 2016-11-01 05:04:38 +01:00
Skyler Lehan bedd83e55b Merge branch 'quality_assurance' of bitbucket.org:slehan/holocore into quality_assurance 2016-10-31 20:03:13 -04: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