Skip to content

Commit a00a0b8

Browse files
author
Thomas Iché
committed
Squashed commit of the following:
commit c16fd4f283a0fd8108cedce6db594fdab0b96f2e Author: Marie G <marie.guffroy@unity3d.com> Date: Wed Jun 16 13:49:47 2021 +0200 planks placement better placement to hide planks falling at startup commit 502985fdda64bfa384201004b7be2a4a651fdba5 Author: Thomas Iché <thomasi@unity3d.com> Date: Wed Jun 16 10:40:41 2021 +0200 Final Fixes/Cleanup commit 982d05de24b7a68c3a185850236fd2a462748243 Author: Marie G <marie.guffroy@unity3d.com> Date: Tue Jun 15 14:14:22 2021 +0200 Clean names Camera Shake event + BufferRender commit 5159a96a97ce4e761aff91329ea567d98d6622d6 Author: Thomas Iché <thomasi@unity3d.com> Date: Wed Jun 9 14:52:08 2021 +0200 Fixed Sky / UltraWide UI commit 6db613cf88924d42e3a902092af04f26f032ed57 Merge: d82c9ba 8653be1 Author: Thomas Iché <thomasi@unity3d.com> Date: Wed Jun 9 13:54:10 2021 +0200 Merge branch 'master' into Sample/Meteorite # Conflicts: # .gitignore # Assets/HDRP/HDRenderPipelineAsset.asset # Assets/VisualEffectSamples.unity # Packages/manifest.json commit d82c9ba7f0ea4ae2e471c3e00fb10445f8718572 Author: Marie G <marie.guffroy@unity3d.com> Date: Wed Jun 9 11:12:41 2021 +0200 Texture naming commit 49e9deeeece8893ca1c4db6e6e11e412cf3cd41f Author: Marie G <marie.guffroy@unity3d.com> Date: Wed Jun 9 10:59:05 2021 +0200 update 2020.3.7f1 commit 8fd03e43eb3b2e14b52ee26ce32448e960235790 Author: Marie G <marie.guffroy@unity3d.com> Date: Wed Jun 9 10:40:26 2021 +0200 namings commit a7f66f504adc5c3d2151a1d836230ad0063c9179 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Fri Dec 18 16:34:47 2020 +0100 Meteorite sample minor changes timeline and grass movement improvments commit 1ea33326b7bef30aef503623a33389793f2af848 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Fri Dec 18 11:03:10 2020 +0100 Meteorite lighting + collider minor sun setting + ground collider change commit 5bb228dab1e11f8eb40f70401a49c465efbbd664 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Thu Dec 17 15:16:33 2020 +0100 Meteorite in Scene loader screenshot and description commit 9c5da1f83ca5a1d1a324155254f15a53f03cdc15 Author: Thomas ICHÉ <peeweek@gmail.com> Date: Wed Dec 16 17:35:42 2020 +0100 Simplified Random + Fix Source Attribute in Spawner Error commit 8cbe170bdae1a6df06fd2afd022ad6dc7fbc1844 Author: Thomas ICHÉ <peeweek@gmail.com> Date: Wed Dec 16 17:27:49 2020 +0100 Restored Exposure back to fixed / Fixed HDRP Asset commit 287e984b984af383ab75f263d36ecaad93029a6e Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Wed Dec 16 15:47:07 2020 +0100 Sample integration timeline creaiton and sample added to main menu commit 0e05bb1904a73c6a247def8648e00c173424c604 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Wed Dec 16 13:29:24 2020 +0100 HDRP asset change enable Decals commit 2515d7cc7780c4a0850d2b09b05bfd5dffdc2b09 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Wed Dec 16 13:28:24 2020 +0100 Meteorite polish glowsphere changes, ground noise decal, ground mesh additions, lighting and tree texture correction commit 78d9ae7e5e346bbd2b8ff0a881755370008f8b6d Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Tue Dec 15 17:05:44 2020 +0100 fix error camera shake script commit df39cb733006f6e75fb7e8c63b50290a2a2a8426 Author: Thomas ICHÉ <peeweek@gmail.com> Date: Tue Dec 15 16:37:23 2020 +0100 Added Lightmaps commit 5ea569cf637769af7a75aa143004590aa55c0414 Merge: aba4add a0590d3 Author: Thomas ICHÉ <peeweek@gmail.com> Date: Tue Dec 15 16:06:17 2020 +0100 Merge branch 'staging/2020.2' into Sample/Meteorite commit a0590d3f4766c85b9c5af1639d2e86fb08d7850c Author: Thomas ICHÉ <peeweek@gmail.com> Date: Tue Dec 15 15:59:08 2020 +0100 Fixed Bonfire / Grasswind Sun Brightness commit f1ba6f8791d9f4d9029989259e5637ad8666e84f Author: Thomas ICHÉ <peeweek@gmail.com> Date: Tue Dec 15 14:23:28 2020 +0100 Updated Read Me commit 7fea8b757ff8134d4e9cb5a4a2a379c29326dfaf Author: Thomas ICHÉ <peeweek@gmail.com> Date: Tue Dec 15 14:21:47 2020 +0100 Updated to 2020.2.0f1 commit aba4addde01a6bdbf2135bdd18863fee7ded3cb3 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Tue Dec 15 13:52:58 2020 +0100 Folder cleans namings and folders checkups commit d83a1aaf0bd6fa5bde70e5bcd1b8effe58f660de Author: Thomas ICHÉ <peeweek@gmail.com> Date: Tue Dec 15 12:04:56 2020 +0100 Updated Portal Scene with Shadergraph / Removed Old Shader commit 90bd12b928a23a19dc5719934ece2f4de064f229 Author: Thomas ICHÉ <peeweek@gmail.com> Date: Tue Dec 15 11:10:00 2020 +0100 Updated Project to 10.2.2 / 2020.2.0b12 commit 77e2bbe0356c608105da2b6aac4d8eae8437ee69 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Fri Dec 4 17:22:54 2020 +0100 Meteorite polish meteorite dissolve commit 2542cfbaa5fbb2fa575c71efe90efc992fbe2e5b Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Thu Dec 3 17:06:37 2020 +0100 Meteorite sample minor corrections commit 30ddd6c0c43cb06f623e8eecb780aea4b265f87a Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Wed Dec 2 17:07:23 2020 +0100 Meteorite polish birds and butterflies commit 254d87fd165ef6909a30b75b8438a623a2d45bd8 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Mon Nov 30 17:22:36 2020 +0100 Meteorite polish floor decal changes + bush variations commit f6c39ba525034433fd1fc8957caa666b96b60bf5 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Fri Nov 27 16:34:10 2020 +0100 Meteorite sample polish commit ddb67ca6c562b5a015a252cc44db8ff02e324649 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Thu Nov 26 16:59:57 2020 +0100 Meteorite sample light flash commit 34d645fdf6f24331fc8156c2fda82694bf3505df Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Thu Nov 26 14:59:49 2020 +0100 Camera control script move Camera control script from spaceship to common commit ebde3545bc594ef087cc655658797298495af52a Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Thu Nov 26 11:42:26 2020 +0100 Meteorite sample grass and camera correction commit 90ee24366b9f27ba3ffba27bfb1162527fc6d427 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Wed Nov 25 16:43:25 2020 +0100 Meteorite sample camera freelook rig commit 9a0a923c5e2cab297840f7be366b8b72fd0bab5c Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Tue Nov 24 17:10:13 2020 +0100 Meteorite sample sorting files commit 4210f994beb4d7b92fe93433f22f9cb436b61619 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Tue Nov 24 11:23:53 2020 +0100 Meteorite sample Light animation + FX timings commit 578e3e64ed77a075d775ac2810f6e8dbc8ca5719 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Mon Nov 23 17:02:48 2020 +0100 Meteorite sample leaves timing check commit 2a07a0898f9cace7212d76f6f7965c7e9fe5c277 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Mon Nov 23 14:38:00 2020 +0100 Meteorite sample commit fb31e189c4f3ba2c1cb22580feaa47d48327fc30 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Mon Nov 23 11:00:59 2020 +0100 Meteorite sample ground change commit 40d617ad1648e396b30af1c2da650a91c2039414 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Fri Nov 20 18:03:19 2020 +0100 Meteorite sample ground smoke, flash light commit 437e3c27336867329736dcab0283f0944365b936 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Fri Nov 20 10:33:00 2020 +0100 Meteorite sample push before update to 0b12 commit 629b2d31dfff3a1082605462caff59f57d65407c Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Thu Nov 19 17:04:26 2020 +0100 Meteorite sample Moving trees, lighting improvment commit 52c34617784f595de5b6d38fac846b9444078185 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Thu Nov 19 15:39:52 2020 +0100 Meteorite sample tree vertex displace commit 4f5621b6a349521c8d063d785663cb0f7d7e1f59 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Thu Nov 19 10:58:41 2020 +0100 Meteorite Sample plank explosion script, event button commit 32d41d2b9ca28ccc28018254f6f5ae69a50c77dc Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Wed Nov 18 17:50:58 2020 +0100 Meteorite sample planks physics, output event handler commit f1dac94d6d4e8ab53c44240bd2057636789b7884 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Wed Nov 18 11:46:48 2020 +0100 Meteorite sample flying birds, leaves wip, clean useless files commit 7ed2f9e4cc49336fe29f9029e7a26c05755416e3 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Tue Nov 17 16:57:06 2020 +0100 Meteorite sample commit d786323ce4a427021a84aa5918e00a075249d08c Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Tue Nov 17 13:30:42 2020 +0100 Meteorite sample flames commit 3852cd72e84f5a2526c988e548b3bec3c7c263aa Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Mon Nov 16 17:02:01 2020 +0100 Meteorite sample wip commit 05fe44054004fff0396f4607343cc92cca374e5f Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Mon Nov 16 11:45:19 2020 +0100 MEteorite sample grass corrections+ diverse small improvments commit 8ad7b080d43db9b9677ca5857590466617db8f06 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Fri Nov 13 16:23:09 2020 +0100 Meteorite sample grass correction + uneffective volumetric light tests commit 5f860a8d9855ec2b9684e810fd60330876a7cae7 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Fri Nov 13 11:58:11 2020 +0100 Meteorite sample timing and position improvments commit 0418ad3ff6f24e01d31e4babec2fce4dd5234ed8 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Thu Nov 12 18:10:58 2020 +0100 Meteorite sample shader improvment commit 3b6dc54548fd431ec0e37cbac45e18eba85cb3d4 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Thu Nov 12 13:49:59 2020 +0100 Meteorite sample scene glow up commit 02e50088cce6535a007ecf8f53501aa4a968473c Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Tue Nov 10 17:17:37 2020 +0100 Meteorite sample diorama improvments commit fe2a659eca5c57f9078a726125d37272d2731627 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Mon Nov 9 17:21:26 2020 +0100 meteorite sample grass blast tests commit 08c2641f7d65465788812412eba642f3deaa43ed Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Mon Nov 9 12:03:52 2020 +0100 Meteorite sample emissive grass, impact timings commit f544adbec9347575cc2d7c5c719c3aeb9374f506 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Fri Nov 6 17:08:43 2020 +0100 Meteorite sample trees improvments commit 80d65b0bc24c9f15044d3f25479e3f42369e15b0 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Thu Nov 5 17:05:59 2020 +0100 Meteorite sample grass wind blast commit 1b3af23d4e68b9561dc159a1c44ad257cc7fd012 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Thu Nov 5 15:10:27 2020 +0100 Meteorite sample grass burn, flames spawn, scene size commit 9b3f1c93ef3393db3d8d8ea717c5063152e72afe Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Wed Nov 4 17:14:50 2020 +0100 Meteorite Sample Camera buffer, grass burn commit 3f6837d8063dd2552d67aa7878dc9aeac9d4dba7 Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Tue Nov 3 17:04:32 2020 +0100 Meteorite sample scene colliders, assets physics on impact, output events, grass burn shader commit c8c24ac57fb2e8177be00415c2d1ce0b537de0bf Author: Marie Guffroy <marie.guffroy@unity3d.com> Date: Tue Nov 3 11:11:29 2020 +0100 Initial Commit Meteorite sample + Event output handler
1 parent 7d5822d commit a00a0b8

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

