Skip to content
Permalink
Browse files

fixing the broken nodes that were required to run and menu button layout

  • Loading branch information...
JenniBee committed Apr 17, 2017
1 parent dd1f953 commit b7d419e783b9a5fbbb510253207e5c4fabe45155
@@ -1,9 +1,14 @@
MIT License

Copyright (c) 2017 Double-Fine-Game-Club
Amnesia Adventure Copyright (c) 2017 Amnesia Adventure Contributors.

Godot Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. Copyright (c) 2014-2017 Godot Engine contributors.

Escoria Copyright (c) 2012-2016 Juan Linietsky, Ariel Manzur.

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

@@ -9,7 +9,7 @@ Amnesia Adventure is an adventure game about a retired adventurer travelling int
The relevant forum is [here](https://forums.doublefine.com/forum/82-amnesia-adventure/), and there is additional information to be found in this repo's issue tracker.

# Communication
Coordination and decision making will generally happen via IRC in the #amnesia-fortnight-community ([webchat](http://mibbit.com/?channel=#amnesia-fortnight-community&server=irc.foonetic.net)) IRC channel on foonetic.net.
Coordination and decision making will generally happen via IRC in the #amnesia-fortnight-community ([webchat](http://mibbit.com/#amnesia-fortnight-community@irc.foonetic.net)) IRC channel on foonetic.net.

# Contributing
This repository is specifically for the game's code and game-ready assets, which should be contributed as "pull requests". Asset sources should be contributed to [this repository](https://github.com/Double-Fine-Game-Club/amnesia-adventure-assets) instead.
@@ -66,3 +66,4 @@ main_menu="res://ui/main_menu.tscn"
in_game_menu=""
credits=""
savegames=""

BIN -51 Bytes (98%) game/inventory_items.scn
Binary file not shown.
@@ -1,6 +1,7 @@
[gd_scene load_steps=2 format=1]
[gd_scene load_steps=3 format=1]

[ext_resource path="res://globals/bg_music.gd" type="Script" id=1]
[ext_resource path="res://scenes/intro-game/sounds/asianoriental2.ogg" type="AudioStream" id=2]

[node name="bg_music" type="Control"]

@@ -27,9 +28,17 @@ use_action_menu = true
interact_angle = -1
talk_animation = "talk"
active = true
placeholders = {
placeholders = { }

}
use_custom_z = false
[node name="stream" type="StreamPlayer" parent="."]

stream/stream = ExtResource( 2 )
stream/play = false
stream/loop = false
stream/volume_db = 0.0
stream/autoplay = true
stream/paused = false
stream/loop_restart_time = 0.0
stream/buffering_ms = 500


BIN +5 Bytes (100%) globals/dd_player.scn
Binary file not shown.
BIN +268 Bytes (130%) globals/game.scn
Binary file not shown.
BIN +3 Bytes (100%) globals/global_vm.scn
Binary file not shown.
BIN -17 Bytes (99%) globals/telon.scn
Binary file not shown.
BIN +65 Bytes (110%) main.scn
Binary file not shown.
@@ -10,7 +10,7 @@ cut_scene telon fade_out

## Player

change_scene res://scenes/room1/room1.scn
teleport_pos player 1509.477905 688.179199
change_scene res://scenes/test/test.scn
teleport_pos player 675.640259 445.582794

cut_scene telon fade_in

This file was deleted.

BIN -277 Bytes (90%) ui/dd_default.scn
Binary file not shown.
BIN -1 Byte (100%) ui/dialog_default.scn
Binary file not shown.
BIN -47 Bytes (97%) ui/inventory.scn
Binary file not shown.
@@ -20,10 +20,10 @@ focus/ignore_mouse = false
focus/stop_mouse = true
size_flags/horizontal = 2
size_flags/vertical = 2
margin/left = 163.0
margin/top = 140.0
margin/right = 733.0
margin/bottom = 229.0
margin/left = 118.0
margin/top = 153.0
margin/right = 688.0
margin/bottom = 242.0
toggle_mode = false
enabled_focus_mode = 2
shortcut = null
@@ -36,10 +36,10 @@ focus/ignore_mouse = false
focus/stop_mouse = true
size_flags/horizontal = 2
size_flags/vertical = 2
margin/left = 159.0
margin/top = 284.0
margin/right = 729.0
margin/bottom = 373.0
margin/left = 121.0
margin/top = 259.0
margin/right = 691.0
margin/bottom = 348.0
toggle_mode = false
enabled_focus_mode = 2
shortcut = null
@@ -52,10 +52,10 @@ focus/ignore_mouse = false
focus/stop_mouse = true
size_flags/horizontal = 2
size_flags/vertical = 2
margin/left = 199.0
margin/top = 830.0
margin/right = 769.0
margin/bottom = 919.0
margin/left = 120.0
margin/top = 365.0
margin/right = 690.0
margin/bottom = 454.0
toggle_mode = false
enabled_focus_mode = 2
shortcut = null
BIN -631 Bytes (65%) ui/verb_menu.scn
Binary file not shown.

0 comments on commit b7d419e

Please sign in to comment.
You can’t perform that action at this time.