summaryrefslogtreecommitdiffstats
path: root/maps (follow)
AgeCommit message (Collapse)AuthorFilesLines
2022-09-16Housekeeping for all the new stuff that diverged from the reorganizationdusoleil63-6222/+0
2022-09-16Merge branch 'ship-development' into mika-prdusoleil63-0/+6222
2022-09-16Import and configure water pumpmikatomik23-1/+1848
2022-09-16Import and configure mast on ship.tscnmikatomik21-1/+1688
2022-09-16Set staircase material to overridemikatomik3-4/+126
2022-09-16Hookup final camera in bridgemikatomik1-1/+23
Locations of the cameras are subject to change but they are up and working, though they must be rendered in unshaded mode or the textures will not show up for... some reason
2022-09-16Make and import material for stairsmikatomik12-46/+172
2022-09-16Remove refraction from bridge windowsmikatomik1-3/+0
Refraction taken off bridge windows, this was the reason water was not rendering through the windows
2022-09-15Make instances inside ship.tscn localmikatomik2-70/+231
Made instances of light_fixture and control_panel local to ship.tscn. This way the light radius and intensity can be adjusted independent of each other. Control panel also made local for use of rendering the cameras around the ship to the screens on it
2022-09-15Collapse directory structure for ship assetsMalfurious88-8354/+0
This subtree no longer contains any standalone maps. Simply rename the ship assets directory to clean up unused directories.
2022-09-15Merge Stage into Main sceneMalfurious1-1761/+0
Unify into one level scene by bringing the ship and extra objects into Main (replacing the raft), and setting up buoyancy.
2022-09-15Import light fixturemikatomik6-6/+1252
2022-09-15Import steering wheel for control panelmikatomik18-2/+1505
2022-09-15remove blend backup filesdusoleil5-0/+0
2022-09-15Add props in shipmikatomik15-24/+1613
2022-09-15Fix bug with ladder mat not showing at runtimemikatomik1-22/+5
2022-09-15Import ladder and config FPS to climb itmikatomik9-1/+1216
2022-09-15Update FPS controller to play nice with rigid bodiesmikatomik1-60/+240
Infinite inertia set to false, the handle_collision func is now individually applying impulses to rigid bodies we collide with so we stop yeeting boxes off the ship just by bumping them or jumping on top of them.
2022-09-15Import crate as rigid bodymikatomik24-2/+3073
2022-09-15Import and configure updated ship model and texturesmikatomik56-121/+2453
2022-09-15Import and configure base model for shipmikatomik13-0/+1745
Basic working model of ship, barebones and placeholder textures
2022-09-15Begin ship development. Blendfiles addedmikatomik2-0/+0