Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
9ee154a
init project
Unstoppable7 Sep 11, 2020
7993042
FMOD Pack
raistlinfuego Sep 11, 2020
71a5007
add ignore ink package
Unstoppable7 Sep 12, 2020
88816e3
Update .gitignore
Unstoppable7 Sep 12, 2020
8d995c4
Update .gitignore
Unstoppable7 Sep 12, 2020
bbc8569
Merge branch 'develop' of github.com:toches-games/1-Bit-Weekend-2 int…
Unstoppable7 Sep 12, 2020
b4bf013
update git ignore
Unstoppable7 Sep 12, 2020
4964ded
Update gitignore
jonatcantor Sep 12, 2020
0ae5abf
Added puzzle game
jonatcantor Sep 12, 2020
abba528
Merge branch 'puzzle-game' into develop
jonatcantor Sep 12, 2020
14ead1a
Upgrade puzzle movement and correct positions
jonatcantor Sep 12, 2020
ca3275a
Added puzzle board sprites
jonatcantor Sep 12, 2020
22fac73
Merge branch 'puzzle-game' into develop
jonatcantor Sep 12, 2020
777b07d
Upgrade puzzle game
jonatcantor Sep 12, 2020
f077d0f
Added puzzle figure sprites
jonatcantor Sep 12, 2020
f0af6db
Fixed unique puzzle image
jonatcantor Sep 12, 2020
5769772
Merge branch 'fix-puzzle-figures' into develop
jonatcantor Sep 12, 2020
2929202
Added post processing effects
jonatcantor Sep 12, 2020
172f6d6
Fixed some figure colliders
jonatcantor Sep 12, 2020
bca3c22
add narrative system
Unstoppable7 Sep 13, 2020
afc74b9
Merge branch 'develop' of github.com:toches-games/1-Bit-Weekend-2 int…
Unstoppable7 Sep 13, 2020
1109a0b
update text of dialog
Unstoppable7 Sep 13, 2020
f018dda
Fix post processing effects
jonatcantor Sep 13, 2020
c719ba2
fix puzzle
Unstoppable7 Sep 13, 2020
4c51d08
fix puzzle
Unstoppable7 Sep 13, 2020
c9a2e40
Merge branch 'develop' of github.com:toches-games/1-Bit-Weekend-2 int…
Unstoppable7 Sep 13, 2020
f4ef851
Sound
raistlinfuego Sep 13, 2020
a483a3e
Merge branch 'develop' of https://github.com/toches-games/1-Bit-Weeke…
raistlinfuego Sep 13, 2020
0552e5b
fix some errors
Unstoppable7 Sep 13, 2020
0a2eced
Delete ClickButton?.mp3
Unstoppable7 Sep 13, 2020
b31d905
Merge branch 'develop' of github.com:toches-games/1-Bit-Weekend-2 int…
Unstoppable7 Sep 13, 2020
8244727
Sounds
raistlinfuego Sep 13, 2020
db0851c
add code for implement sounds
Unstoppable7 Sep 13, 2020
65c5126
Sound and Music
raistlinfuego Sep 13, 2020
84d5121
.gitignore is now working
Unstoppable7 Sep 14, 2020
69bc1e4
update gitignore
Unstoppable7 Sep 14, 2020
8f99fbe
merge
jonatcantor Sep 14, 2020
537f959
Added sword sprite
jonatcantor Sep 14, 2020
0dc26a2
test version
jonatcantor Sep 14, 2020
341695b
Added some references in puzzle scene
jonatcantor Sep 14, 2020
4eeed43
Merge branch 'test' into develop
jonatcantor Sep 14, 2020
89e1e6c
add intro and conversation animations
Unstoppable7 Sep 14, 2020
4c19642
Added all references in puzzle scene
jonatcantor Sep 14, 2020
40b8cfd
Merge branch 'references' into develop
jonatcantor Sep 14, 2020
66e164f
Added card options
jonatcantor Sep 14, 2020
7fed768
Merge branch 'card-options' into develop
jonatcantor Sep 14, 2020
2a10ee2
add part of finals
Unstoppable7 Sep 14, 2020
0de624c
Added card animations
jonatcantor Sep 14, 2020
ad152f4
Merge branch 'card-animation' into develop
jonatcantor Sep 14, 2020
fa486aa
Added post processing effects
jonatcantor Sep 14, 2020
ecec44f
fix narrative final
Unstoppable7 Sep 14, 2020
08a40b5
Added instruction panel
jonatcantor Sep 14, 2020
57e68a3
fix initial narrative
Unstoppable7 Sep 14, 2020
c038f10
Merge branch 'instructions' into develop
jonatcantor Sep 14, 2020
c65c2c2
Merge branch 'develop' of github.com:toches-games/1-Bit-Weekend-2 int…
Unstoppable7 Sep 14, 2020
a536e83
add gameover panel
Unstoppable7 Sep 14, 2020
d33e071
update text prefab
Unstoppable7 Sep 14, 2020
b44fb44
fix general bugs
Unstoppable7 Sep 14, 2020
3830221
fix little bug
Unstoppable7 Sep 14, 2020
a273c69
add language changes
Unstoppable7 Sep 14, 2020
27993f8
Sound
raistlinfuego Sep 14, 2020
bac34a3
update narrative system
Unstoppable7 Sep 19, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
15 changes: 15 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,18 @@ sysinfo.txt
# Crashlytics generated file
crashlytics-build.properties

# FMOD files
Assets/Plugins/FMOD/Resources/FMODStudioCache.asset
Assets/StreamingAssets/*.bank
fmod_editor.log

.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
Icon?
ehthumbs.db
Thumbs.db
Bin/
*~
8 changes: 8 additions & 0 deletions Assets/Animations.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/Animations/Animators.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

101 changes: 101 additions & 0 deletions Assets/Animations/Animators/BlackTransition.controller
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1107 &-3731700640439438202
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 2610037041524499760}
m_Position: {x: 200, y: 0, z: 0}
- serializedVersion: 1
m_State: {fileID: -3186248103467181879}
m_Position: {x: 235, y: 65, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 2610037041524499760}
--- !u!1102 &-3186248103467181879
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BlackTransitionOUT
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 403fe3598dc9e31489967c1308536ebe, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BlackTransition
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -3731700640439438202}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &2610037041524499760
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BlackTransitionIN
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 53330734ce910a14babe8a59ffff4070, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
8 changes: 8 additions & 0 deletions Assets/Animations/Animators/BlackTransition.controller.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

72 changes: 72 additions & 0 deletions Assets/Animations/Animators/GameOverTransition.controller
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1107 &-6119037953404127600
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -4838599992257328137}
m_Position: {x: 200, y: 0, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -4838599992257328137}
--- !u!1102 &-4838599992257328137
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: GameOverIN
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: f9194ce0da287ca43ac5c37ca774fa9b, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: GameOverTransition
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -6119037953404127600}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

116 changes: 116 additions & 0 deletions Assets/Animations/BlackTransitionIN.anim
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BlackTransitionIN
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path:
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 304273561
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
typeID: 114
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 2
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path:
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
8 changes: 8 additions & 0 deletions Assets/Animations/BlackTransitionIN.anim.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading