Commit Graph

242 Commits

Author SHA1 Message Date
DuckieTM 64dbe6ba86 Merge pull request #70 from medievalshell/dev
feat: interactive JSON / JSON5 mode selector at build time
2026-05-19 09:56:30 +02:00
medievalshell ae9bc8bfce feat(utils): split-aware gamedata loader with tiered merge
Introduces loadGamedata(url, options?) and mergeGamedata(a, b) in
@nitrots/utils. The loader transparently accepts:

- a single-file URL (legacy) -> parsed as before
- a directory URL ending with '/' -> tier-merged from core/custom/seasonal,
  each tier driven by its own manifest.json5

Merge rules:

- arrays of objects sharing an id key (id, classname, name): merged by id,
  later layers overriding earlier ones
- arrays without an id key: concatenated
- plain objects: recursive merge per key
- anything else: later value wins

All gamedata consumers (FurnitureDataLoader, ProductDataLoader,
EffectAssetDownloadManager, AvatarRenderManager actions+figuredata,
LocalizationManager) are migrated to loadGamedata. Behaviour is unchanged
for single-file URLs, so existing deployments need no config changes;
opt-in to split mode by appending '/' to the URL once the layout is in
place.

README updated with the directory layout, merge table and programmatic
usage example. The companion CLI splitter that produces the core/ tier
from legacy files lives in the Nitro V3 client repo.
2026-05-18 21:19:54 +02:00
medievalshell 2a00365862 feat(utils): honour __NITRO_JSON_MODE__ flag in JsonParser
Adds three explicit parsing strategies selectable at host build time via
the compile-time constant __NITRO_JSON_MODE__:

- legacy: strict JSON.parse only; clear error suggesting JSON5 mode
- json5 : JSON5.parse only
- auto  : try JSON, fall back to JSON5 (existing behaviour and default
          when the flag is undefined, so older hosts keep working)

