projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-19 09:03:02 -04:00
Code Issues Projects Releases Wiki Activity
6,944 Commits 16 Branches 86 Tags
dependabot/github_actions/actions/setup-java-5
Commit Graph
6944 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Josh Larson 9fa6ce2e89 Merge pull request #649 from madsboddum/Holocore-428 
Holocore-428 [Brawler] Taunt
 2022-07-11 13:49:53 -05:00
Josh Larson abd309e3df Merge pull request #648 from madsboddum/Holocore-555 
Holocore-555 Remove buffs for players and vehicles in code
 2022-07-11 13:49:47 -05:00
Ziggy 920eb1419a Holocore-428 [Brawler] Taunt 2022-07-11 16:51:59 +02:00
Ziggy 69c46ebf2f Holocore-555 Remove buffs for players and vehicles in code 2022-07-11 12:56:33 +02:00
Josh Larson 9ba33afd27 Merge pull request #646 from madsboddum/weao03_range 
Fixed weapon range not being sent properly to the client
 2022-07-10 21:20:17 -05:00
Josh Larson 9cdf43ac61 Merge pull request #647 from madsboddum/default_weapon_cu 
Added +10 Accuracy to the default weapon as observed in packet captur…
 2022-07-10 21:19:56 -05:00
Ziggy be7a3a1b0c Added +10 Accuracy to the default weapon as observed in packet captures and reduced attack speed a bit, as it was a pre-CU value 
Attack speed is a guess - unfortunately this isn't in the WEAO03 packet like it is post NGE.
 2022-07-11 04:15:13 +02:00
Ziggy 7f5a4985b8 Fixed weapon range not being sent properly to the client 
We had attackSpeed in the top of WEAO03, but attackSpeed isn't in there at all post-CU. This caused all variables to be off-by-one.
 2022-07-11 04:09:24 +02:00
Josh Larson ee82f1919c Merge pull request #645 from madsboddum/equip_armor_test 
Added some tests that ensure armor certifications are respected
 2022-07-10 20:17:12 -05:00
Ziggy 80df4eae9d Added some tests that ensure armor certifications are respected 2022-07-11 03:12:02 +02:00
Josh Larson 894f5993b6 Merge pull request #644 from madsboddum/pvp_test 
Added a couple of tests for factional PvP
 2022-07-10 18:52:32 -05:00
Ziggy 2ef693e548 Added a couple of tests for factional PvP 
Also created a DefaultWeaponFactory, because the code for creating the default weapon has been copy-pasted a couple of times at this point.
The factory is now used to reduce duplication.
 2022-07-11 01:32:30 +02:00
Josh Larson f70c9d8fb7 Merge pull request #643 from madsboddum/equip_test_wait 
Wait synchronously after broadcasting intents, to prevent race condit…
 2022-07-10 17:20:35 -05:00
Ziggy 805fc3eb4f Wait synchronously after broadcasting intents, to prevent race condition between ObjectCreatedIntent being processed too late by SimulatedObjectStorage 
Hopefully this is why the tests are a bit flaky
 2022-07-11 00:14:20 +02:00
Josh Larson a61992ff8e Merge pull request #642 from madsboddum/attack_cost_test 
Created a test that verifies that health, action or mind is spent whe…
 2022-07-10 17:04:58 -05:00
Ziggy 21cc40be1e Created a test that verifies that health, action or mind is spent when a command requires it 
Future addition could be that the command isn't executed if you're "too tired", which we have no support for now.
 2022-07-11 00:00:38 +02:00
Josh Larson e03bd08d4a Merge pull request #636 from madsboddum/weapon_species_restrictions 
Removed species restrictions from weapons, as no weapon is actually i…
 2022-07-10 14:12:40 -05:00
Josh Larson 4eb6ab5b9f Merge pull request #641 from madsboddum/remove_roadmap_rewards 
Removed some unused code and files
 2022-07-10 12:21:45 -05:00
Josh Larson 787d492104 Merge pull request #640 from madsboddum/creo03_in_base3 
Store CREO03 variables in the base3 document, so there's less stuff d…
 2022-07-10 12:21:34 -05:00
Ziggy ffc049bfc0 Removed uniformbox sdb 2022-07-10 17:31:30 +02:00
Ziggy 7f0f6b7b7f Removed the roadmap reward loader 2022-07-10 17:30:49 +02:00
Ziggy 6f5ca02c71 Store CREO03 variables in the base3 document, so there's less stuff directly inside CreatureObject 
Won't break existing creatures because there's migration logic
 2022-07-10 15:12:28 +02:00
Josh Larson 1d311128ae Merge pull request #638 from madsboddum/data_transform_length 
Fixed expected length being too long in DataTransform
 2022-07-09 16:04:00 -05:00
Ziggy e5fc53190d Fixed expected length being too long in DataTransform 2022-07-09 23:00:48 +02:00
Josh Larson d6f1abae2b Merge pull request #637 from madsboddum/deprecations 
Fixed a lot of different compiler warnings - usages of deprecated met…
 2022-07-09 15:22:48 -05:00
Ziggy dce88d5872 Fixed a lot of different compiler warnings - usages of deprecated methods, primarily 2022-07-09 22:09:00 +02:00
Ziggy fd96500a4c Removed species restrictions from weapons, as no weapon is actually in serverdata/appearance/appearance_table.sdb causing them to be unequippable 
Also added some regression tests

Removed species restrictions from weapons, as no weapon is actually in serverdata/appearance/appearance_table.sdb causing them to be unequippable

Also added some regression tests
 2022-07-09 15:07:56 +02:00
Ziggy 967cc369c6 Fixed some poor null handling in GroupService 2022-07-08 23:45:28 +02:00
Undercova b99d6d7824 Added weapons for CL 1 / 10 / 20 / 30 / 40 / 50 to the CBT 
Updated CBT to hand out those weapons
 2022-07-08 23:28:46 +02:00
Josh Larson ad654eff81 Merge pull request #611 from madsboddum/cu_quality_assurance 
Fixed Defense mod behavior, so Melee Defense is your protection against melee attacks, while Unarmed Defense if your protection when you're wielding an unarmed weapon
 2022-07-08 14:14:49 -05:00