summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2022-10-09Merge tag 'pull-cctv-cameras' of ssh://normalmode.org/mika/game_jam49 into ↵HEADmasterdusoleil23-13/+1776
mika-pr Security cameras for CCTV developed on this branch
2022-09-25Add camera models to shipmikatomik1-2/+95
2022-09-23Import and configure security cameramikatomik23-11/+1681
Attempted to add them to the ship.tscn, they moved independently from the ship like the viewports did when we first added them. Not sure what kind of black magic doodle ran to fix this but I'll just leave it at the .tscn setup and ready to use
2022-09-21Add an example Dock to the worlddusoleil3-0/+14
2022-09-21Move new dock assets one directory updusoleil54-1130/+65
2022-09-21Merge tag 'pull-new-dock-asset' of ssh://normalmode.org/mika/game_jam49 into ↵dusoleil50-0/+3546
mika-pr Rework dock asset with textures and shape modification
2022-09-21Fix id conflicts in ship.tscnmikatomik1-19/+18
2022-09-21Optimization passmikatomik12-1/+152
Set up a ton of occluders on the ship and set every material I could to backface cull
2022-09-21Import and configure new dock, see messagemikatomik51-163/+3546
Think i accidentally deleted the original Dock.tscn and cant figure out how to get it back..? But the new dock_rework.tscn is meant to drop right in it's place
2022-09-20Incorporate new assets into the world gendusoleil14-238/+169
2022-09-20Simplify and Fix Monument Codedusoleil6-30/+41
Simplify the monument chunks to just be a bounding box with the scene origin at the center. This allows us to automatically calculate the chunks with only the bounds provided. It also fixes the issues with scaling and rotation.
2022-09-20Billboard chunk coords for debuggingdusoleil2-0/+8
2022-09-20Merge remote-tracking branch 'mika/ship-development' into mika-assetsdusoleil18-0/+2903
2022-09-20Import and configure lighthouse monumentmikatomik21-0/+1685
2022-09-20Add more rock objectsmikatomik4-0/+2165
2022-09-20Import rock and texture for world generationmikatomik12-0/+737
2022-09-20Add ability to add static monuments to the worlddusoleil8-35/+306
2022-09-19Add Levels of Detail per Chunkdusoleil10-122/+143
2022-09-19Use MultiMesh to dramatically increase performance of generated worlddusoleil7-44/+66
2022-09-19Scale rocks based on noise and add a random rotationdusoleil1-8/+26
2022-09-18Organize World Gen Stuffdusoleil13-13/+13
2022-09-18Prototype levels of detail per chunkdusoleil6-3/+103
2022-09-18Generate Rocks in the World Chunksdusoleil2-6/+23
2022-09-18Add ChunkLoader to World Generationdusoleil9-55/+169
Break up world gen into chunk and offload generating them to a Chunk Loader. The World figures out which chunks should be loaded and gives this to the Chunk Loader. The Chunk Loader frees any chunks out of render distance. It also picks an unloaded chunk and gives it to a worker thread to generate it.
2022-09-16Generate Stuff in a Chunkdusoleil4-2/+8
2022-09-16Fix rounding error in chunk render distancedusoleil2-30/+29
2022-09-16Rewrite World code to load/deload Chunks in a circle around a travelerdusoleil4-102/+119
2022-09-16Increase the resolution of the control panel cameras and set the draw ↵dusoleil1-4/+8
distance based on if they are inside or outside
2022-09-16Cull the Water from the below deck cameradusoleil2-3/+8
2022-09-16Add Trigger in lower hallway to hide water below deckdusoleil6-2/+60
2022-09-16Fix both cameras to follow the boat, but ignore its yawdusoleil3-23/+19
2022-09-16Move Viewport Cameras with the boatdusoleil2-0/+17
2022-09-16Fix debugger errors from viewporttexturesdusoleil1-110/+81
2022-09-16Flip normals on bottom stair of staircasemikatomik4-7/+8
Bottom stair not appearing due to a ROGUE NORMAL Fixed
2022-09-16Add Collision Layers/Masks to New Stuffdusoleil6-3/+22
2022-09-16Housekeeping for all the new stuff that diverged from the reorganizationdusoleil82-165/+165
2022-09-16Merge branch 'ship-development' into mika-prdusoleil76-74/+6785
2022-09-16Import and configure water pumpmikatomik23-1/+1848
2022-09-16Normalize the material filesdusoleil10-0/+0
Opening the material files in the godot editor and saving caused them to fix any broken paths from the directory restructure from before and it also converted a number of them to a more compact binary format saving a good bit of space.
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 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-15Add a ship camera (swap with Q) for testing world movement and generationdusoleil3-0/+38
2022-09-15Lower World Generation radius for performancedusoleil3-3/+13
2022-09-15Speed up the rotation for the Shipdusoleil1-1/+1
2022-09-15Fix jumping and laddersdusoleil2-1/+3
cgit-1.2.3-r5 | srcnode v0.4.0