projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-09-11 21:45:26 -04:00
Code Issues Projects Releases Wiki Activity
6,324 Commits 14 Branches 86 Tags
dependabot/github_actions/actions/setup-java-3
Commit Graph
6324 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ziggy e81c284253 Fixed utility sourceset compilation error 2022-07-20 17:03:09 +02:00
Undercova 970d25fc46 Merge branch 'cu_quality_assurance' of https://github.com/ProjectSWGCore/Holocore into cu_quality_assurance 2022-07-20 03:32:48 +02:00
Undercova 523a1f95ba Updated some coordinates for trainers in Mos Eisley 2022-07-20 03:32:09 +02:00
Josh Larson 6e7b18a7dd Merge branch 'cu_quality_assurance' of https://github.com/ProjectSWGCore/Holocore into cu_quality_assurance 2022.07.19 2022-07-19 17:07:14 -05:00
Josh Larson 07b721d298 Fixed NPCs location in buildings (should not use terrain height) 2022-07-19 17:06:54 -05:00
Josh Larson b5f597e767 Cleaned up DynamicSpawnService's terrain getHeight call 2022-07-19 06:52:17 -05:00
Josh Larson e87ec25a72 Merge pull request #681 from Josh-Larson/cu_quality_assurance 
Improved API for accessing the terrain height
2022.07.18 		2022-07-18 22:56:07 -05:00
Josh Larson 6a98b67b77 Cleaned up previous commit in NavigationPoint and set all NPC spawns to the correct elevation 2022-07-18 22:51:48 -05:00
Josh Larson d2e3e911de Improved API for accessing the terrain height 2022-07-18 22:23:25 -05:00
Josh Larson 6fd6588c5c Merge pull request #680 from Josh-Larson/cu_quality_assurance 
Fixed dynamic spawn system using new terrain loader
 2022-07-18 21:09:05 -05:00
Josh Larson c008ad910d Fixed dynamic spawn system using new terrain loader 2022-07-18 20:56:13 -05:00
Undercova c22db42f4c Added several patrol routes to some Mos Eisley NPCs 
Renamed the testing rings for combat and crafting
Changed the cloning sound
 2022-07-18 22:43:08 +02:00
Undercova dcb3595766 Merge branch 'cu_quality_assurance' of https://github.com/ProjectSWGCore/Holocore into cu_quality_assurance 2022.07.17 2022-07-17 20:12:15 +02:00
Undercova fd80fae342 Added some CL 1 to 3 newbie spawns so players can fight something in their range 
Removed a campfire outside Mos Eisley
 2022-07-17 20:11:41 +02:00
Josh Larson 20e127e7dc Merge pull request #673 from madsboddum/Holocore-598 
Holocore-598 Special attacks should say "Too tired" when their costs …
 2022-07-17 13:08:42 -05:00
Josh Larson 65c698929a Merge pull request #670 from madsboddum/Holocore-436 
Holocore-436 [Brawler] Bleed Attack
 2022-07-17 13:02:23 -05:00
Ziggy dd9629741c Holocore-598 Special attacks should say "Too tired" when their costs exceed your current action or mind 2022-07-17 19:11:32 +02:00
Ziggy 93f8bfe985 Holocore-436 [Brawler] Bleed Attack 2022-07-17 15:53:17 +02:00
Josh Larson 60ba47ca62 Merge pull request #668 from madsboddum/Holocore-568 
Holocore-568 Global cooldown should prevent ability execution
 2022-07-17 04:15:27 -05:00
Ziggy a3ce2019ac Holocore-568 Global cooldown should prevent ability execution 
More specifically, it should be queued for later execution for when the relevant cooldowns have expired.
 2022-07-17 03:21:04 +02:00
Josh Larson 61a2a26d2c Merge pull request #667 from madsboddum/Improved-tests 
Improved-tests
 2022-07-16 18:43:07 -05:00
Ziggy a33c613c9a Improved tests for item transfers by decoupling them from the implementation 
This way we also get slightly more code coverage, because we're closer to executing a transferItemXXX
command like the real game would.
 2022-07-17 01:30:01 +02:00
Josh Larson bd7a357368 Merge pull request #665 from madsboddum/encodable_nullability 
Better nullability support in Encodable
 2022-07-15 13:32:11 -05:00
Ziggy f6155b8dd2 Better nullability support in Encodable 2022-07-15 20:28:05 +02:00
Josh Larson e7624de7ba Merge pull request #629 from madsboddum/group_inviter_name 
Show name of the player that invited you to a group instead of %TT
 2022-07-15 12:00:44 -05:00
