rooms-art-pass #80

Merged

xury merged 42 commits from rooms-art-pass into dev 2026-04-25 17:08:10 +00:00

Conversation 0 Commits 42 Files changed 183 +4984 -493

xury commented 2026-04-21 14:00:50 +00:00

Owner

Copy link

Update all of the rooms with a proper art pass.
Removed the short east hallway.
Several models and entities were updated to work better with baked lighting.
Baked lighting for all of the rooms.
The content of this PR has been cleaned up from the previous long-running "rooms-update" branch.
Changes that have nothing to do with the art pass have been re-organized into a separate branch that can be merged after this PR.

Update all of the rooms with a proper art pass. Removed the short east hallway. Several models and entities were updated to work better with baked lighting. Baked lighting for all of the rooms. The content of this PR has been cleaned up from the previous long-running "rooms-update" branch. Changes that have nothing to do with the art pass have been re-organized into a separate branch that can be merged after this PR.

xury added 42 commits 2026-04-21 14:00:50 +00:00

fixup: world screen settings 8fa7729669

lighting: Set tone mapper to AgX 26bcf4ca9d

world screen: enable volumetric fog 9380126372

desk reception: update import settings to include lightmaps 6802e3d5e3

gallery: fixed emission on frames 8fb3b80316

curtains: Created 3 curtain variations, added to zoo with matierals dd64d35200

crate large: create entity 41f216da5c

crate pile: change to StaticBody3D ... 573e286683

# Conflicts:
#	entities/props/crate_large.tscn

shaman: create big shaman prefab 151a803e15

world screen: Update lighting settings 582a2ae857

rooms: adjust lighting values d6b0f5f09f

foyer: update art walls, new art frames, convert CSG meshes, add pillars 15515749ab

museum: Add LightmapGI node to individual rooms, remove from main scene e9bbd08e50

room laser: art pass af0bc308c0

laser puzzle: update CSG and entity placement b227d04696

room vault: art pass b1cffead33

room vault: import god rays mesh and create god rays material c1bd9f4e31

room vault: add god rays to scene 29d804af05

change vault light colors 1aa5610041

update dust particles to be gpuparticles 26b16134f5

add local dust particle scene to fit room extents 8472b40875

room statue: art pass 72328f85a3

outdoor: add area for outside of the foyer 2328f697b3

room foyer: art pass 2 e4448e3752

room foyer: adjust scene props de51af0d16

museum: remove east hall, offset statue room to connect directly to the foyer f460361f4f

room storage: art pass 8bc51c9c09

museum: collision navigation updated 1649018b44

hallway_long: art pass 6d5ee44966

assets: reimported for baking a28b85e6fa

room vault: update lighting 6b496e9ebd

museum_2: added outdoor scene 378eb96505

interactable objects: replace instances of entities with interactable versions c3cc6f919b

cleanup: fix interactable object titles b98b9a4144

laser puzzle: update laser decal to match laser color 8c82c501eb

laser puzzle: update wall collision layer f245675df9

laser emitter: update art and entity with better laser alignment c481ed053a

laser receiver: update art and entity with better laser alignment 5d56d66fca

Remove navigation obstacles from laser puzzle room and rebake navmesh e996234e66

More wall collision layer fixes 2c620e4dab

Add clipboard note to laser puzzle ebb6550ece

bake light maps d95d81354d

xury requested reviews from noahg, a_kimb0, pixel, TranquilMarmot 2026-04-21 14:01:11 +00:00

xury force-pushed rooms-art-pass from d95d81354d to a6494c32f1 2026-04-21 14:07:43 +00:00 Compare

xury merged commit 17b6caa5ec into dev 2026-04-25 17:08:10 +00:00

xury referenced this pull request from a commit 2026-04-25 17:08:11 +00:00

Merge pull request 'rooms-art-pass' (#80) from rooms-art-pass into dev

xury deleted branch rooms-art-pass 2026-04-25 17:08:11 +00:00

Sign in to join this conversation.

Reviewers

No reviewers

noahg

a_kimb0

pixel

TranquilMarmot

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

BUGJam/pounce-game!80

No description provided.