URL/MIME hints for .json5 sources are still respected. README updated
with the modes table and a Vite wiring example.
2026-05-18 20:37:46 +02:00
Medievalshell 792f194536 Merge branch 'duckietm:main' into dev 2026-05-18 19:51:35 +02:00
duckietm 31df26bd1b 🆕 Added support for JSON5 2026-05-18 16:14:38 +02:00
DuckieTM e3078f0268 Merge pull request #69 from duckietm/Dev
🆙 Small fix landscape's where a bit offset
2026-05-12 11:48:22 +02:00
duckietm b6a26fbd84 🆙 Small fix landscape's where a bit offset 2026-05-12 11:48:06 +02:00
DuckieTM 98b03aa0be Merge pull request #68 from duckietm/Dev
Dev
2026-05-08 11:59:09 +02:00
DuckieTM 6bc4a45ee1 Merge pull request #67 from Lorenzune/merge-duckie-main-2026-05-06
Improve mobile room interaction handling
2026-05-08 08:00:59 +02:00
Lorenzune f7fc502685 Improve mobile room interaction handling 2026-05-07 21:21:48 +02:00
DuckieTM e5181c7c3c Merge pull request #66 from duckietm/Dev
Dev
2026-05-06 12:51:56 +02:00
DuckieTM 167d80620e Merge pull request #65 from Lorenzune/merge-duckie-main-2026-05-06
Merge live renderer updates into Dev
2026-05-06 07:08:15 +02:00
Lorenzune 5fc4564467 Merge remote-tracking branch 'duckie/main' into merge-duckie-main-2026-05-06
# Conflicts:
#	packages/communication/src/messages/parser/room/unit/RoomUnitInfoParser.ts
#	packages/communication/src/messages/parser/user/data/UserProfileParser.ts
#	packages/events/src/session/RoomSessionUserFigureUpdateEvent.ts
#	packages/session/src/handler/RoomUsersHandler.ts
2026-05-06 04:23:13 +02:00
DuckieTM 15b1954eac Merge pull request #64 from duckietm/Dev
🆙 Small update
2026-05-04 15:37:17 +02:00
duckietm 7a6092ed7e 🆙 Small update 2026-05-04 15:28:19 +02:00
DuckieTM 9c2e4e4a13 Merge pull request #63 from duckietm/Dev
🆙 Fix BlackHoles
2026-05-04 12:53:33 +02:00
duckietm 151a3db2f4 🆙 Fix BlackHoles 2026-05-04 12:53:18 +02:00
DuckieTM f46d28da24 Merge pull request #62 from duckietm/Dev
🆙 Fixed the Door not visable when window is on wall
2026-05-04 12:02:40 +02:00
duckietm 6ab93ee146 🆙 Fixed the Door not visable when window is on wall 2026-05-04 12:01:45 +02:00
DuckieTM c7c28466c5 Merge pull request #61 from duckietm/Dev
🆕 Card Background
2026-05-04 10:53:30 +02:00
duckietm 2f7b80e894 🆕 Card Background 2026-05-04 08:44:40 +02:00
DuckieTM 7113fabcf0 Merge pull request #59 from duckietm/Dev
🆙 Floorplan fix
2026-04-30 07:57:49 +02:00
duckietm 43dc054fed 🆙 Floorplan fix 2026-04-30 07:57:31 +02:00
DuckieTM f448816690 Merge pull request #58 from duckietm/Dev
🆕 Effect selection in user dropdown
2026-04-29 17:08:52 +02:00
duckietm 853204a5b8 🆕 Effect selection in user dropdown 2026-04-29 13:23:30 +02:00
DuckieTM 4e90350f60 Merge pull request #57 from duckietm/Dev
Dev
2026-04-28 09:45:33 +02:00
duckietm 2a707c3b8d 🆙 Cleanup log in console 2026-04-28 09:41:37 +02:00
duckietm d34f82c716 🆙 Bump renderer to V8.18.1 and replace clientjs with a better solution 2026-04-28 09:14:49 +02:00
Lorenzune 9abec36f02 Merge remote-tracking branch 'duckie/main' into duckie-live-merge-2026-04-21 2026-04-25 13:34:15 +02:00
DuckieTM 7cabbc89ce Merge pull request #56 from duckietm/Dev
🆙 CryptoV2
2026-04-24 16:24:26 +02:00
duckietm 455b75e41d 🆙 CryptoV2 2026-04-24 16:24:02 +02:00
DuckieTM 73f18a1e3f Merge pull request #55 from duckietm/Dev
🆙 Fix background clipping
2026-04-24 14:18:03 +02:00
duckietm e1cc87afa3 🆙 Fix background clipping 2026-04-24 13:55:18 +02:00
DuckieTM 7b36825bb0 Merge pull request #54 from duckietm/Dev
🆕 Handshake on connect
2026-04-23 15:57:52 +02:00
duckietm 7957a8f7f3 🆕 Handshake on connect 2026-04-23 15:57:24 +02:00
Lorenzune 7fa8eff751 Merge latest duckie renderer main 2026-04-21 11:53:28 +02:00
Lorenzune c37c7005fc Fix prefix composer imports after duckie merge 2026-04-21 11:23:38 +02:00
Lorenzune 1dede2c098 Merge remote-tracking branch 'duckie-temp/main' into duckie-merge-2026-04-21
# Conflicts:
#	packages/communication/src/NitroMessages.ts
#	packages/communication/src/messages/incoming/IncomingHeader.ts
#	packages/communication/src/messages/outgoing/OutgoingHeader.ts
2026-04-21 11:20:02 +02:00
Lorenzune 7bf552824f Sync renderer safety push 2026-04-21 08:57:35 +02:00
DuckieTM 6323914dfc Merge pull request #53 from duckietm/Dev
Dev
2026-04-17 14:26:35 +02:00
duckietm 078bba0780 🆙 Make have_offer read from emu 2026-04-17 14:24:15 +02:00
duckietm 4b598fc717 Revert "Merge pull request #48 from simoleo89/feature/catalog-admin-composers"
This reverts commit 67c8dd42cd, reversing
changes made to bc6bd8764d.
2026-04-17 14:03:47 +02:00
DuckieTM 67c8dd42cd Merge pull request #48 from simoleo89/feature/catalog-admin-composers
Feature/catalog admin composers
2026-04-17 13:56:46 +02:00
DuckieTM 8eaca5677c Merge pull request #52 from duckietm/Dev
🔥 Fix Avatar buddy they are now 100% as habbo
2026-04-17 13:54:12 +02:00
duckietm bc6bd8764d 🆙 Fix Catalog Editor 2026-04-17 13:53:07 +02:00
duckietm 2c2f03f20e 🔥 Fix Avatar buddy they are now 100% as habbo 2026-04-17 11:48:38 +02:00
DuckieTM cec4182f3c Merge pull request #51 from duckietm/Dev
Dev
2026-04-16 13:36:36 +02:00
duckietm 282fd6f6bd 🆙 New misc clothing 2026-04-16 13:36:17 +02:00
DuckieTM e6489bbf8d Merge pull request #50 from duckietm/main
Main to Dev
2026-04-14 11:59:44 +02:00
DuckieTM 4a8e6ce841 Merge branch 'Dev' into main 2026-04-14 11:59:36 +02:00