‎Assets/Samples/Meteorite/MeteoriteSample.unity‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ Transform:
676676
m_PrefabAsset: {fileID: 0}
677677
m_GameObject: {fileID: 188774964}
678678
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
679-
m_LocalPosition: {x: -2.957, y: 0.5, z: -1.0219998}
679+
m_LocalPosition: {x: -2.957, y: 0.129, z: -1.0219998}
680680
m_LocalScale: {x: 2, y: 0.05, z: 0.2}
681681
m_Children: []
682682
m_Father: {fileID: 710594044}
@@ -818,7 +818,7 @@ Transform:
818818
m_PrefabAsset: {fileID: 0}
819819
m_GameObject: {fileID: 258741997}
820820
m_LocalRotation: {x: -0.024853192, y: 0.29526293, z: 0.08010981, w: 0.95172715}
821-
m_LocalPosition: {x: 0.293, y: 0.5, z: -4.272}
821+
m_LocalPosition: {x: 0.293, y: 0.197, z: -4.272}
822822
m_LocalScale: {x: 1, y: 0.05, z: 0.2}
823823
m_Children: []
824824
m_Father: {fileID: 710594044}
@@ -1672,7 +1672,7 @@ Transform:
16721672
m_PrefabAsset: {fileID: 0}
16731673
m_GameObject: {fileID: 422010526}
16741674
m_LocalRotation: {x: -0.060061093, y: -0.41662145, z: -0.119008414, w: 0.89925325}
1675-
m_LocalPosition: {x: 0.12, y: 0.5, z: -2.57}
1675+
m_LocalPosition: {x: 0.12, y: 0.303, z: -2.57}
16761676
m_LocalScale: {x: 2, y: 0.05, z: 0.2}
16771677
m_Children: []
16781678
m_Father: {fileID: 710594044}
@@ -3087,7 +3087,7 @@ Transform:
30873087
m_PrefabInstance: {fileID: 0}
30883088
m_PrefabAsset: {fileID: 0}
30893089
m_GameObject: {fileID: 732813630}
3090-
m_LocalRotation: {x: 0.16146779, y: -0.000000009428793, z: 0.00000000154269, w: 0.986878}
3090+
m_LocalRotation: {x: 0.16146779, y: 0.000000009428793, z: -0.00000000154269, w: 0.986878}
30913091
m_LocalPosition: {x: 0, y: 0, z: 0}
30923092
m_LocalScale: {x: 1, y: 1, z: 1}
30933093
m_Children:
@@ -3123,7 +3123,7 @@ Transform:
31233123
m_PrefabAsset: {fileID: 0}
31243124
m_GameObject: {fileID: 740922686}
31253125
m_LocalRotation: {x: 0.015764616, y: -0.20174299, z: 0.076292865, w: 0.97633535}
3126-
m_LocalPosition: {x: -1.55, y: 0.5, z: -1.29}
3126+
m_LocalPosition: {x: -1.55, y: 0.193, z: -1.29}
31273127
m_LocalScale: {x: 1, y: 0.05, z: 0.2}
31283128
m_Children: []
31293129
m_Father: {fileID: 710594044}
@@ -5131,7 +5131,7 @@ Transform:
51315131
m_PrefabAsset: {fileID: 0}
51325132
m_GameObject: {fileID: 1252865787}
51335133
m_LocalRotation: {x: 0.11161953, y: 0.23858523, z: 0.052048333, w: 0.96328044}
5134-
m_LocalPosition: {x: 1.5, y: 0.5, z: -1.03}
5134+
m_LocalPosition: {x: 1.5, y: 0.218, z: -1.03}
51355135
m_LocalScale: {x: 1, y: 0.05, z: 0.2}
51365136
m_Children: []
51375137
m_Father: {fileID: 710594044}
@@ -6673,7 +6673,7 @@ Transform:
66736673
m_PrefabAsset: {fileID: 0}
66746674
m_GameObject: {fileID: 1566657435}
66756675
m_LocalRotation: {x: -0, y: -0, z: 0.049988393, w: 0.9987498}
6676-
m_LocalPosition: {x: 0.46, y: 0.5, z: 1.49}
6676+
m_LocalPosition: {x: 0.46, y: 0.172, z: 1.49}
66776677
m_LocalScale: {x: 1, y: 0.05, z: 0.2}
66786678
m_Children: []
66796679
m_Father: {fileID: 710594044}
@@ -7819,7 +7819,7 @@ Transform:
78197819
m_PrefabAsset: {fileID: 0}
78207820
m_GameObject: {fileID: 1860573950}
78217821
m_LocalRotation: {x: -0.016426656, y: 0.19650456, z: 0.08166808, w: 0.97695774}
7822-
m_LocalPosition: {x: -0.78, y: 0.5, z: 0.71}
7822+
m_LocalPosition: {x: -0.78, y: 0.286, z: 0.71}
78237823
m_LocalScale: {x: 2, y: 0.05, z: 0.2}
78247824
m_Children: []
78257825
m_Father: {fileID: 710594044}
@@ -7987,7 +7987,7 @@ Transform:
79877987
m_PrefabAsset: {fileID: 0}
79887988
m_GameObject: {fileID: 1878559644}
79897989
m_LocalRotation: {x: -0, y: -0, z: -0.07512875, w: 0.9971739}
7990-
m_LocalPosition: {x: 2.69, y: 0.5, z: 0.57}
7990+
m_LocalPosition: {x: 2.69, y: 0.201, z: 0.57}
79917991
m_LocalScale: {x: 1, y: 0.05, z: 0.2}
79927992
m_Children: []
79937993
m_Father: {fileID: 710594044}
@@ -8342,7 +8342,7 @@ Transform:
83428342
m_PrefabAsset: {fileID: 0}
83438343
m_GameObject: {fileID: 1968940955}
83448344
m_LocalRotation: {x: -0.09657985, y: 0.31656763, z: -0.09780961, w: 0.9385577}
8345-
m_LocalPosition: {x: -2.957, y: 0.67, z: -1.0219998}
8345+
m_LocalPosition: {x: -2.957, y: 0.273, z: -1.0219998}
83468346
m_LocalScale: {x: 1, y: 0.05, z: 0.2}
83478347
m_Children: []
83488348
m_Father: {fileID: 710594044}

0 commit comments

Comments
 (0)