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,944 Commits 14 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 c0c1236f92 Converted faction intents to Kotlin 2024-06-08 17:32:47 -05:00
Josh Larson 1fb1f7e592 Merge branch 'master' of https://github.com/ProjectSWGCore/Holocore 2024-06-08 16:53:47 -05:00
Josh Larson 82a1a13e91 Converted Entertainment intents to Kotlin 2024-06-08 16:45:02 -05:00
Josh Larson 985c710031 Added inspection to default configuration to check when intents may not be broadcasted 2024-06-08 16:31:38 -05:00
Josh Larson ae114138f1 Converted combat, conversation, and crafting intents to new Intent file format 2024-06-08 16:30:55 -05:00
Josh Larson d49c52c80d Converted com.projectswg.holocore.intents.gameplay.combat to Kotlin 2024-06-08 13:21:26 -05:00
Josh d6ae65d1a2 Merge pull request #1546 from madsboddum/feature/quests/message-box-sounds 
Play SUI message box sounds in quests, as the NPE tutorial makes exte…
 2024-06-08 11:29:07 -05:00
Ziggy a79f608c6e Play SUI message box sounds in quests, as the NPE tutorial makes extensive use of this feature 2024-06-08 18:30:52 +02:00
Josh 2f17940f86 Merge pull request #1544 from madsboddum/fix/quests/sui-message-box-progression 
SUI message box tasks in quest should only progress when the window i…
 2024-06-08 11:13:01 -05:00
Josh 424351444e Merge pull request #1545 from madsboddum/fix/quests/unknown-quest-handling 
Handle unknown quests being granted in a better way than causing a Nu…
 2024-06-08 11:12:23 -05:00
Josh d288906e54 Merge pull request #1547 from madsboddum/docker-compose-version 
Specifying "version" is obsolete these days and doing so causes a war…
 2024-06-08 11:10:41 -05:00
Ziggy 548a5811af Specifying "version" is obsolete these days and doing so causes a warning to be printed, so let's stop doing it 2024-06-08 16:37:07 +02:00
Ziggy c8812609a3 Handle unknown quests being granted in a better way than causing a NullPointerException 2024-06-08 16:30:08 +02:00
Ziggy da21ee9ab3 SUI message box tasks in quest should only progress when the window is closed, not when it's opened 2024-06-08 16:10:32 +02:00
Josh Larson 35ead61f9b Added better types to CustomizationString.kt 2024-06-07 20:46:12 -05:00
Josh Larson 1a1275f62e Fixed #1328 - Character doesn't look like it should after character creation 2024-06-07 20:33:27 -05:00
Josh 667956dd9f Merge pull request #1541 from madsboddum/fix/quests/broken-xp-reward 
Fixed a bug with quest rewards, where completing tasks that don't gra…
 2024-06-07 16:03:34 -05:00
Josh 9cbb984434 Merge pull request #1542 from madsboddum/feature/quests/signals 
Quest signals
 2024-06-07 16:03:12 -05:00
Undercova c08cf8569c Merge pull request #1543 from Undercova/master 
Added conversation to Trehla Keelo
 2024-06-07 22:59:20 +02:00
Undercova c72734e393 Added conversation to Trehla Keelo 
Updated conversation of Trehla Keelo
 2024-06-07 22:54:56 +02:00
Ziggy f40a7771d6 Added option to emit quest signals from conversations 2024-06-07 21:48:11 +02:00
Ziggy 75157b59c4 Not every quest task type does something on activation, e.g. quest.task.ground.wait_for_signal - explicitly define the types we don't support, to avoid false positives 2024-06-07 21:47:20 +02:00
Ziggy b380956684 QuestService can now handle quest.task.ground.wait_for_signal 2024-06-07 21:46:35 +02:00
Ziggy dbcda2d53f signal_name is now loaded from quest task SDBs 2024-06-07 21:40:14 +02:00
Ziggy 283fcc8d21 Fixed a bug with quest rewards, where completing tasks that don't grant XP granted +0 unknown XP 2024-06-07 21:36:30 +02:00
Josh 1cc1c1ed28 Merge pull request #1535 from madsboddum/feature/quests/grant-newbie-quest 
Hand out the newbie quest to newly created characters
 2024-06-07 01:23:45 -05:00
