-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
I forgot how to commit LMAOOO. But anyways, made a cool edit, fixed s…
…ome of the stuff up, added new grass and flowers, and other bug fixes and changes. I will be trying to save the camera rotation on the player now. (Issue #12)
- Loading branch information
1 parent
73d3abd
commit c39113b
Showing
14 changed files
with
651 additions
and
12 deletions.
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
[remap] | ||
|
||
importer="scene" | ||
importer_version=1 | ||
type="PackedScene" | ||
uid="uid://exmlfia43n4n" | ||
path="res://.godot/imported/NewGrass.blend-f1f99b8e4b9bc0e333f4677ab4f8e98a.scn" | ||
|
||
[deps] | ||
|
||
source_file="res://Assets/3D Models/Experiments/NewGrass.blend" | ||
dest_files=["res://.godot/imported/NewGrass.blend-f1f99b8e4b9bc0e333f4677ab4f8e98a.scn"] | ||
|
||
[params] | ||
|
||
nodes/root_type="" | ||
nodes/root_name="" | ||
nodes/apply_root_scale=true | ||
nodes/root_scale=1.0 | ||
meshes/ensure_tangents=true | ||
meshes/generate_lods=true | ||
meshes/create_shadow_meshes=true | ||
meshes/light_baking=1 | ||
meshes/lightmap_texel_size=0.2 | ||
meshes/force_disable_compression=false | ||
skins/use_named_skins=true | ||
animation/import=true | ||
animation/fps=30 | ||
animation/trimming=false | ||
animation/remove_immutable_tracks=true | ||
import_script/path="" | ||
_subresources={} | ||
gltf/naming_version=1 | ||
gltf/embedded_image_handling=1 | ||
blender/nodes/visible=0 | ||
blender/nodes/punctual_lights=true | ||
blender/nodes/cameras=true | ||
blender/nodes/custom_properties=true | ||
blender/nodes/modifiers=1 | ||
blender/meshes/colors=false | ||
blender/meshes/uvs=true | ||
blender/meshes/normals=true | ||
blender/meshes/tangents=true | ||
blender/meshes/skins=2 | ||
blender/meshes/export_bones_deforming_mesh_only=false | ||
blender/materials/unpack_enabled=true | ||
blender/materials/export_materials=1 | ||
blender/animation/limit_playback=true | ||
blender/animation/always_sample=true | ||
blender/animation/group_tracks=true |
Binary file not shown.
50 changes: 50 additions & 0 deletions
50
Assets/3D Models/Experiments/PressPlatformText.blend.import
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
[remap] | ||
|
||
importer="scene" | ||
importer_version=1 | ||
type="PackedScene" | ||
uid="uid://bx3h2cove34la" | ||
path="res://.godot/imported/PressPlatformText.blend-81209041f7b66dce8533754be847f1ae.scn" | ||
|
||
[deps] | ||
|
||
source_file="res://Assets/3D Models/Experiments/PressPlatformText.blend" | ||
dest_files=["res://.godot/imported/PressPlatformText.blend-81209041f7b66dce8533754be847f1ae.scn"] | ||
|
||
[params] | ||
|
||
nodes/root_type="" | ||
nodes/root_name="" | ||
nodes/apply_root_scale=true | ||
nodes/root_scale=1.0 | ||
meshes/ensure_tangents=true | ||
meshes/generate_lods=true | ||
meshes/create_shadow_meshes=true | ||
meshes/light_baking=1 | ||
meshes/lightmap_texel_size=0.2 | ||
meshes/force_disable_compression=false | ||
skins/use_named_skins=true | ||
animation/import=true | ||
animation/fps=30 | ||
animation/trimming=false | ||
animation/remove_immutable_tracks=true | ||
import_script/path="" | ||
_subresources={} | ||
gltf/naming_version=1 | ||
gltf/embedded_image_handling=1 | ||
blender/nodes/visible=0 | ||
blender/nodes/punctual_lights=true | ||
blender/nodes/cameras=true | ||
blender/nodes/custom_properties=true | ||
blender/nodes/modifiers=1 | ||
blender/meshes/colors=false | ||
blender/meshes/uvs=true | ||
blender/meshes/normals=true | ||
blender/meshes/tangents=true | ||
blender/meshes/skins=2 | ||
blender/meshes/export_bones_deforming_mesh_only=false | ||
blender/materials/unpack_enabled=true | ||
blender/materials/export_materials=1 | ||
blender/animation/limit_playback=true | ||
blender/animation/always_sample=true | ||
blender/animation/group_tracks=true |
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
[remap] | ||
|
||
importer="mp3" | ||
type="AudioStreamMP3" | ||
uid="uid://c8vkvfphwrr8w" | ||
path="res://.godot/imported/snowfall.mp3-34bc627d8c2e340977dc20ce4dbd1354.mp3str" | ||
|
||
[deps] | ||
|
||
source_file="res://Audio/Tests/snowfall.mp3" | ||
dest_files=["res://.godot/imported/snowfall.mp3-34bc627d8c2e340977dc20ce4dbd1354.mp3str"] | ||
|
||
[params] | ||
|
||
loop=false | ||
loop_offset=0.0 | ||
bpm=0.0 | ||
beat_count=0 | ||
bar_beats=4 |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
@icon("res://Textures/Icons/Script Icons/32x32/world.png") | ||
extends Node3D | ||
|
||
|
||
func edit_finished(): | ||
get_tree().change_scene_to_file("res://Scenes and Scripts/Scenes/World/world.tscn") | ||
|
||
|
||
func camera_anim4(): | ||
$Camera3D.position = Vector3(-29.586, 24.865, 24.865) | ||
$Camera3D.rotation = Vector3(deg_to_rad(7), deg_to_rad(106.9), 0) | ||
|
||
var tween = get_tree().create_tween() | ||
tween.tween_property($Camera3D, "position", Vector3(-29.58, 24.865, 27.852), 7).set_ease(Tween.EASE_IN_OUT) | ||
await get_tree().create_timer(4).timeout | ||
|
||
var tweeen = get_tree().create_tween() | ||
tweeen.tween_property($Camera3D/CanvasLayer/ColorRect, "self_modulate", Color(0, 0, 0, 1), 2) | ||
|
||
tweeen.connect("finished", edit_finished, 1) | ||
|
||
func camera_anim3(): | ||
$Camera3D.position = Vector3(-42.77, 25.085, 38.308) | ||
$Camera3D.rotation = Vector3(deg_to_rad(7), deg_to_rad(-50), 0) | ||
|
||
var tween = get_tree().create_tween().set_parallel() | ||
tween.tween_property($Camera3D, "rotation", Vector3(deg_to_rad(7), deg_to_rad(-77), 0), 5).set_ease(Tween.EASE_IN_OUT) | ||
tween.connect("finished", camera_anim4, 1) | ||
|
||
func camera_anim2(): | ||
$Camera3D.position = Vector3(-37.17, 25.015, 20.709) | ||
$Camera3D.rotation = Vector3(0, 128.7, 0) | ||
var tween = get_tree().create_tween().set_parallel() | ||
tween.tween_property($Camera3D, "position", Vector3(-37.17, 27.737, 20.709), 5).set_ease(Tween.EASE_IN_OUT) | ||
tween.connect("finished", camera_anim3, 1) | ||
|
||
|
||
func camera_anim1(): | ||
|
||
var tween = get_tree().create_tween().set_parallel() | ||
tween.tween_property($Camera3D, "position", Vector3(-21.80, 26.629, 23.709), 5).set_ease(Tween.EASE_IN_OUT) | ||
tween.connect("finished", camera_anim2, 1) | ||
|
||
|
||
func _ready(): | ||
Input.mouse_mode = Input.MOUSE_MODE_HIDDEN | ||
$AudioStreamPlayer.seek(17.85) | ||
|
||
$Camera3D.position = Vector3(-21.80, 26.629, 28.219) | ||
$Camera3D.rotation = Vector3(0, 127.7, 0) | ||
|
||
|
||
await get_tree().create_timer(2).timeout | ||
camera_anim1() | ||
var tween = get_tree().create_tween().set_parallel() | ||
tween.tween_property($Camera3D/CanvasLayer/ColorRect, "self_modulate", Color(0, 0, 0, 0), 2) | ||
|
||
func _input(_event): | ||
if Input.is_action_just_pressed("Quit"): | ||
get_tree().quit() |
Oops, something went wrong.