Skip to content

Commit

Permalink
Merge pull request #224 from fga-gpp-mds/development
Browse files Browse the repository at this point in the history
Gerando versão estável 3.0
  • Loading branch information
arthurbdiniz authored Jun 5, 2018
2 parents 9080bf2 + ac01a88 commit bfc7a72
Show file tree
Hide file tree
Showing 569 changed files with 72,326 additions and 6,135 deletions.
7 changes: 3 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,9 @@ Assets/AssetStoreTools*
*.tmp
*.svd
Reabilitacao-Motora/Assets/Movimentos/
Reabilitacao-Motora/Assets/Plugins/fisiotech.db
Reabilitacao-Motora/Assets/Exercicios/


log.txt
Reabilitacao-Motora/log.txt
# ============ #
# OS generated #
# ============ #
Expand All @@ -46,4 +45,4 @@ ehthumbs.db
[Tt]humbs.db
[Dd]esktop.ini
Corridor/Library/ShaderCache/
Corridor/Library/metadata/
Corridor/Library/metadata/
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ before_install:
- chmod a+x ./Reabilitacao-Motora/Assets/Scripts/travis_unity_key.sh
- chmod a+x ./Reabilitacao-Motora/Assets/Scripts/travis_build.sh
- chmod a+x ./Reabilitacao-Motora/Assets/Scripts/travis_tests.sh
- chmod a+x ./Reabilitacao-Motora/Assets/Scripts/playTest_log_converter.py
- chmod a+x ./Reabilitacao-Motora/Assets/Scripts/editorTest_log_converter.py
- chmod a+x ./Reabilitacao-Motora/Assets/Scripts/travis_unity_return_key.sh
- chmod a+x ./Reabilitacao-Motora/Assets/Scripts/travis_validation.sh
- chmod a+x ./Reabilitacao-Motora/Assets/Scripts/travis_deploy_dev.sh
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
## Link para o site do projeto
[Reabilitação motora](https://fga-gpp-mds.github.io/2018.1-Reabilitacao-Motora/)

## Download do launcher da aplicação
- [Arquivo zip](https://github.com/arthurbdiniz/Launcher/raw/master/build/distributions/launcher.zip)
- [Arquivo tar](https://github.com/arthurbdiniz/Launcher/raw/master/build/distributions/launcher.tar)

# Reabilitação Motora

<p align="justify">&emsp;&emsp;Este trabalho propõe o desenvolvimento de uma plataforma de captura, monitoramento e avaliação de movimentos realizados em sessões de fisioterapia. Os dados coletados são fornecidos ao fisioterapeuta ou a qualquer outra aplicação capaz de operar o produto em questão.</p>
Expand Down
10 changes: 10 additions & 0 deletions Reabilitacao-Motora/Assets/Actions/Boy.meta

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

69 changes: 69 additions & 0 deletions Reabilitacao-Motora/Assets/Actions/Boy/CharacterBoy.controller
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: CharacterBoy
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 1107587392177350070}
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 &1102947006179991662
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Idle
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: d03758b33e8180e488fd959db3eabd20, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &1107587392177350070
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 1102947006179991662}
m_Position: {x: 264, y: 24, 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: 1102947006179991662}

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

Binary file not shown.
Loading

0 comments on commit bfc7a72

Please sign in to comment.