Commit Graph

6324 Commits

Author SHA1 Message Date
dependabot[bot]
e9f6ce5587 Bump actions/setup-java from 1 to 3
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 1 to 3.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v1...v3)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-28 01:12:00 +00:00
Josh
bee4d25dbe Merge pull request #1357 from madsboddum/docker-base-image
Dockerfile overhaul
2023-08-27 19:48:38 -05:00
Undercova
faedf97f5a Merge pull request #1362 from Undercova/master
Content update
2023.08.21
2023-08-20 22:00:58 +02:00
Undercova
a3960c6c13 Merge branch 'ProjectSWGCore:master' into master 2023-08-20 21:56:22 +02:00
Undercova
b2482fb9af Updated the dps values for NPC stats database 2023-08-20 21:56:01 +02:00
Undercova
4130b12f1c Merge pull request #1359 from Undercova/master
Updated NPC stats very close to real CU stats
2023.08.20
2023-08-20 19:50:27 +02:00
Undercova
1863356212 Updated NPC stats very close to real CU stats
Updated locations for Brawler, Marksman and Entertainer trainer in Mos Eisley
2023-08-20 19:44:37 +02:00
Mads Boddum
8ca33b7cdf build: as a part of continuous integration, try building the Docker image, to help ensure it keeps on working 2023-08-19 01:49:51 +02:00
Mads Boddum
81d0883446 build: moved jlink build inside the Docker image build, so building the Docker image works on any host OS
Problem was that jlink produces OS-specific artifacts, so you couldn't make a functional Docker image on Windows.
Final Docker image size has also been reduced, roughly from 240MB to 170MB, by using Alpine as the new base image.
Support for Debian Stretch ended on the 30th of June 2022.
2023-08-19 01:23:46 +02:00
Josh
e425c604a5 Merge pull request #1356 from madsboddum/docker-timezone
Docker image timezone
2023-08-18 11:23:01 -05:00
Mads Boddum
ea0bbd0ccb feat: added support for easily configuring timezone using an environment variable, making it portable across every kind of Docker host machine 2023-08-18 17:20:43 +02:00
Undercova
0f73548aae Merge pull request #1350 from Undercova/master
Content update
2023.08.15
2023-08-15 21:28:57 +02:00
Undercova
3361df54e6 Reverted a change at LightsaberInventoryTest 2023-08-15 21:19:21 +02:00
Undercova
b34bf55773 Updated items database 2023-08-15 21:03:39 +02:00
Undercova
028ce1868b Merge branch 'ProjectSWGCore:master' into master 2023-08-13 19:28:48 +02:00
Josh
8946efafa7 Merge pull request #1352 from madsboddum/dependabot
Dependabot automatically updating GitHub Actions
2023-08-13 10:24:27 -05:00
Ziggy
c4447a4ab2 Configured Dependabot to update GitHub Actions, so we can spend less time maintaining them ourselves
Based on: https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
2023-08-13 14:08:46 +02:00
Undercova
087f73ede2 Merge branch 'master' of https://github.com/Undercova/Holocore 2023-08-13 11:10:43 +02:00
Undercova
f002e34e8e Updated all weapons
Updated NPC stats
2023-08-13 11:10:19 +02:00
Undercova
e67f3da8bd Merge branch 'ProjectSWGCore:master' into master 2023-08-13 01:45:39 +02:00
Undercova
e51abba85e Updated weapon database 2023-08-13 01:45:12 +02:00
Undercova
3b7c0724ef Merge pull request #1349 from Undercova/master
Content update
2023.08.13
2023-08-13 01:16:25 +02:00
Undercova
e143c04da3 Update CU weapon database 2023-08-13 00:44:00 +02:00
Undercova
b786409042 Update NPC stats 2023-08-13 00:38:25 +02:00
Undercova
688f9598e0 Merge pull request #1348 from Undercova/master
Content updates
2023.08.12
2023-08-12 22:44:05 +02:00
Undercova
b73c1657fb Merge branch 'master' of https://github.com/Undercova/Holocore 2023-08-12 22:04:12 +02:00
Undercova
04c14260d2 Updated NPC stats
Updated some NPCs
Updated CBT regarding Force Sensitive Novice boxes
2023-08-12 22:02:31 +02:00
Josh
2d69828ef7 Merge pull request #1343 from madsboddum/move-quest-crc-database-utility
Moved AddQuestsToCrcDatabase to the utility source set, as it's not t…
2023-07-30 15:45:31 -05:00
Ziggy
d45e49e072 Moved AddQuestsToCrcDatabase to the utility source set, as it's not the kind of utility that holocore would ever use at runtime 2023-07-30 22:32:51 +02:00
Josh
e43f472030 Merge pull request #1335 from madsboddum/holocore-1224
Scouts can harvest resources from creatures
2023-07-28 09:51:28 -05:00
Josh
5ff57e50d6 Merge pull request #1329 from madsboddum/holocore-1294
BUG: Replaced locomotion checks for riding mounts with a single state…
2023-07-28 09:45:56 -05:00
Josh
c365ff4f6e Merge pull request #1338 from madsboddum/idea-logo
Added ProjectSWG logo as the icon for the IDEA project, so the projec…
2023-07-28 09:45:40 -05:00
Ziggy
aae3aefdca Added ProjectSWG logo as the icon for the IDEA project, so the project stands out more when you have many IDEA projects 2023-07-28 15:06:43 +02:00
Ziggy
f13c5342cf Completely stop using destructuring with HarvestHideIntent 2023-07-27 14:53:31 +02:00
Ziggy
8ed02cbc17 Code formatted SampleLoopSession 2023-07-27 11:38:19 +02:00
Ziggy
7958d4eb75 Don't use destructuring with HarvestHideIntent to ensure a changed order of parameters in HarvestHideIntent can never be an issue in the future 2023-07-27 11:37:30 +02:00
Josh
248466626a Merge pull request #1337 from madsboddum/holocore-1332
Replaced "Finding something to work on" with "Good first issues" in C…
2023-07-26 21:37:48 -05:00
Josh
a19f7cce6e Merge branch 'master' into holocore-1332 2023-07-26 21:34:30 -05:00
Josh
8cf4dcea00 Merge pull request #1334 from madsboddum/holocore-1333
Add section about Java and Kotlin to CONTRIBUTING.md
2023-07-26 21:24:12 -05:00
Ziggy
e0f62de9a0 Replaced "Finding something to work on" with "Good first issues" in CONTRIBUTING.md, describing what the label means 2023-07-26 18:18:53 +02:00
Ziggy
81bd4fe68f Removed TODO 2023-07-26 14:26:04 +02:00
Ziggy
f94d6e84f9 Avoid going through RawResourceType, to circumvent being unable to harvest types of bone_mammal and meat_reptilian
bone_mammal straight up doesn't exist in RawResourceType and meat_reptilian is spelled differently (meat_reptillian, with an extra L)
2023-07-26 14:26:04 +02:00
Ziggy
cabcf37c9a Harvested resources from creatures should be sub-typed based on the current terrain, e.g. bone_mammal_tatooine 2023-07-26 14:26:04 +02:00
Ziggy
8c1942ea24 Deleted creature resource type tests that don't work, because the resources are not defined in RawResourceType 2023-07-26 14:26:03 +02:00
Ziggy
05768031e5 RawResource#getName now returns a String instead of a StringId, as 6 out of 7 usages simply wanted the "raw" name, and accessed it using StringId#getKey 2023-07-26 14:26:03 +02:00
Ziggy
cb44a10ab9 Introduced creature quality to creature harvesting, adding randomization to the amount of resources retrieved 2023-07-26 14:26:02 +02:00
Ziggy
84b2e32bed Simplistic implementation of harvesting bone, hide and meat resources from animals
Relates to GitHub issue #1266 and #1224
2023-07-26 14:25:47 +02:00
Ziggy
0249993552 Rename .java to .kt 2023-07-26 13:09:52 +02:00
Ziggy
32360ccd1e Add section about Java and Kotlin to CONTRIBUTING.md
The idea is to communicate why we currently have both Java and Kotlin and what should be used when.
2023-07-26 12:30:16 +02:00
Josh
c68d12a880 Merge pull request #1327 from madsboddum/cancel_live_auction_refactor
Extracted canceling a live auction into a separate class, both to red…
2023-07-25 17:37:35 -05:00