Skip to content

Commit

Permalink
TerrainGen Fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@AidenF0X
AidenF0X committed Aug 22, 2023
1 parent 20e6ce9 commit 2581165
Show file tree
Hide file tree
Showing 63 changed files with 3,469 additions and 309 deletions.
Binary file modified .gradle/7.4/executionHistory/executionHistory.bin
View file
Binary file not shown.
Binary file modified .gradle/7.4/executionHistory/executionHistory.lock
View file
Binary file not shown.
Binary file modified .gradle/7.4/fileHashes/fileHashes.bin
View file
Binary file not shown.
Binary file modified .gradle/7.4/fileHashes/fileHashes.lock
View file
Binary file not shown.
Binary file modified .gradle/7.4/fileHashes/resourceHashesCache.bin
View file
Binary file not shown.
Binary file modified .gradle/buildOutputCleanup/buildOutputCleanup.lock
View file
Binary file not shown.
Binary file modified .gradle/file-system.probe
View file
Binary file not shown.
Binary file modified build/classes/java/main/org/foxesworld/newgame/engine/Kernel.class
View file
Binary file not shown.
Binary file removed build/classes/java/main/org/foxesworld/newgame/engine/material/MaterialAbstract.class
View file
Binary file not shown.
Binary file removed build/classes/java/main/org/foxesworld/newgame/engine/material/MaterialManager$1.class
View file
Binary file not shown.
Binary file removed build/classes/java/main/org/foxesworld/newgame/engine/material/MaterialManager$2.class
View file
Binary file not shown.
Binary file removed ...classes/java/main/org/foxesworld/newgame/engine/material/MaterialManager$BiConsumer.class
View file
Binary file not shown.
Binary file removed build/classes/java/main/org/foxesworld/newgame/engine/material/MaterialManager$VarType.class
View file
Binary file not shown.
Binary file removed build/classes/java/main/org/foxesworld/newgame/engine/material/MaterialManager.class
View file
Binary file not shown.
Binary file removed build/classes/java/main/org/foxesworld/newgame/engine/material/TextureWrap.class
View file
Binary file not shown.
Binary file removed build/classes/java/main/org/foxesworld/newgame/engine/model/ModelManager.class
View file
Binary file not shown.
Binary file modified build/classes/java/main/org/foxesworld/newgame/engine/player/ActionsControl.class
View file
Binary file not shown.
Binary file modified build/classes/java/main/org/foxesworld/newgame/engine/player/Player$1.class
View file
Binary file not shown.
Binary file modified build/classes/java/main/org/foxesworld/newgame/engine/player/Player.class
View file
Binary file not shown.
Binary file modified build/classes/java/main/org/foxesworld/newgame/engine/player/input/UserInputHandler$1.class
View file
Binary file not shown.
Binary file modified build/classes/java/main/org/foxesworld/newgame/engine/player/input/UserInputHandler.class
View file
Binary file not shown.
Binary file modified build/classes/java/main/org/foxesworld/newgame/engine/player/input/UserInputHelper.class
View file
Binary file not shown.
Binary file removed build/classes/java/main/org/foxesworld/newgame/engine/sound/SoundManager.class
View file
Binary file not shown.
Binary file modified build/classes/java/main/org/foxesworld/newgame/engine/world/terrain/TerrainGenerator.class
View file
Binary file not shown.
124 changes: 92 additions & 32 deletions build/resources/main/sounds.json
View file
Original file line number Diff line number Diff line change
@@ -1,54 +1,114 @@
{
"events": [
"player": [
{
"event": "walking",
"package": "footstep/stone/",
"settings": {
"volume": 2.0,
"positional": false,
"pitch": 1.0,
"dataType": "Buffer"
},
"sounds": [
"player/footstep/stone/walking/walk1.ogg",
"player/footstep/stone/walking/walk2.ogg",
"player/footstep/stone/walking/walk3.ogg",
"player/footstep/stone/walking/walk4.ogg",
"player/footstep/stone/walking/walk5.ogg",
"player/footstep/stone/walking/walk6.ogg",
"player/footstep/stone/walking/walk7.ogg",
"player/footstep/stone/walking/walk8.ogg",
"player/footstep/stone/walking/walk9.ogg",
"player/footstep/stone/walking/walk10.ogg",
"player/footstep/stone/walking/walk11.ogg",
"player/footstep/stone/walking/walk12.ogg",
"player/footstep/stone/walking/walk13.ogg",
"player/footstep/stone/walking/walk14.ogg",
"player/footstep/stone/walking/walk15.ogg"
"/walk1.ogg",
"/walk2.ogg",
"/walk3.ogg",
"/walk4.ogg",
"/walk5.ogg",
"/walk6.ogg",
"/walk7.ogg",
"/walk8.ogg",
"/walk9.ogg",
"/walk10.ogg",
"/walk11.ogg",
"/walk12.ogg",
"/walk13.ogg",
"/walk14.ogg",
"/walk15.ogg"
]
},
{
"event": "sprinting",
"package": "footstep/stone/",
"settings": {
"volume": 2.0,
"positional": false,
"pitch": 1.0,
"dataType": "Buffer"
},
"sounds": [
"player/footstep/stone/sprinting/sprint1.ogg",
"player/footstep/stone/sprinting/sprint2.ogg",
"player/footstep/stone/sprinting/sprint3.ogg",
"player/footstep/stone/sprinting/sprint4.ogg",
"player/footstep/stone/sprinting/sprint5.ogg",
"player/footstep/stone/sprinting/sprint6.ogg",
"player/footstep/stone/sprinting/sprint7.ogg",
"player/footstep/stone/sprinting/sprint8.ogg",
"player/footstep/stone/sprinting/sprint9.ogg",
"player/footstep/stone/sprinting/sprint10.ogg",
"player/footstep/stone/sprinting/sprint11.ogg",
"player/footstep/stone/sprinting/sprint12.ogg",
"player/footstep/stone/sprinting/sprint13.ogg",
"player/footstep/stone/sprinting/sprint14.ogg",
"player/footstep/stone/sprinting/sprint15.ogg",
"player/footstep/stone/sprinting/sprint16.ogg"
"/sprint1.ogg",
"/sprint2.ogg",
"/sprint3.ogg",
"/sprint4.ogg",
"/sprint5.ogg",
"/sprint6.ogg",
"/sprint7.ogg",
"/sprint8.ogg",
"/sprint9.ogg",
"/sprint10.ogg",
"/sprint11.ogg",
"/sprint12.ogg",
"/sprint13.ogg",
"/sprint14.ogg",
"/sprint15.ogg",
"/sprint16.ogg"
]
},
{
"event": "jump/land",
"package": "footstep/stone/",
"settings": {
"volume": 2.0,
"positional": false,
"pitch": 1.0,
"dataType": "Buffer"
},
"sounds": [
"/land1.ogg",
"/land2.ogg",
"/land3.ogg"
]
},
{
"event": "jump/takeoff",
"package": "footstep/stone/",
"settings": {
"volume": 2.0,
"positional": false,
"pitch": 1.0,
"dataType": "Buffer"
},
"sounds": [
"/takeoff1.ogg",
"/takeoff2.ogg"
]
},
{
"event": "action",
"package": "footstep/stone/",
"settings": {
"volume": 2.0,
"positional": false,
"pitch": 1.0,
"dataType": "Buffer"
},
"sounds": [
"/gooseSkin.ogg"
]
}
],
"music": [
{
"event": "test",
"settings": {
"volume": 2.0,
"positional": false,
"pitch": 1.0,
"dataType": "Buffer"
},
"sounds": [
"/FST_Conc_JumpDown_Player_1st_01.ogg"
]
}
]
Expand Down
16 changes: 16 additions & 0 deletions build/resources/main/ui/userData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,22 @@
<control name="label" color="#FFF" width="30%" text="playerState" halign="right" height="100%"/>
<control name="label" id="playerState" color="#FFF" width="50%" text="" halign="left" height="100%"/>
</panel>


<panel id="panel_top_right4" childLayout="horizontal" backgroundColor="#1119" width="100%" height="10%">
<control name="label" color="#FFF" width="30%" text="posX" halign="right" height="100%"/>
<control name="label" id="posX" color="#FFF" width="50%" text="" halign="left" height="100%"/>
</panel>

<panel id="panel_top_right5" childLayout="horizontal" backgroundColor="#1119" width="100%" height="10%">
<control name="label" color="#FFF" width="30%" text="pozY" halign="right" height="100%"/>
<control name="label" id="posY" color="#FFF" width="50%" text="" halign="left" height="100%"/>
</panel>

<panel id="panel_top_right6" childLayout="horizontal" backgroundColor="#1119" width="100%" height="10%">
<control name="label" color="#FFF" width="30%" text="posZ" halign="right" height="100%"/>
<control name="label" id="posZ" color="#FFF" width="50%" text="" halign="left" height="100%"/>
</panel>
</panel>
</layer>
</screen>
Expand Down
Binary file modified build/tmp/compileJava/previous-compilation-data.bin
View file
Binary file not shown.
Loading

0 comments on commit 2581165

Please sign in to comment.