Merge pull request #1 from MedeirosMarcelo/master

Tentativa de sync
Contador genérico de tempo e damage type

Acrescido um contador genérico de tempo, seu prefab respectivo,
contador até determinado tempo e seu prefab respectivo.
Merge branch 'master' of https://github.com/MedeirosMarcelo/Krakus into MedeirosMarcelo-master

Colocando várias opções novas para  .gitignore

Conflicts:
	Assets/Scenes/Scene1.unity
	Assets/Scripts/Death.cs
	Assets/Scripts/GUILoot.cs
	Assets/Scripts/Magic.cs
	Assets/Scripts/MagicProjectile.cs
	Assets/Scripts/Sword.cs
	Krakus.userprefs
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/00/00d7e64775d1332438c4996b372b953f
	Library/metadata/01/01b622d4830754f4886f4b03606fb1ec
	Library/metadata/02/028c11450244e4feabe6828fc2ec3e03
	Library/metadata/05/0568ecdd797316641b0203860b3929d9
	Library/metadata/05/05f6c978afe090d4d8f0af42a61bbe7f
	Library/metadata/08/086544326e5604e81a96f61fb0f0a78e
	Library/metadata/08/08f28e42a647e2a4cbd32e793359aa3c
	Library/metadata/09/0904e339eb6fdd546b8539bd04db10ed
	Library/metadata/0a/0a70c16c7b47ab048bc9e03b588c24f6
	Library/metadata/0f/0f6377872e339455d9912675771556d1
	Library/metadata/11/1167c0a28d11119930004d8a4241aa39
	Library/metadata/12/12747bdca86d344c2a4f1ea2bb362f17
	Library/metadata/16/16dd8248d31591f4fbea40ca5d506411
	Library/metadata/18/18214e9d6af6248559d501391856f1c7
	Library/metadata/19/195c271a9118d224c8562ae67cf47a66
	Library/metadata/1a/1a1e55f8a8e25ca459c82b35bc10f751
	Library/metadata/1a/1a5d8cd24a805cd44b00c7f1e1e4d287
	Library/metadata/1d/1da31b5f0cf126543b66c7d9d24a574c
	Library/metadata/1f/1f72e447565d3114e8fca982de1ff81c
	Library/metadata/23/2372dd1814cb4ed47a91f8174877623e
	Library/metadata/23/23a02ac18d11c9ffa0009c58a8ad6659
	Library/metadata/2a/2a49aa5b76842305fc65897abcdcf30f
	Library/metadata/2c/2c29c08dd1c0b6749b7cd0fcff7a29fd
	Library/metadata/2c/2c528fec5d95e4ac28cf46399b887662
	Library/metadata/2c/2c93b54a9ce1c314b809b4c11cf9cdb6
	Library/metadata/32/32ef381921b3f7f479831b042c113762
	Library/metadata/34/34c9fcec00ce63b49a6725d4eadead19
	Library/metadata/35/352e5f82d7105ad408904c5f552b5fe7
	Library/metadata/39/39a8706a9bd02c64783c071fb7438ecf
	Library/metadata/3d/3ddb50e323b793449ad89bd605735e35
	Library/metadata/42/427ff48b098658742bdcce953d607e78
	Library/metadata/44/440eb36db91ca410f800ff3cfe43572f
	Library/metadata/45/454585cca07f953479b902a00ead3015
	Library/metadata/51/517a230447c0af548a7679cdf69c3e56
	Library/metadata/51/51dc82ef9d11c594d000e7c9e39e7c39
	Library/metadata/53/531c14f8d5cdc4e5baa83ee6e16f783a
	Library/metadata/54/54e03e659ab274dd9b12c0538a9c4983
	Library/metadata/58/5861c55756febc148902667397405ff9
	Library/metadata/5d/5dbdf7dfcf86afa418926ee28fab2b1d
	Library/metadata/5f/5f75ef29233ec634facc1ba1e1f64725
	Library/metadata/60/60fb16895cbaf4946906b6d63f3653ec
	Library/metadata/64/641bb2dce818a8a499b537a1963889ac
	Library/metadata/65/65fb74f285bbb4d11a3b64d99c0a53b0
	Library/metadata/66/661663e7fa00ae64fa29cf54677bbef4
	Library/metadata/66/66ebe4da1ef67e64e8aeccb820e409d6
	Library/metadata/67/6793afeb1ba524134ae93ee3038763e0
	Library/metadata/67/67de91b5513a4d8489588fb65de75caa
	Library/metadata/68/68287fe10cd30434b9c21ff1c55f613f
	Library/metadata/69/69680b688d11eb9d30009b3b4241aa39
	Library/metadata/6d/6dda5f499bc82c442aab32e4a6bdbe40
	Library/metadata/6e/6e77d387966489d6cb6bb6ba39e09c45
	Library/metadata/6e/6eef515e7c40d3244ad62dcdf6e8096a
	Library/metadata/70/70064f871cf043a40865a93a2416a29f
	Library/metadata/73/7326af3853e58fc4a850c8f24d5e9a31
	Library/metadata/75/752b01b0aec6184468996505d2ab8a9c
	Library/metadata/79/79ee47d0d7d8347459a63ae804788244
	Library/metadata/7a/7a3134e5f9749c449ad2289cfe93f5d5
	Library/metadata/82/820a38890d8f1f742b289b29927ffb3b
	Library/metadata/87/87e98f563747ec04e8cd93b3fc3b1a29
	Library/metadata/8a/8a98ef45bc7df804d95fd945abd2c943
	Library/metadata/8c/8ca0735e520b5fc40a4e41b42fc288ea
	Library/metadata/8c/8caa437b19957a045866b84c6218a0db
	Library/metadata/8e/8e303788a4e296443b33942a5be85049
	Library/metadata/8e/8e3ff3e27ca4bc54dda56e89e0550dfa
	Library/metadata/91/91c222ac5463b7243849bc078d53e72c
	Library/metadata/91/91e90ca7d57fab346bea01f370e38ad8
	Library/metadata/93/93bc7d6f0e1793c47a5f88178ecc75fe
	Library/metadata/94/94e74a0a5a090d1429be8b4f201d0322
	Library/metadata/95/956c1c0113bcd4c4388a3c239be09820
	Library/metadata/97/9785a5533d9270849a276a4bfbfa9418
	Library/metadata/97/97b050d43ac7c4d2b9f6cbb587650761
	Library/metadata/9d/9d2a2ce9c718dc24dae3b1ee427b27ee
	Library/metadata/9e/9ef26a39a400bec44a36b85fd38a2d65
	Library/metadata/a6/a6c23ad66d37f0e4c8c86d7c5293ac7c
	Library/metadata/a6/a6de6086ecd5fe84699b0bc7e00608a4
	Library/metadata/ac/acd22cefe09441d2c7e801193b935495
	Library/metadata/ae/aecdab3033c620c43a3695cc7a5296bb
	Library/metadata/bb/bbba6214b1838a64ebc939ac9a08726d
	Library/metadata/be/be7c377d128f1ff46a22853ecdb9e6d1
	Library/metadata/bf/bfd675cc0db1d4656b75dc6d6ba91142
	Library/metadata/c4/c419698c0038a6e40868e7a0da6198dd
	Library/metadata/c6/c6e0767b1f8c34890ac245217f4b9731
	Library/metadata/c7/c76b3032d5d1c9e47a4f64134730c565
	Library/metadata/cc/cc2e0695659497144afe5a45ed3227ea
	Library/metadata/cc/cc93f5e7bc4a5d7438cf6a00948b80d7
	Library/metadata/d2/d236c2e07976ff942a0e23d979e8f4cb
	Library/metadata/d2/d2a75096fe3ec104eb5b6951f71175fe
	Library/metadata/d3/d3b7d84ffb95cc04aaeb74f19a10f034
	Library/metadata/d6/d6cdc79ec19714fcd980ca3f6ac01a0a
	Library/metadata/db/db6ded423daf6e449ac50a3e1f99a36a
	Library/metadata/dc/dc97187fca1dcaf4e84e8b5f414a64ba
	Library/metadata/de/de5ce4cb0b71edd4a9ddd711898882ef
	Library/metadata/e0/e0e8367cc866c7d4cae7b97d6ba94e88
	Library/metadata/e2/e228581791012c144900f8d7ccda2491
	Library/metadata/e3/e340b02bd24d6b44cbaaecb9296ea7b5
	Library/metadata/e3/e349c3f4b36417b48b65112d7bd0b54e
	Library/metadata/e3/e3e214f8620f35a4cb4e415a4b8c19cf
	Library/metadata/e5/e58d7769af939f944aa34c67b70e282b
	Library/metadata/e6/e683224912e790a4aad9fbfda3454396
	Library/metadata/e7/e79b4ee3b7b31ee499b1532270c7730d
	Library/metadata/e7/e7a88268a460f384cbef52d988810865
	Library/metadata/e7/e7d408c28925be148bd9ef32f4f28e44
	Library/metadata/e9/e976c6d3ebc1e4a85aa7186a3192d8c5
	Library/metadata/ee/ee3b2ea5df599c24998d9dbd3298ea4d
	Library/metadata/f3/f34358a8c6ce96247a522c736ef7978d
	Library/metadata/f7/f7d5f039a8e7848e889e1546d37dc39e
	Library/metadata/fe/fe48ca40e9be666419e7d1a4bf3d808a
	Library/metadata/fe/fec3a34e511e6d94093e1fd9276012cc
	Temp/UnityTempFile-06ab272be91b43640b8148e9935a1e06
	Temp/UnityTempFile-0a357fa609cf60e449f9d645f5c635f9
	Temp/UnityTempFile-3a06f4bc1f5ef37419562eeb373acac2
	Temp/UnityTempFile-9c71b4fe892320b47813587d9fc1ad9a
	Temp/UnityTempFile-c695d866dfc7acf4ca9fdcb044182531
	Temp/UnityTempFile-e6ecae48e7203294eaaae2ee23a3cc9a
	Temp/UnityTempFile-f20488f5b8a2c244daea11511c6fd5ff
	Temp/__EditModeScene
Merge branch 'MedeirosMarcelo-master'
Remoção de temporários
Evitando NPE em FallingObject
Refatoração do nome do arquivo de salvar

Evita também uns NPEs malucos que davam ao iniciar o jogo e não existir
o arquivo
Colocando background

Por enquanto sem parallax
Merge pull request #1 from jeffque/master

Syncing