Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
8715a9a
Criar background e tilemap
Jonatanc05 Mar 27, 2020
c6c77b4
Merge pull request #6 from lab-rats-team/feat/cenario
Jonatanc05 Apr 3, 2020
b4664b7
Merge branch 'master' into develop
pmesq Apr 3, 2020
6399606
Adicionar player com protótipo de pulo
Jonatanc05 Apr 3, 2020
1841736
Consertar bug do jumpRequestDuration
Jonatanc05 Apr 6, 2020
ace8843
Melhorar pulo + movimento simples
Jonatanc05 Apr 6, 2020
39f862e
Pequeno ajuste
Jonatanc05 Apr 6, 2020
a1fdfec
Invertendo sprite ao movimentar para esquerda
Jonatanc05 Apr 6, 2020
83a2166
Usar pacote Cinemachine para movimento da câmera
Jonatanc05 Apr 6, 2020
ff8cce5
Subir câmera e remover bug pular nas paredes
Jonatanc05 Apr 7, 2020
0937c5e
Fazer player abaixar ao pressionar S
Jonatanc05 Apr 10, 2020
1e83316
Animar movimento já implementados
Jonatanc05 Apr 10, 2020
c173888
Fazer player executar um dash
Jonatanc05 Apr 11, 2020
3c701fd
Corrigir bug na animação (segurar S durante queda)
Jonatanc05 Apr 11, 2020
19de4bf
Tornar tecla de pulo customizável
Jonatanc05 Apr 14, 2020
30461c5
Merge pull request #7 from lab-rats-team/feat/movimento
Jonatanc05 Apr 17, 2020
d8b2401
Tornando o tilemap um collider contínuo
Jonatanc05 Apr 17, 2020
9c9430c
Merge branch 'fix/player-travado' into develop
Jonatanc05 Apr 17, 2020
678d4c0
Merge branch 'master' into develop
Jonatanc05 Apr 18, 2020
a213c3f
Geração da Toupeira by Funeco
Jonatanc05 Apr 24, 2020
911adf8
Ajustando código da toupeira
Jonatanc05 Apr 25, 2020
6c25785
Criando golpe do jogador
Jonatanc05 May 1, 2020
1976ed2
Melhorar combate e implementar tileset
Jonatanc05 May 14, 2020
23519f4
Atualizar método de paralisar jogador
Jonatanc05 May 15, 2020
cfe7456
Usar padrão do fundo da caverna
Jonatanc05 May 15, 2020
bc53685
Merge branch 'feat/combate' into develop
Jonatanc05 May 15, 2020
3afa7de
Consertar movimento após coletar arma e dash
Jonatanc05 May 16, 2020
b299c37
Criar primeiro level
NikolasTola May 16, 2020
93495ae
Fazer player piscar ao tomar dano
Jonatanc05 May 16, 2020
5a2abcc
Consertar o comportamento do dano e animação de morte toupeira
Jonatanc05 May 16, 2020
cadb731
Merge branch 'master' into develop
pmesq May 16, 2020
e891289
Atualizar versão do Unity para 2019.3.13f1
pmesq May 16, 2020
878cbf7
Setar valores padrão no inspector
Jonatanc05 May 17, 2020
65987dc
Adição de novos tiles e da colisão de câmera
NikolasTola May 17, 2020
54aecec
Merge remote-tracking branch 'origin/develop' into develop
NikolasTola May 17, 2020
7f28cbb
Merge branch 'feat/upgrade' into develop
pmesq May 17, 2020
a65fe2f
Adição e modificações de novos tiles
NikolasTola May 19, 2020
36ef3ec
Merge remote-tracking branch 'origin/develop' into develop
NikolasTola May 19, 2020
1ab8235
Creating chameleon
Jonatanc05 May 19, 2020
79814a4
Fazer projétil colidir
Jonatanc05 May 19, 2020
da0fee0
Merge branch 'feat/chameleon' into develop
Jonatanc05 May 19, 2020
2fc3e0c
Limitar movimento da câmera by Nikolas
Jonatanc05 May 20, 2020
5e41848
Merge branch 'feat/camera-limit' into develop
Jonatanc05 May 20, 2020
34043dd
Generalizar mais as colisões do player
Jonatanc05 May 20, 2020
f476433
Consertar colisão com camaleão
Jonatanc05 May 20, 2020
47d52e4
Consertar direção do knockback ao colidir com inimigo
Jonatanc05 May 20, 2020
cb9718e
Criando animações player morrendo
GuiYago2015 May 21, 2020
7630a3f
Finalizando animações do player morrendo
GuiYago2015 May 21, 2020
af42a9d
Modificar a caixa de colisão da câmera
NikolasTola May 21, 2020
002ee59
Aperfeiçoando colisões com camaleão verde
Jonatanc05 May 22, 2020
dad98b6
Consertar morte, camaleão vermelho e spikes
Jonatanc05 May 22, 2020
d04ba76
Usar nova animação e setar tempo de animação
Jonatanc05 May 22, 2020
7b81816
Evitar conflito de merge
Jonatanc05 May 22, 2020
2fa55fb
Deletando cena antiga
Jonatanc05 May 22, 2020
573318c
Merge branch 'develop' into fix/player-collision
Jonatanc05 May 22, 2020
0e6d5dd
Consertar downgrade
Jonatanc05 May 22, 2020
85f7015
Merge branch 'fix/player-collision' into develop
Jonatanc05 May 22, 2020
39cabcf
Merge branch 'fix/player-death-animation' into develop
Jonatanc05 May 22, 2020
5dac250
Complementar últimos dois merges
Jonatanc05 May 22, 2020
415a537
Adicionar novos blocos
NikolasTola May 22, 2020
7663c07
Merge branch 'develop' into fix/camera-collison
Jonatanc05 May 22, 2020
d93ae52
Complementar merge com develop
Jonatanc05 May 22, 2020
4b7e535
Merge branch 'fix/camera-collison' into develop
Jonatanc05 May 22, 2020
a40101b
Consertar bug do player aparecer na frente dos spikes
Jonatanc05 May 22, 2020
51d2a1c
Adicionar blocos no primeiro ato
pmesq May 22, 2020
8e9c3b5
Adicionar toupeiras no level
Jonatanc05 May 25, 2020
3d5d642
Criar prefab da pedra
Jonatanc05 May 25, 2020
1cf0e76
Merge branch 'feat/breakable-rocks' into feat/level-design-stage-1
Jonatanc05 May 25, 2020
905a5d2
Colocar pedras quebráveis no level
Jonatanc05 May 25, 2020
83a1a4a
Colocar entrada/saída da caverna
NikolasTola May 25, 2020
2d41834
Adicionar papel coletável
NikolasTola May 25, 2020
ecbe021
Adicionar espinhos
NikolasTola May 25, 2020
8ec28cb
Finalizar camaleão e consertar erros
Jonatanc05 May 25, 2020
e9ce8f8
Merge pull request #9 from lab-rats-team/feat/level-design-stage-1
Jonatanc05 May 25, 2020
65d43fe
Tornar "total" alterável pelo inspetor
Jonatanc05 May 25, 2020
35d8fc4
Merge pull request #10 from lab-rats-team/fix/tileset-adjustment
Jonatanc05 May 25, 2020
dacdb80
Complementar últimos merges
Jonatanc05 May 25, 2020
38af215
Balancear camaleões
NikolasTola May 25, 2020
29593ef
Criar Estalactites
GuiYago2015 Jun 5, 2020
986a26d
Voltar projeto para versão correta
Jonatanc05 Jun 8, 2020
1f77585
Excluir biblioteca inutilizada
Jonatanc05 Jun 8, 2020
d70aa5e
Tirar anti-aliasing dos sprites
Jonatanc05 Jun 8, 2020
e75e28d
Fazer Estalagtite4 bater no chão
Jonatanc05 Jun 9, 2020
8664265
Finalizando Estalactites
GuiYago2015 Jun 12, 2020
43af102
Update ProjectVersion.txt
GuiYago2015 Sep 14, 2020
e6c9849
implementando terremoto
GuiYago2015 Oct 8, 2020
1e4382a
bugfix
GuiYago2015 Oct 9, 2020
6d9d3fc
Reparar bugs, balancear valores, e padronizar (parte do) código
Jonatanc05 Oct 9, 2020
67a325e
Update Stage 1.unity
GuiYago2015 Oct 13, 2020
33acb25
Dor de cabeça no bob
GuiYago2015 Oct 13, 2020
462c1c6
estalactitie finalizada
GuiYago2015 Oct 13, 2020
34b6fea
Alterando queda das estalactites
GuiYago2015 Feb 8, 2021
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
  •  
  •  
  •  
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/Estalactite.meta

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

