# Core&Graphic&Fix

## Fixed

* items will not in the same dock now .
* `Element` now have properties for scaling : `scaleDock` and `scaleNormal` . When a `Element` belong to a `Container` that named "QK" , `scaleDock` applied
* FSM events  `item_x_work` and `item_x_broken` will be called immediately while placing , and check circuit after 2 seconds.
* Items will rotate along the container now .

## About fix

Elements should be set a container , like *QK* , at begining to avoid in the same container at one time ;

Level 5 now is a example for scaling dock , some items are smaller than usual .

I add some action in "state 1" of  `_CircuitMaster` , it will call a method "checkCircuit" after 2 sec. for waiting work-animation finished .
2014-02-13 fix

Animation adding and script fixed ;

1. Now gameObject LEVEL1 can be deactivated without errors occurred .
2. items which is previous level now can not be moved
3. items that is already “work” will freeze immediately now
4. Items now will not call the “item_?_broken” event when placed to the
dock .
5. Feel free to remove the events that are not used :D
6. Containers is will not disappear with no reason now , I hope :p
7. Only ONE work/broken event will be called while placing a item now .
dfs

what
herro
Merge branch 'master' of https://github.com/maxbottega/PipesGame
Add Timer
Network demo
Merge branch 'master' of https://github.com/maxbottega/PipesGame

Conflicts:
	Assets/Prefabs/GAME_VIEW.prefab
	Assets/Scenes/Game_Core&Graphics_002.unity
new graphics
removed useless files
re pull
2014-02-13 fix

Animation adding and script fixed ;

1. Now gameObject LEVEL1 can be deactivated without errors occurred .
2. items which is previous level now can not be moved
3. items that is already “work” will freeze immediately now
4. Items now will not call the “item_?_broken” event when placed to the
dock .
5. Feel free to remove the events that are not used :D
6. Containers is will not disappear with no reason now , I hope :p
7. Only ONE work/broken event will be called while placing a item now .
dfs

what
Add Timer
Network demo
new graphics
removed useless files
re pull
Merge branch 'newMaster'

* newMaster:
  re pull
  removed useless files
  new graphics
  Network demo
  Add Timer
  herro
  dfs
  2014-02-13 fix
  # Core&Graphic&Fix

