Merge branch 'master' of https://github.com/ConjureETS/PillowFight

Conflicts: Assets/Prefabs/Bed.prefab Assets/Prefabs/BunkBed.prefab Assets/Prefabs/Pillow.prefab Assets/Scenes/PatScene.unity
2026-03-24 00:50:59 +00:00 · 2015-08-23 04:48:06 -04:00 · 2015-08-23 04:48:06 -04:00 · 9b0cad2dd0
commit 9b0cad2dd0
parent ccc6589446 70572a099e
53 changed files with 1 additions and 1 deletions
--- a/Design/Materials/No
+++ b/Design/Materials/No
--- a/Assets/Art/Materials/Pillow_Uv.mat
+++ b/Assets/Art/Materials/Pillow_Uv.mat
--- a/Assets/Art/Materials/T_Lit_Cadre_D.mat
+++ b/Assets/Art/Materials/T_Lit_Cadre_D.mat
--- a/Assets/Art/Materials/T_Lit_Drap01_D.mat
+++ b/Assets/Art/Materials/T_Lit_Drap01_D.mat
--- a/Assets/Art/Materials/T_Lit_Matelas_D.mat
+++ b/Assets/Art/Materials/T_Lit_Matelas_D.mat
--- a/Assets/Art/Materials/T_Piece_D.mat
+++ b/Assets/Art/Materials/T_Piece_D.mat
--- a/Assets/Art/Materials/T_Porte_D.mat
+++ b/Assets/Art/Materials/T_Porte_D.mat
--- a/Assets/Art/Materials/T_Sol_D.mat
+++ b/Assets/Art/Materials/T_Sol_D.mat
--- a/Assets/Art/Materials/T_chevet_D.mat
+++ b/Assets/Art/Materials/T_chevet_D.mat
--- a/Assets/Art/Materials/T_commode_1_D.mat
+++ b/Assets/Art/Materials/T_commode_1_D.mat
--- a/Assets/Art/Materials/T_commode_D.mat
+++ b/Assets/Art/Materials/T_commode_D.mat
--- a/Assets/Art/Materials/T_table_D.mat
+++ b/Assets/Art/Materials/T_table_D.mat
--- a/Assets/Art/Materials/T_tabouret_1_D.mat
+++ b/Assets/Art/Materials/T_tabouret_1_D.mat
--- a/Assets/Art/Materials/T_tabouret_2_D.mat
+++ b/Assets/Art/Materials/T_tabouret_2_D.mat
--- a/Assets/Art/Materials/T_tabouret_3_D.mat
+++ b/Assets/Art/Materials/T_tabouret_3_D.mat
--- a/Assets/ControllerMapper.asset
+++ b/Assets/ControllerMapper.asset
--- a/Assets/Materials/ChildMaterial.mat
+++ b/Assets/Materials/ChildMaterial.mat
--- a/Assets/Materials/LavaFloor.mat
+++ b/Assets/Materials/LavaFloor.mat
--- a/Assets/Materials/NormalFloor.mat
+++ b/Assets/Materials/NormalFloor.mat
--- a/Assets/Materials/SlipperyMaterial.physicMaterial
+++ b/Assets/Materials/SlipperyMaterial.physicMaterial
--- a/Assets/Materials/SpriteMom.mat
+++ b/Assets/Materials/SpriteMom.mat
--- a/Assets/Materials/T_Sol_D.mat
+++ b/Assets/Materials/T_Sol_D.mat
--- a/Assets/Prefabs/Bed.prefab
+++ b/Assets/Prefabs/Bed.prefab
--- a/Assets/Prefabs/BunkBed.prefab
+++ b/Assets/Prefabs/BunkBed.prefab
--- a/Assets/Prefabs/Child.prefab
+++ b/Assets/Prefabs/Child.prefab
--- a/Assets/Prefabs/Door
+++ b/Assets/Prefabs/Door
--- a/Assets/Prefabs/Door.prefab
+++ b/Assets/Prefabs/Door.prefab
--- a/Assets/Prefabs/Floor.prefab
+++ b/Assets/Prefabs/Floor.prefab
--- a/Assets/Prefabs/InputManager.prefab
+++ b/Assets/Prefabs/InputManager.prefab
--- a/Assets/Prefabs/Menus/MomWinsMenu.prefab
+++ b/Assets/Prefabs/Menus/MomWinsMenu.prefab
--- a/Assets/Prefabs/Menus/PlayerWinsMenu.prefab
+++ b/Assets/Prefabs/Menus/PlayerWinsMenu.prefab
--- a/Assets/Prefabs/MenusHandler/MenusManager.prefab
+++ b/Assets/Prefabs/MenusHandler/MenusManager.prefab
--- a/Assets/Prefabs/Pillow.prefab
+++ b/Assets/Prefabs/Pillow.prefab
--- a/Assets/Prefabs/Walls.prefab
+++ b/Assets/Prefabs/Walls.prefab
--- a/Assets/Scenes/CameraSimon.unity
+++ b/Assets/Scenes/CameraSimon.unity
--- a/Assets/Scenes/Menu/SplashScreen.unity
+++ b/Assets/Scenes/Menu/SplashScreen.unity
--- a/Assets/Scenes/MomLightSimon.unity
+++ b/Assets/Scenes/MomLightSimon.unity
--- a/Assets/Scenes/PatScene.unity
+++ b/Assets/Scenes/PatScene.unity
--- a/Assets/Scenes/jp.unity
+++ b/Assets/Scenes/jp.unity
--- a/ProjectSettings/AudioManager.asset
+++ b/ProjectSettings/AudioManager.asset
--- a/ProjectSettings/DynamicsManager.asset
+++ b/ProjectSettings/DynamicsManager.asset
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
--- a/ProjectSettings/EditorSettings.asset
+++ b/ProjectSettings/EditorSettings.asset
--- a/ProjectSettings/GraphicsSettings.asset
+++ b/ProjectSettings/GraphicsSettings.asset
--- a/ProjectSettings/InputManager.asset
+++ b/ProjectSettings/InputManager.asset
--- a/ProjectSettings/NavMeshAreas.asset
+++ b/ProjectSettings/NavMeshAreas.asset
--- a/ProjectSettings/NetworkManager.asset
+++ b/ProjectSettings/NetworkManager.asset
--- a/ProjectSettings/Physics2DSettings.asset
+++ b/ProjectSettings/Physics2DSettings.asset
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@ -1,2 +1,2 @@
-m_EditorVersion: 5.0.2f1
+m_EditorVersion: 5.1.2f1
 m_StandardAssetsVersion: 0
--- a/ProjectSettings/QualitySettings.asset
+++ b/ProjectSettings/QualitySettings.asset
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
--- a/ProjectSettings/TimeManager.asset
+++ b/ProjectSettings/TimeManager.asset
`@ -1,2 +1,2 @@`
	`m_EditorVersion: 5.0.2f1`	`m_EditorVersion: 5.1.2f1`
	`m_StandardAssetsVersion: 0`	`m_StandardAssetsVersion: 0`