68 changes: 68 additions & 0 deletions Assets/Animations/Estalactite/Caindo.anim
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
%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: Caindo
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 21300000, guid: f46bf5b848f03374abc01f4fb75e975c, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
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: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 21300000, guid: f46bf5b848f03374abc01f4fb75e975c, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.016666668
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
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: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
8 changes: 8 additions & 0 deletions Assets/Animations/Estalactite/Caindo.anim.meta

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

133 changes: 133 additions & 0 deletions Assets/Animations/Estalactite/Estalactite.controller
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1107 &-6852727156094745572
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: 6961307363200477531}
m_Position: {x: 270, y: 20, z: 0}
- serializedVersion: 1
m_State: {fileID: 6172148710201986223}
m_Position: {x: 270, y: 90, 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: 6961307363200477531}
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Estalactite
serializedVersion: 5
m_AnimatorParameters:
- m_Name: Cai
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -6852727156094745572}
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 &6172148710201986223
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Caindo
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: 0ad39533dbf7bd94990a3b1579535bdd, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &6961307363200477531
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Normal
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 8879898573253638554}
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: ff601309375f52e4f9bb7f9c8285d9e5, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &8879898573253638554
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Cai
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 6172148710201986223}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0.9
m_HasExitTime: 0
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
8 changes: 8 additions & 0 deletions Assets/Animations/Estalactite/Estalactite.controller.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/Estalactite/Estalactite1.meta

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

68 changes: 68 additions & 0 deletions Assets/Animations/Estalactite/Estalactite1/Caindo1.anim
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
%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: Caindo1
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 21300000, guid: e8469edc9c6ed1145addc9e1af7e466d, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
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: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 21300000, guid: e8469edc9c6ed1145addc9e1af7e466d, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.016666668
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
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: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
8 changes: 8 additions & 0 deletions Assets/Animations/Estalactite/Estalactite1/Caindo1.anim.meta

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

Loading