Josh 6ecc895ffe Merge pull request #1540 from ProjectSWGCore/dependabot/submodules/pswgcommon-4dfa51e 
Bump pswgcommon from `19ee727` to `4dfa51e`
 2024-06-06 21:11:03 -05:00
dependabot[bot] f0baac2590 Bump pswgcommon from 19ee727 to 4dfa51e 
Bumps [pswgcommon](https://github.com/ProjectSWGCore/pswgcommon) from `19ee727` to `4dfa51e`.
- [Commits](https://github.com/ProjectSWGCore/pswgcommon/compare/19ee727c6ef1286f128b826f3db271bcfa913ebe...4dfa51e7f479eba4b48e1058e3326ca078f3d8aa)

---
updated-dependencies:
- dependency-name: pswgcommon
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
 2024-06-07 02:03:42 +00:00
Josh b53a4e5a3c Merge pull request #1534 from madsboddum/ci/dependabot/auto-update-git-submodules 
Automatically create PRs for updating pswgcommon to the latest version
 2024-06-06 21:03:21 -05:00
Josh 8ae536b5b7 Merge pull request #1533 from madsboddum/feature/crafting/draft-schematic-loader 
DraftSchematicLoader that parses all the json files under server_data…
 2024-06-06 21:02:38 -05:00
Josh bc209b45ed Merge pull request #1532 from madsboddum/feature/crafting/grant-draft-schematics 
Grant draft schematics from skills
 2024-06-06 21:01:47 -05:00
Josh 5e6ae907b8 Merge pull request #1539 from madsboddum/feature/quests/skip-unsupported-task-types 
Skip unsupported quest task types and let the player know what happened
 2024-06-06 21:00:10 -05:00
Josh f1afc5c6c8 Merge pull request #1537 from madsboddum/chore/buff/buffservice-refactor 
BuffService refactor
 2024-06-06 20:59:32 -05:00
Josh 18d5d20d8a Merge pull request #1536 from madsboddum/chore/general/notnull-player-playereventintent 
Mark Player as @NotNull in PlayerEventIntent to communicate null chec…
 2024-06-06 20:55:30 -05:00
Undercova fe0ad4c222 Merge pull request #1538 from Undercova/master 
Content Update
 2024-06-05 21:45:04 +02:00
Ziggy 1146c3e56c Formatted QuestService 2024-06-05 21:43:00 +02:00
Ziggy 7cad4173ea Skip unsupported task types in quests and let the player know what happened, so players can continue without getting stuck 2024-06-05 21:42:32 +02:00
Undercova c1eb4d0eac Added Trehla Keelo NPC 
Adjusted some instances and their NPCs
 2024-06-05 21:39:18 +02:00
Ziggy f3c674472c BuffService Java -> Kotlin 2024-06-05 16:30:00 +02:00
Ziggy 625a5b4914 Rename .java to .kt 2024-06-05 16:29:59 +02:00
Ziggy 918505c280 Decreased the amount of ways buffs can be looked up (CRC, String, int) to just one way (CRC), to help reduce code complexity 
There was also a bug with re-applying the same buff, where the timer would not reset.
 2024-06-05 16:04:19 +02:00
Ziggy aaf47119b8 We don't need to check if the callback is "none", as the containsKey check below will catch it anyway 2024-06-05 11:58:16 +02:00
Ziggy c2fc1c70ba Moved applyTime calculation into applyBuff, so the method has fewer arguments 2024-06-05 11:56:40 +02:00
Ziggy 6767fed350 Removed unused codepath in BuffIntent where a BuffInfo could also be set, simplifying BuffService slightly 2024-06-05 11:54:07 +02:00
Ziggy b2dbcdba78 Removed a bunch of noisy TODOs in BuffService - we track missing features and bugs outside the code 2024-06-05 11:19:28 +02:00
Ziggy 3bb76a863f Mark Player as @NotNull in PlayerEventIntent to communicate null checks being unnecessary 2024-06-05 11:13:50 +02:00
Ziggy d9640f4f34 Hand out the newbie quest to newly created characters 2024-06-05 11:08:27 +02:00
Ziggy 5a4fe819b4 Automatically create PRs for updating pswgcommon to the latest version 2024-05-11 10:12:52 +02:00
Ziggy fff49b52b8 DraftSchematicLoader that parses all the json files under server_data/draft_schematic/ 2024-05-11 09:24:27 +02:00
Ziggy e6149f5bf0 Grant draft schematics from skills 2024-05-11 09:09:25 +02:00