Conflicts:
	Assembly-UnityScript-Editor-vs.unityproj
	Assembly-UnityScript-Editor.unityproj
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
	Assets/Graphic Assets/Animation.meta
	Assets/Graphic Assets/Animations.meta
	Assets/Graphic Assets/Animations.meta~HEAD
	Assets/Graphic Assets/Animations/Flame_light.anim
	Assets/Graphic Assets/Materials/65.mat
	Assets/Graphic Assets/Materials/GameItems.meta
	Assets/Graphic Assets/Materials/GameItems/45.mat
	Assets/Graphic Assets/Materials/GameItems/Concrete_Walls.mat
	Assets/Graphic Assets/Materials/GameItems/DashedBox.mat
	Assets/Graphic Assets/Materials/GameItems/Dirt.mat
	Assets/Graphic Assets/Materials/GameItems/Glow.mat
	Assets/Graphic Assets/Materials/GameItems/Heat_gradient.mat
	Assets/Graphic Assets/Materials/GameItems/Radiator.mat
	Assets/Graphic Assets/Materials/GameItems/Red_Dial.mat
	Assets/Graphic Assets/Materials/GameItems/StillWater.mat
	Assets/Graphic Assets/Materials/GameItems/Water.mat
	Assets/Graphic Assets/Materials/GameItems/manometer.mat
	Assets/Graphic Assets/Materials/Loading/Glass 1.mat
	Assets/Graphic Assets/Meshes/Game_meshes_0005.fbx
	Assets/Graphic Assets/Meshes/Game_meshes_0005.fbx.meta
	Assets/Graphic Assets/Meshes/Materials/Air_01.mat
	Assets/Graphic Assets/Meshes/Materials/Air_04.mat
	Assets/Graphic Assets/Meshes/Materials/Default  (1).mat
	Assets/Graphic Assets/Meshes/Materials/Default  (2).mat
	Assets/Graphic Assets/Meshes/Materials/Default (1).mat.meta
	Assets/Graphic Assets/Meshes/Materials/Default (10).mat.meta
	Assets/Graphic Assets/Meshes/Materials/Default (11).mat.meta
	Assets/Graphic Assets/Meshes/Materials/Default (12).mat.meta
	Assets/Graphic Assets/Meshes/Materials/black_plastic   (4).mat
	Assets/Graphic Assets/Meshes/Materials/brass.mat
	Assets/Graphic Assets/Meshes/Materials/chrome  (1).mat
	Assets/Graphic Assets/Meshes/Materials/chrome (1).mat.meta
	Assets/Graphic Assets/Meshes/Materials/chrome (2).mat.meta
	Assets/Graphic Assets/Meshes/Materials/chrome _.mat.meta
	Assets/Graphic Assets/Meshes/Materials/chrome.mat
	Assets/Graphic Assets/Meshes/Materials/chrome.mat.meta
	Assets/Graphic Assets/Meshes/Materials/dirt.mat
	Assets/Graphic Assets/Meshes/Materials/fire.mat
	Assets/Graphic Assets/Meshes/Materials/heat.mat
	Assets/Graphic Assets/Meshes/Materials/label.mat
	Assets/Graphic Assets/Meshes/Materials/manometer.mat
	Assets/Graphic Assets/Meshes/Materials/sezione  (1).mat
	Assets/Graphic Assets/Meshes/Materials/sezione_.mat.meta
	Assets/Graphic Assets/Meshes/Materials/th_column.mat
	Assets/Graphic Assets/Meshes/Materials/thermometer.mat
	Assets/Graphic Assets/Meshes/Pav_heating.fbx
	Assets/Graphic Assets/Meshes/Pav_heating.fbx.meta
	Assets/Graphic Assets/Meshes/Pipes_Air.fbx
	Assets/Graphic Assets/Meshes/Pipes_Dirt.fbx
	Assets/Graphic Assets/Meshes/Pipes_Dirt.fbx.meta
	Assets/Graphic Assets/Meshes/Pipes_Heat.fbx
	Assets/Graphic Assets/Meshes/Pipes_Heat.fbx.meta
	Assets/Graphic Assets/Meshes/Pipes_Water.fbx
	Assets/Graphic Assets/Meshes/Skinned_Items.fbx
	Assets/Graphic Assets/Meshes/Skinned_Items.fbx.meta
	Assets/Graphic Assets/Meshes/Skinned_Items_02.fbx.meta
	Assets/Graphic Assets/Meshes/dashed_cube.fbx
	Assets/Graphic Assets/Meshes/manometer.fbx
	Assets/Graphic Assets/Meshes/thermometer.fbx
	Assets/Graphic Assets/Textures/45.tga
	Assets/Graphic Assets/Textures/65.tga
	Assets/Graphic Assets/Textures/Air_02.tga.meta
	Assets/Graphic Assets/Textures/Air_04.tga
	Assets/Graphic Assets/Textures/Dirt_01.tga
	Assets/Graphic Assets/Textures/MatCaps.meta
	Assets/Graphic Assets/Textures/MatCaps/BlueGLass.png.meta
	Assets/Graphic Assets/Textures/MatCaps/Blue_glossy_metallic.tga.meta
	Assets/Graphic Assets/Textures/MatCaps/BronzeAntique.png.meta
	Assets/Graphic Assets/Textures/MatCaps/Bronze_sandblasted 1.tga.meta
	Assets/Graphic Assets/Textures/MatCaps/Bronze_sandblasted.tga.meta
	Assets/Graphic Assets/Textures/MatCaps/Bronze_sandblasted_color.tga.meta
	Assets/Graphic Assets/Textures/MatCaps/SingleLightRed.png.meta
	Assets/Graphic Assets/Textures/MatCaps/SinglelightBrown.png.meta
	Assets/Graphic Assets/Textures/MatCaps/Sketch.png.meta
	Assets/Graphic Assets/Textures/MatCaps/SkinSpringy.png.meta
	Assets/Graphic Assets/Textures/dashedbox.png
	Assets/Graphic Assets/Textures/manometer.psd
	Assets/Graphic Assets/Textures/thermometer.psd
	Assets/Graphics.meta
	Assets/Graphics/Meshes.meta
	Assets/Graphics/Meshes/Materials.meta
	Assets/Graphics/Meshes/Materials/UV_layout_05.mat
	Assets/Graphics/Meshes/Materials/glow.mat
	Assets/Graphics/Meshes/Z_tank_RIG.fbx.meta
	Assets/Graphics/Meshes/Z_walker_RIG_02.fbx.meta
	Assets/Graphics/Textures.meta
	Assets/Graphics/Textures/Character_texture.tga.meta
	Assets/Graphics/Textures/cubeCursor.png.meta
	Assets/Graphics/Textures/cylinderCursor.png.meta
	Assets/Graphics/Textures/sphereCursor.png.meta
	Assets/NGUI/Examples/Scenes.meta
	Assets/NGUI/Examples/Scenes/Example 2 - Interaction.unity.meta
	Assets/NGUI/Examples/Scenes/Tutorial 4 - Tiled Sprite.unity.meta
	Assets/NGUI/Examples/Scenes/Tutorial 7 - Slider.unity.meta
	Assets/NGUI/Examples/Scenes/Tutorial 9 - Input.unity.meta
	Assets/Photon Unity Networking/Editor/PhotonNetwork/PhotonEditor.cs
	Assets/Photon Unity Networking/Editor/PhotonNetwork/PhotonViewInspector.cs
	Assets/Photon Unity Networking/Editor/PhotonNetwork/ServerSettingsInspector.cs
	Assets/Photon Unity Networking/PhotonNetwork-Documentation.pdf
	Assets/Photon Unity Networking/PlayMaker/Actions/PhotonNetworkConnectManually.cs
	Assets/Photon Unity Networking/PlayMaker/Actions/PhotonNetworkConnectUsingSettings.cs
	Assets/Photon Unity Networking/PlayMaker/Actions/PhotonNetworkCreateRoomAdvanced.cs
	Assets/Photon Unity Networking/PlayMaker/Actions/PhotonNetworkDeleteRoomCustomProperty.cs
	Assets/Photon Unity Networking/PlayMaker/Actions/PhotonNetworkJoinRandomRoom.cs
	Assets/Photon Unity Networking/PlayMaker/Actions/PhotonNetworkJoinRoom.cs
	Assets/Photon Unity Networking/PlayMaker/Actions/PhotonNetworkSetPlayerCustomProperty.cs
	Assets/Photon Unity Networking/PlayMaker/Actions/PhotonNetworkSetPlayerName.cs
	Assets/Photon Unity Networking/PlayMaker/Actions/PhotonNetworkSetRoomCustomProperty.cs
	Assets/Photon Unity Networking/PlayMaker/Actions/PhotonViewDeleteOwnerCustomProperty.cs
	Assets/Photon Unity Networking/PlayMaker/Editor/PlayMakerPhotonEditorUtility.cs
	Assets/Photon Unity Networking/PlayMaker/Editor/PlayMakerPhotonWizard.cs
	Assets/Photon Unity Networking/PlayMaker/ReleaseNotes.txt
	Assets/Photon Unity Networking/PlayMaker/Resources/PlayMaker Photon Proxy.prefab
	Assets/Photon Unity Networking/PlayMaker/Scripts/PlayMakerPhotonProxy.cs
	Assets/Photon Unity Networking/PlayMaker/Scripts/PlayMakerPhotonView.cs
	Assets/Photon Unity Networking/PlayMaker/Scripts/UnitySerializer.cs.meta
	Assets/Photon Unity Networking/Plugins/PhotonNetwork/CustomTypes.cs
	Assets/Photon Unity Networking/Plugins/PhotonNetwork/Enums.cs
	Assets/Photon Unity Networking/Plugins/PhotonNetwork/Extension/PhotonView.cs
	Assets/Photon Unity Networking/Plugins/PhotonNetwork/Extensions.cs
	Assets/Photon Unity Networking/Plugins/PhotonNetwork/LoadbalancingPeer.cs
	Assets/Photon Unity Networking/Plugins/PhotonNetwork/NetworkingPeer.cs
	Assets/Photon Unity Networking/Plugins/PhotonNetwork/PhotonClasses.cs
	Assets/Photon Unity Networking/Plugins/PhotonNetwork/PhotonHandler.cs
	Assets/Photon Unity Networking/Plugins/PhotonNetwork/PhotonNetSimSettingsGui.cs
	Assets/Photon Unity Networking/Plugins/PhotonNetwork/PhotonNetwork.cs
	Assets/Photon Unity Networking/Plugins/PhotonNetwork/PhotonPlayer.cs
	Assets/Photon Unity Networking/Plugins/PhotonNetwork/PhotonStatsGui.cs
	Assets/Photon Unity Networking/Plugins/PhotonNetwork/PingCloudRegions.cs
	Assets/Photon Unity Networking/Plugins/PhotonNetwork/RPC.cs.meta
	Assets/Photon Unity Networking/Plugins/PhotonNetwork/Room.cs
	Assets/Photon Unity Networking/Plugins/PhotonNetwork/RoomInfo.cs
	Assets/Photon Unity Networking/Plugins/PhotonNetwork/RpcIndexComponent.cs
	Assets/Photon Unity Networking/Plugins/PhotonNetwork/ServerSettings.cs
	Assets/Photon Unity Networking/Resources/PhotonServerSettings.asset
	Assets/Photon Unity Networking/UtilityScripts/ConnectAndJoinRandom.cs
	Assets/Photon Unity Networking/changelog.txt
	Assets/Photon Unity Networking/readme.txt
	Assets/PlayMaker NGUI/Actions.meta
	Assets/PlayMaker NGUI/Actions/Buttons/NguiPlayTween.cs.meta
	Assets/PlayMaker NGUI/Actions/Tools/NguiToolsAddChild.cs.meta
	Assets/PlayMaker NGUI/Prefabs/NGUI PlayMaker Proxy.prefab
	Assets/PlayMaker NGUI/Scripts.meta
	Assets/PlayMaker/Resources/PlayMakerGlobals.asset
	Assets/PlayMaker/Templates.meta
	Assets/Playmaker NGUI Scripts/Demo/Asset Bundles Demo/Textures/Logo.png.meta
	Assets/Playmaker NGUI Scripts/Demo/Asset Bundles Demo/Textures/UnityScripts.png.meta
	Assets/Playmaker NGUI Scripts/Demo/Loading Screen Demo/Fonts/Lucida Calligraphy 30 Italics/Lucida Calligraphy 30 Italics_0.tga.meta
	Assets/Playmaker NGUI Scripts/Demo/Loading Screen Demo/Materials/Purple.mat
	Assets/Playmaker NGUI Scripts/Demo/Loading Screen Demo/NGUI Screens/LoadBigScene/Images/ibtn_Load_hover.png.meta
	Assets/Playmaker NGUI Scripts/Demo/Loading Screen Demo/NGUI Screens/LoadBigScene/Images/ibtn_Load_pressed.png.meta
	Assets/Playmaker NGUI Scripts/Demo/Loading Screen Demo/NGUI Screens/LoadBigScene/Images/ibtn_Loadidle.png.meta
	Assets/Playmaker NGUI Scripts/Demo/Loading Screen Demo/NGUI Screens/LoadingScreen/Source/LoadingScreen.png.meta
	Assets/Playmaker NGUI Scripts/Demo/Loading Screen Demo/PSDs/LoadBigScene.psd.meta
	Assets/Playmaker NGUI Scripts/Demo/Loading Screen Demo/PSDs/LoadingScreen.psd.meta
	Assets/Playmaker NGUI Scripts/Demo/NGUI Atlases/Arimo/Large.tga.meta
	Assets/Playmaker NGUI Scripts/Demo/NGUI Atlases/Arimo/Wooden Atlas.mat
	Assets/Playmaker NGUI Scripts/Demo/NGUI Atlases/Arimo/Wooden Atlas.prefab
	Assets/Playmaker NGUI Scripts/Demo/NGUI Atlases/Refractive/Refractive Atlas - Masks.psd.meta
	Assets/Playmaker NGUI Scripts/Demo/NGUI Atlases/Refractive/Refractive Atlas.psd.meta
	Assets/Playmaker NGUI Scripts/Demo/Scrollbar Demo/Wooden/Arimo20.prefab
	Assets/Prefabs/DashedCube .prefab
	Assets/Prefabs/GAME_VIEW.prefab
	Assets/Scenes/Game_Core.unity
	Assets/Standard Assets/Particles/Sources/Materials/Dirt.mat
	Assets/Standard Assets/Particles/Sources/Materials/Dirt.mat.meta
	Assets/Standard Assets/Particles/Sources/Materials/Vapour.mat.meta
	Assets/TrnthResourse/material/pureColorGreen.mat.meta
	Assets/_PipeGame/Graphic Assets/Materials/DNA_Animations.meta
	Assets/_PipeGame/Graphic Assets/Meshes/Materials.meta
	Assets/_PipeGame/Graphic Assets/Textures.meta
	Assets/_PipeGame/script/Circuit.cs
	PipesGame.userprefs
	ProjectSettings/EditorBuildSettings.asset