summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2022-09-16Make and import material for stairsmikatomik13-46/+206
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-15Fix bug involving laddermikatomik1-1/+2
Make collision detector on FPS_Controller a bit shorter so that the ladder in the bridge cannot be climbed from the back side of the wall
2022-09-15Import light fixturemikatomik6-6/+1252
2022-09-15Import steering wheel for control panelmikatomik19-2/+1512
2022-09-15Remove .import directorypull-ship-development-iter1mikatomik24-27/+0
2022-09-15Add props in shipmikatomik15-24/+1613
2022-09-15Fix bug with ladder mat not showing at runtimemikatomik2-23/+6
2022-09-15Import ladder and config FPS to climb itmikatomik13-13/+1255
2022-09-15Update FPS controller to play nice with rigid bodiesmikatomik2-60/+255
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 bodymikatomik46-2/+3097
2022-09-15Import and configure updated ship model and texturesmikatomik59-124/+2459
2022-09-15Adjust FPS controller height to better fit scalemikatomik1-1/+1
2022-09-15Import and configure base model for shipmikatomik17-3/+1752
Basic working model of ship, barebones and placeholder textures
2022-09-15Begin ship development. Blendfiles addedmikatomik3-1/+13
2022-09-15git ignore blend backup filesdusoleil1-0/+1
2022-09-15Move Raft to bottom of the scene treedusoleil1-30/+30
2022-09-15move environment to default_env.tresdusoleil2-37/+28
2022-09-15Merge tag 'pull-env-iter1' of https://normalmode.org/malf/z/godot_wildjam_49 ↵dusoleil1-4/+35
into malf-pr Setup Main WorldEnvironment Initial iteration of fog effects, bluring, and a basic sunset sky.
2022-09-15Setup Main WorldEnvironmentMalfurious1-4/+35
Initial iteration of fog effects, bluring, and a basic sunset sky.
2022-09-14Merge tag 'pull-water-resize' of ↵dusoleil8-47/+71
https://normalmode.org/malf/z/godot_wildjam_49 into malf-pr Resize the base map and cleanup water assets The world is now targeting play to occur within a 5km radius of vision. Mainly just the water plane is updated to account for this. Additionally, sparse water asset files are now organized under a new directory.
2022-09-14Update ground floor to match size of the detailed water areaMalfurious1-2/+2
2022-09-14Extend water area to 10km x 10kmMalfurious2-2/+19
Horizon LOS in water should be typically around 5km, so extend the dimentions of the water to allow 5km in any direction. With regard to the wave shader, we extend the original MeshInstance to 2000x2000 using a reasonable tradeoff of virtex subdivisions. The remainder of the area is covered by another water plane, subdivided to a much lower level of detail. The area at the center of the large 'outer' water plane is subtracted so that the two do not overlap. Co-authored-by: dusoleil <howcansocksbereal@gmail.com>
2022-09-14Consolidate water-related assetsMalfurious7-45/+52
Stray files are moved into a new directory. The water MeshInstance is made into a new scene, as I will be adding components to it.
2022-09-13Fix Ground collision box sizedusoleil1-4/+4
2022-09-13Fix mistake in shader using global coordsdusoleil1-1/+0
2022-09-12Add buoyancy simulation to water and floaties on the raftdusoleil4-4/+87
2022-09-12Add gertsner wave shaderdusoleil5-7/+275
2022-09-12Set character to react to rigid bodies like static bodiesdusoleil1-1/+1
2022-09-12Set Renderer back to GLES3 to fix depth samplingdusoleil1-1/+0
2022-09-12Add Simple Main Scenedusoleil2-0/+87
2022-09-12Add gitattributes and gitignoredusoleil14-24/+23
2022-09-09Implement basic FPS controllermikatomik5-0/+119
2022-09-09Import wildling wallpapermikatomik13-0/+152
2022-09-09Commit default structure and game-jam cardsmikatomik10-0/+72