36b78bf8
Initial project push
7 年前
78808f0d
Boat trail tweaks
7 年前
c197f4d7
Updated LT pipeline package
Fixed and updated Vegetation shader
Tweaked Island scene foam gradient
Changed Island scene from tessellation to vertex offset
7 年前
23a48921
Tweaked boat physics, shaved off half a ms per boat
7 年前
eb60867b
Level tweaks
Perf tweaks
Added shadow switcher for main camera rendering
7 年前
039ec916
level tweaks
7 年前
fe281ee1
Scene dressing
New boat blockout mesh
Added lightmap LOD script to re-use LOD0 lightmaps on LOD1 and LOD2
Basic pass on SFX
More Cinemachine camera setup
7 年前
14efaaf3
Updated boat
Tweaked wake/splash materials
Updated water system submodule
7 年前
8adcbeea
Updated water submodule
Updated LTpipe to version 1.1.2-preview
Updated shaders to work with new LTpipe
7 年前
9abb6a66
Added custom terrain shadegraph
Added new boat and shader
Started to add other props
7 年前
3e297a4c
Fixed vegetation shaders
7 年前
40418733
Small tweaks, removed unneeded shaders and variants
7 年前
13b925a4
Camera work for cutscene
More set dressing
7 年前
c4011ea8
Updated packages and added basic debug menu
Fixed shadergraph GUID issue
7 年前
bc67bea6
Updated boat physics settings
Rebaked lighting
Updated submodules
7 年前
379cda8c
Setup MPBs on the boats
More set dressing
7 年前
eb7bff0b
Updated baked lighting
Updated submodule
7 年前
033decc7
Tweaked LOD settings
Added LOD for trees
Added cross fade for vegetation LODs
7 年前
c7f157b7
Upped shadow resolution
Turned stripping back on
Turned on MSAA, turned off FXAA
Added new Cascade keyword
Moved Texture2DArray script back into an editor folder
Cleaned up some old files
Updated submodule
7 年前
7ec2acab
Large update, lots of visual differences, be careful updating to here
7 年前
dc6b492f
Added WaterFXPass to MyLWRenderer
Minor project cleanup
Added packed PBR shader
7 年前
f04512fc
Small changes across the level
7 年前
88fbddf7
Massive cleanup
7 年前
c330c77c
Merge pull request #2 from Verasl/custom-renderer
Custom renderer
7 年前
b1f6c73f
Fixed custom renderer for latest SRP
Updated Navmesh
Tweaked some materials
6 年前
71f5bf39
Some file re-org
6 年前
e5cf59be
Init branch push
6 年前
bd60d1e2
Merge pull request #7 from Verasl/MiscWork
Misc work merged into Master
6 年前
62ad6831
Updated Shadegraphs, Vegetation and WaterFX shaders to new API
6 年前
ea076229
init push
6 年前
f3d23e02
Changed shader functions per api v4 update
6 年前
309b3c34
Merge branch 'lw/shader-include' into lw/api-review-v4
# Conflicts:
# Assets/scenes/Island.unity
6 年前
d58b7d71
Merge pull request #10 from Verasl/lw/api-review-v4
Lw/api review v4
6 年前
8b65ed9b
Update work for API v5
Switched to HDR rendering
6 年前
dc6a61c9
slight updates to lighting and post
6 年前
672c6f5f
Merge pull request #12 from Verasl/lw/file-renames
Lw/file renames
6 年前
e79c320d
Some more water shader tweaks
6 年前
41727060
Merge pull request #13 from Verasl/lw/api-review-v6
API review v6 changes
6 年前
ed67b62e
Latest changes
6 年前
2be28b1a
Slight tweaks
6 年前
c5e98cad
Fixed depth issue on GLES - temporary fix
6 年前
e0fcb680
Merge pull request #20 from Verasl/srp-api-changes
Srp api update
6 年前
9c167dec
Small fixes/tweaks
6 年前
599cccf6
Merge pull request #21 from Verasl/optimization
Optimization
6 年前
d221bcac
Updated to work with shader cleanup PR on SRP
6 年前
98dcb308
Assorted changes
-fix scene slowdown
-updated reflection probes
6 年前
03081f47
Merge pull request #23 from Verasl/shader-api-cleanup
Shader api cleanup PR
6 年前
52368f2b
Minor updates
6 年前
741890d1
Init commit
- Added new rocks meshes and Textures, now 4 lods and better environmental integration shader
- Moved caustics out of the watershader and into a fullscreen quad ScriptableRenderPass
6 年前
11eb0468
Tweaks
6 年前
5e65d97b
SRP batcher on
6 年前
35e36990
Added SRP batcher support to the water and removed MPBs
6 年前
a6991323
Merge pull request #29 from Verasl/art-tweaks
Art tweaks
6 年前
81134287
Init changes
6 年前
192ef3fc
Final tweaks to branch
6 年前
28758d0f
Merge pull request #31 from Verasl/lw/passes-in-objects
Lw/passes in objects
6 年前
cfbcafcc
Tweaks to shadergraphs and baked water depth map
6 年前
a539a28b
Updates to scene
6 年前
1b25cca4
InitCommit
6 年前
5b3f36b7
cheap AO test
6 年前
da3485f6
Merge branch 'GDC-temporary'
# Conflicts:
# Assets/Objects/boats/Maps/Interceptor_MRLL.tif.meta
# Packages/manifest.json
6 年前
083db55c
Updated FBX settings and cleaned up some un-needed files
6 年前
3de9266d
Merge branch 'master' into release/2019.1
# Conflicts:
# Assets/scenes/Island.unity
# Packages/com.verasl.water-system/Scripts/Water.cs
# Packages/com.verasl.water-system/Shaders/WaterCommon.hlsl
# Packages/manifest.json
# ProjectSettings/QualitySettings.asset
6 年前
7b564e6c
Update to Universal
- Added universal package locally
- Converted vegetation to shader graph
- Added post v3
6 年前
c3ae69d1
Clean up
- Cleaned up shader graphs
- removed un-used textures
- converted some Universal namespace additions
6 年前
6718afae
Updated custom shaders
6 年前
0669fac0
Minor tweaks
- Updated vegetation shader graph to use half
- Changed camera to follow cam
6 年前
83b32ce8
Sync with SRP branch
6 年前
ece01254
Physical sky shader variant.
6 年前
c05078fa
Merge pull request #47 from Verasl/Update-to-package-7.0.0
Update to package 7.0.0
6 年前
8653c6cc
Init commit
5 年前
87775c1f
Bugfix/nan ( #53 )
* Update BushTest normal map
Filled with (0, 0, 1) where alpha was < 1
Re-normalized all normals and replaced invalid values with (0, 0, 1)
Set alpha channel to 1
* Vegetation ShaderGraph: Normalize normal before master node
This normalize should not be necessary, but the specific normal map of lower LODs of the palm trees otherwise generate NaNs during tangent to world space transformation.
5 年前
1d4b81d9
init commit from B&D
5 年前
bdc8378b
Changes
5 年前
4136779f
Vegetation ShaderGraph: Normalize normal before master node
This normalize should not be necessary, but the specific normal map of lower LODs of the palm trees otherwise generate NaNs during tangent to world space transformation.
5 年前
635d9497
Demo work merge ( #64 )
* Updated burst package, fixed missing renderer shaders
* Update package to public 7.0.0 package
* Init commit
* Changes
* Created cloud shader
* Initial push with boat falling due to Unity Physics
* init commit from B&D
* Updated manifest
* created systems
moved package into packages folder for customization (fix)
* -Getting closer to physical parity
* -Added debug code to buoyant object class
* -Achieved math parity, but the physics results are still way off. Buoyancy is also wrong on both objects
* -Added recent tests for further work
* -staging changes before reverting to older version for testing
* -Added code to control boat with dots physics and input. Forces not applying correctly yet
* -Updated dots physics package
* Revert "Changes"
This reverts commit a45704dd8550ef4ea82ecd3c4e5caf667d355355.
* -Added latest physics tweaks and modified physics scene to debug performance
* -Removed debug messa...
5 年前
d2264a9f
Merge branch 'master' into release/2019.3
# Conflicts:
# Assets/Shaders/Graphs/Vegetation.shadergraph
# Assets/Textures/Island/BushTest_norm.png
# Packages/manifest.json
# ProjectSettings/ProjectVersion.txt
5 年前
3b5e5ca2
Bug fixes ( #70 )
* fixes
- fixed precision error in checkpoint shader
- fixed tangents on clouds
- fixed touch controls appearing on switch
- clamped skybox sun
- changed reflection probes to baked
* Fixed Issue with addressables
* Added back Heightmap generation for the Water
* fixed DX11 sampler
5 年前
b5164358
Bug fixes ( #71 )
* Fixed typo in welcome screen
* Release/2019.3 (#68 )
* Updated burst package, fixed missing renderer shaders
* Update package to public 7.0.0 package
* Update BushTest normal map
Filled with (0, 0, 1) where alpha was < 1
Re-normalized all normals and replaced invalid values with (0, 0, 1)
Set alpha channel to 1
* Vegetation ShaderGraph: Normalize normal before master node
This normalize should not be necessary, but the specific normal map of lower LODs of the palm trees otherwise generate NaNs during tangent to world space transformation.
* Bugfix/nan (#53 )
* Update BushTest normal map
Filled with (0, 0, 1) where alpha was < 1
Re-normalized all normals and replaced invalid values with (0, 0, 1)
Set alpha channel to 1
* Vegetation ShaderGraph: Normalize normal before master node
This normalize should not be necessary, but the specific normal map of lower LODs of the palm trees otherwise generate NaNs during tangent to world sp...
5 年前
625fd653
Tweaks to water shader and fixed lifetime issue for caustics material
5 年前
bfaabc16
Assorted bug fixes and improvements
5 年前
baa541e9
Upgrade: Project is now using Unity 2020.1.0b8
5 年前
c018758f
Clean up
5 年前
2e8074d7
Assorted changes
- increased planar reflection res
- Tweaked splash material
- added some more reflection probes
- updated Island nested prefabs
- added DOTS AI navmesh script to logic prefab
- Tweaked non-DOTS boat prefab
- removed old code from AIcontroller
- exposed engine on the boat controller
- Island scene cleanup & bake
- Fixed planar reflection LOD bias
- Water is drawn with DrawMesh again
- Fixed water shadows with no cascade shadows
- Fixed NaNs on switch in water
- Using Universal BRDF now for water highlights
- Tweaked project settings for running on iPhone 6s
5 年前
a4269de5
Merge branch 'demo-work' into dots-physics
5 年前
2d3b0e44
Clean up
4 年前
0d936aa9
Removed local package
5 年前
67e830f4
Merge remote-tracking branch 'origin/demo_brandanddesign' into demo-work
# Conflicts:
# Assets/Data/UniversalRP/PipelineAsset.asset
# Assets/Shaders/Graphs/CliffShader.ShaderGraph
# Assets/scenes/Island/GlobalFX Profile.asset
# Packages/manifest.json
# ProjectSettings/ProjectVersion.txt
5 年前
b5841bcb
Init commit
5 年前
163f5887
Added skybox feature to render objects at scaled size
4 年前
4f1f8aa4
Merge branch 'dots-physics' into merge-branch
5 年前
33fdb9a8
Small updates
4 年前
95da86b0
Merge remote-tracking branch 'origin/demo-work-customrenderer' into merge-branch
5 年前
57dc9798
Merge branch 'merge-branch' into dots-physics
5 年前
02722ac4
Update to 2020.2.0f1
4 年前
37a8cc96
Revert "Merge branch 'merge-branch' into dots-physics"
This reverts commit 75d7d64c3e91480e1998b82a24574fe1b979f115, reversing
changes made to faceff0acd9d8d2c1d4e446bb27452d48bbd9f94.
5 年前
cd6fe6c5
Fixed corrupt shadergraph shader
4 年前
9b7c02b9
Squashed commit of the following:
commit a5da8beebf969b462559cc513b3e24948e41c7f2
Author: Andre McGrail <andrem@unity3d.com>
Date: Mon Jan 18 11:24:23 2021 +0100
pipeline assets updated
commit b20218652b58f34ca9f4e07410a1258cf379ada4
Author: Andre McGrail <andrem@unity3d.com>
Date: Mon Jan 18 11:24:04 2021 +0100
Added debug mode for boat testing
commit 735aaf50ef1db3ba61eac12a43a32648f79a77ad
Merge: f95ad59 d07745c
Author: Andre McGrail <andrem@unity3d.com>
Date: Mon Jan 18 11:23:24 2021 +0100
Merge branch 'master' of https://github.com/Unity-Technologies/BoatAttack
commit d07745c0d9bc97cde5fc4ae86186d6c2f0c2a16c
Author: Felipe Lira <felipedrl@gmail.com>
Date: Thu Jan 7 16:48:52 2021 +0100
Fix usage of UNITY_REVERSED_Z (#134 )
commit f95ad59351cd51c6011ce913924674c28f9bc230
Author: Andre McGrail <andrem@unity3d.com>
Date: Tue Dec 22 11:08:30 2020 +0100
demo scene default
commit 22ec6b165614e081f66273a7ea0af1e582a41cd7
Author: Andre McGrail <an...
4 年前
39df451d
additional work
4 年前
036f8f82
More work
4 年前
4aa39331
InitCommit
4 年前
bd44dad8
Merge branch 'demo-work' into prep-for-merge
5 年前
deed6b8d
Imposters working
4 年前
1c0adb5c
Merge branch 'demo-work-temp' into demo-work
# Conflicts:
# Assets/scenes/Island.unity
5 年前
5346d992
Made assignments of Lightmap Params to nested prfab hierarchies. Got a draft video with super-dumb reflection setup for a quick update
4 年前
b8b2f3c5
Improvements to the Buoyant system
- trees are now affecting GI but using probes only
5 年前
34f1f05f
General lookdev update
5 年前
eb377391
Assorted tweaks
- Added Speedboat
- Worked on cloud placement
- Tweaked water shader
5 年前
fbe96a9c
Merge branch 'demo-work' of https://github.com/Verasl/BoatAttack into demo-work
5 年前
f65adef5
Assorted fixes
- Fixed NaNs on water
- Fixed shadergraph shaders being alpha clipped when not needing
- Reorganised some folders/unused assets
5 年前
d04cafcb
Assorted changes
- Broke Environment Objects into smaller prefabs
- Added emission to Houses
- Day/Night now has night, also applies lighting to houses and changes time in play mode
- Fixed boat engine not moving much when steering
- Added additional light support to water
- Added animated noise to water shadow jitter
5 年前
ae1ff984
Assorted fixes
- added debug modes to Renderer Features
- added respawn option for boats
- removed cloud renderer feature
5 年前
49320f4a
Assorted Changes
- Enabled soft shadows on low asset
- Embedded and upgraded builtin proc sky shader
- Added Dithered Crossfade to the Vegetation shadergraph
- Lowered LOD bias for planar reflections
- Hardcoded water ramp texture format
5 年前
2f3b9d78
Blocked off cave and rebaked lighting
5 年前
73f3a10b
Init commit
- WIP branch for sorting vertical slice
- Added gameplayingredients package from ThomasIche
5 年前
9e0f924d
Additional work
5 年前
5a2a6fc2
Fixed UI shader
5 年前
7e67e768
Assorted cleanup and UI work
5 年前
cf6aa00a
Work on replay camera and post game stats
5 年前
71d76279
Project cleanup
5 年前
a60e6f47
Merge branch 'demo-work-temp' into demo-work
# Conflicts:
# ProjectSettings/GraphicsSettings.asset
5 年前
79176919
init push
4 年前
5eb68dc3
Merge branch 'master' into feature/new-clouds
# Conflicts:
# Assets/Shaders/Vegetation/Vegetation.shadergraph
# Assets/Shaders/Vegetation/VegetationDeformation.shadersubgraph
# Packages/manifest.json
# Packages/packages-lock.json
# ProjectSettings/ProjectVersion.txt
4 年前
49659ec8
Squashed commit of the following:
commit f95ad59351cd51c6011ce913924674c28f9bc230
Author: Andre McGrail <andrem@unity3d.com>
Date: Tue Dec 22 11:08:30 2020 +0100
demo scene default
commit 22ec6b165614e081f66273a7ea0af1e582a41cd7
Author: Andre McGrail <andrem@unity3d.com>
Date: Tue Dec 22 10:32:59 2020 +0100
Fixed corrupt shadergraph shader
commit 9f4f2018c150cdc56548d1f1ab5906561d1cb741
Author: Andre McGrail <andrem@unity3d.com>
Date: Tue Dec 22 10:11:14 2020 +0100
Update to 2020.2.0f1
commit 4b92a5e6dcb7b9b9386283a4d0d19fd5a3b22633
Author: Andre McGrail <andrem@unity3d.com>
Date: Wed Dec 2 15:50:55 2020 +0100
Fix and improve shadows on the water (#130 )
commit 88679d7ebeeae4be30f43ebe88cba830f363803b
Author: Andre McGrail <andrem@unity3d.com>
Date: Mon Nov 23 11:27:01 2020 +0100
Removed variable 'loop' as itwas causing issues for PS4 compiling (#129 )
commit 60b6bc595f20b29f4869d3236ce1aa91a490ef6b
Author: Andre McGrail <andrem@unity3d.com>
Da...
4 年前
3932b2dd
New Buoy system and tweaks to the gerstner wave jobs
4 年前
7c22ab22
Integrated basic gfx test ( #146 )
* Init Commit
* added static define to shaders and systems
3 年前
35091da6
Fixed issue with UIPanelFade shader
3 年前
8b5b3f33
Merge branch 'master' into testing/automation
3 年前
Andre
Andre McGrail
GitHub
André McGrail
André McGrail
Kay Chang
katem
Florian Penzkofer
andytouch
Mike Geig
Felipe Lira
Andrem
mikegeig
David Llewelyn