Ziggy d1d6313c3b Split the single GroupEventIntent into multiple intents, so we can benefit from null-checking by the compiler 2022-07-15 18:57:09 +02:00
Josh Larson 1ee2d17033 Merge pull request #664 from madsboddum/lightsabers 
Added support for lightsabers, as well as a couple of Lightsaber skil…
 2022-07-14 20:00:46 -05:00
Ziggy 065338adb7 Added support for lightsabers, as well as a couple of Lightsaber skill tree abilities 2022-07-15 02:47:58 +02:00
Undercova 2c53879b53 Updated armor / weapon / wearable items so they use CU modifiers 
Updated NPC stats for CL 1 to 10 so they are easier to fight
2022.07.14 		2022-07-14 04:23:50 +02:00
Josh Larson 50c64164cb Added building names to buildout files 2022-07-13 19:58:00 -05:00
Josh Larson 45b63ce616 Merge branch 'cu_quality_assurance' of https://github.com/ProjectSWGCore/Holocore into cu_quality_assurance 2022-07-13 19:39:32 -05:00
Josh Larson 1086426a30 Merge pull request #662 from madsboddum/skillpoint_cap_249_bug 
Fixed skillpoint cap being 249 instead of 250
 2022-07-13 19:39:16 -05:00
Josh Larson 47076cb091 Updated clientdata 2022-07-13 19:36:49 -05:00
Ziggy 3a532eac9c Fixed skillpoint cap being 249 instead of 250 2022-07-14 02:36:21 +02:00
Josh Larson c17154a4db Merge pull request #661 from madsboddum/Holocore-660 
Holocore-660 Default attack
 2022-07-13 19:27:04 -05:00
Ziggy f04c17bf7f Holocore-660 Default attack 2022-07-14 01:51:06 +02:00
Josh Larson 607b4ce745 Merge pull request #659 from madsboddum/old-config-files 
Remove unused code for old config files
 2022-07-13 17:56:50 -05:00
Ziggy 4d2d91b56e Remove unused code for old config files 2022-07-14 00:47:47 +02:00
Josh Larson 774a5e50a2 Merge pull request #657 from madsboddum/Holocore-601 
Holocore-601 Cloner window shows no city names
 2022-07-13 09:49:43 -05:00
Ziggy f9c9d90001 Holocore-601 Cloner window shows no city names 
I wasn't able to find the client string, so I just wrote something myself that's pretty close. The city name isn't in the prompt, because we need the prose string for that to work.
 2022-07-13 16:26:44 +02:00
Josh Larson b4dbaa5ef6 Merge pull request #656 from madsboddum/Remove-mockito 
Rewrote ActiveQuestRequirementTest so it doesn't need Mockito, as the…
 2022-07-13 07:37:30 -05:00
Ziggy 9738f35448 Rewrote ActiveQuestRequirementTest so it doesn't need Mockito, as the code is perfectly testable without it 2022-07-13 14:25:49 +02:00
Josh Larson 21db28adc6 Merge pull request #655 from madsboddum/Holocore-435 
Holocore-435 [Brawler] Parry Riposte Stance
 2022-07-12 23:43:45 -05:00
Ziggy 52ea9667f0 Holocore-435 [Brawler] Parry Riposte Stance 
Lots of file edits because I also created SWGColor and used in relevant places.
It contains commonly used colors for flytexts, so we don't need to look them up each time.
There are way more colors than the ones I added, but I figure it makes sense to add them as we go along.
 2022-07-13 02:49:24 +02:00
Josh Larson 90fac06fa6 Merge pull request #654 from madsboddum/unused_highest_id 
Removed an unused local variable, highestId, that was updated but nev…
 2022-07-12 16:11:53 -05:00
Josh Larson ad70add6e0 Merge pull request #653 from madsboddum/junit5 
JUnit 4 -> JUnit 5
 2022-07-12 10:34:19 -05:00
Ziggy a3f38ad5c0 JUnit 4 -> JUnit 5 
We're still getting JUnit 4 in through fast-json, jlcommon-network and jlcommon.
The solution for them is probably to change "implementation" to "testImplementation".
 2022-07-12 15:38:04 +02:00
Ziggy 8538c01522 Removed an unused local variable, highestId, that was updated but never accessed, as a different solution further down figures out what the highest ID is 2022-07-12 13:33:17 +02:00
Josh Larson 3d8276b850 Merge pull request #651 from madsboddum/Holocore-650 
Holocore-650 Failed command execution should fail instead of triggeri…
 2022-07-11 14:56:08 -05:00
Ziggy 002f5a158c Holocore-650 Failed command execution should fail instead of triggering cooldown 
I had to make CombatCommandService run as a part of CommandQueueService, so we have a chance to make commands fail properly based on combatcommand-specific checks.
 2022-07-11 21:49:13 +02:00