36b78bf8
Initial project push
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 年前
95f9af62
Small tweaks
7 年前
8adcbeea
Updated water submodule
Updated LTpipe to version 1.1.2-preview
Updated shaders to work with new LTpipe
7 年前
abc17eb2
Switched terrain to mesh
Added LODTweaker to change lod on secondary cameras
7 年前
7438b4a6
Created LOD switcher to only use high level lods on main Camera
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 年前
379cda8c
Setup MPBs on the boats
More set dressing
7 年前
eb7bff0b
Updated baked lighting
Updated submodule
7 年前
f485660c
Manifest back to packages
Moved texture2Darray script to editor folder
Added GPU instancing back on the vegetation material
7 年前
033decc7
Tweaked LOD settings
Added LOD for trees
Added cross fade for vegetation LODs
7 年前
01a69cb1
Rebaked Lighting
Tweaked LOD levels
7 年前
7ec2acab
Large update, lots of visual differences, be careful updating to here
6 年前
88fbddf7
Massive cleanup
6 年前
c330c77c
Merge pull request #2 from Verasl/custom-renderer
Custom renderer
6 年前
b1f6c73f
Fixed custom renderer for latest SRP
Updated Navmesh
Tweaked some materials
6 年前
316d47cb
Removed WaterSystem submodule and embedded as local Package.
No build tests so may not work in build in this commit
6 年前
e5cf59be
Init branch push
6 年前
48578b71
Water foam work
Beginning work on UI
AI tweaks
6 年前
bd60d1e2
Merge pull request #7 from Verasl/MiscWork
Misc work merged into Master
6 年前
f1da6447
Added burst compiler for the water system job
Removed usage of Half in the job(slow on CPU)
Made the HeightJob update every physics frame again since it's 25x faster
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 年前
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 年前
08c9a7be
Texture/Shader tweaks
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 年前
03081f47
Merge pull request #23 from Verasl/shader-api-cleanup
Shader api cleanup PR
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 年前
5e65d97b
SRP batcher on
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 年前
1b25cca4
InitCommit
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 年前
a3c601de
Updated material data references
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 年前
5dc36208
Remove unused mesh
6 年前
eca7f35e
Remove unused mesh
6 年前
26d685c4
Remove unused mesh
6 年前
2dfa66c1
Merge branch 'release/2019.3'
6 年前
a5cd0dc0
Merge branch 'master' into lw/post-v3
# Conflicts:
# Assets/scenes/Island.unity
# Packages/manifest.json
6 年前
7b564e6c
Update to Universal
- Added universal package locally
- Converted vegetation to shader graph
- Added post v3
5 年前
c3ae69d1
Clean up
- Cleaned up shader graphs
- removed un-used textures
- converted some Universal namespace additions
5 年前
0669fac0
Minor tweaks
- Updated vegetation shader graph to use half
- Changed camera to follow cam
5 年前
c05078fa
Merge pull request #47 from Verasl/Update-to-package-7.0.0
Update to package 7.0.0
5 年前
1d4b81d9
init commit from B&D
5 年前
08ce545b
added asset small_tree_A + shader and textures
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 年前
96efdb6f
added a wip for theses assets: distant cards, bush_A, grass_clump and 2 small_trees
5 年前
40233fd2
Merge branch 'demo-work' of https://github.com/Verasl/BoatAttack into demo-work
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
4 年前
bfaabc16
Assorted bug fixes and improvements
4 年前
baa541e9
Upgrade: Project is now using Unity 2020.1.0b8
5 年前
5f1126f8
Merge branch 'merge-branch' into dots-physics
5 年前
c018758f
Clean up
4 年前
2d3b0e44
Clean up
4 年前
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 年前
1e1d985d
Changed Lod Lightmaps to run only in editor and only when needed ( #118 )
4 年前
725238d0
Start on cloud assets
4 年前
62f4e58f
Benchmark base
4 年前
928fffba
Changed Lod Lightmaps to run only in editor and only when needed ( #118 )
4 年前
b5841bcb
Init commit
5 年前
20c32484
Feature/benchmark ( #126 )
* Benchmark base
* fix shader library compile regression
* Fix FBX errors
* automated run from editor WIP
* more work, cleanup of UI prefabs
* static angle scene
First pass
* Squashed commit of the following:
commit fdd4ba7dc6a6fabd561ea186b4453735ac9103eb
Author: Andre McGrail <andrem@unity3d.com>
Date: Fri Sep 4 13:54:37 2020 +0200
Changed Lod Lightmaps to run only in editor and only when needed (#118 )
* Fix benchmark build errors
* Fixed texture compression warning on build
* Fixed profiling scope errors
* removed terrain group missing script
* Fixed flythrough playing automatically, also added camera prefab to benchmark scenes for easy future updating
* cleanup
* enable playmode tests in project (#120 )
* enable playmode tests in project
* upgrade input system
* Revamp postprocessing default volume
* Assorted cleanup and fixes
* Fixed volume quality levels
* Potential camera and vo...
4 年前
163f5887
Added skybox feature to render objects at scaled size
4 年前
1cd0745c
Fix FBX errors
4 年前
219e8688
Squashed commit of the following:
commit 60b6bc595f20b29f4869d3236ce1aa91a490ef6b
Author: Andre McGrail <andrem@unity3d.com>
Date: Mon Nov 9 17:32:00 2020 +0100
Update README.md
commit 87dc01efaab4c7911d5af79355707930b4b4b00b
Author: Andre McGrail <andrem@unity3d.com>
Date: Mon Nov 9 17:27:13 2020 +0100
Update README.md
commit 35e7524eded7d0d639332bfb4a17547481aaa91d
Author: Andre McGrail <andrem@unity3d.com>
Date: Mon Nov 9 17:26:53 2020 +0100
Update README.md
commit 46718e5dc3772f43ef0b159d75e96588514a68c5
Author: Andre McGrail <andrem@unity3d.com>
Date: Wed Nov 4 16:29:21 2020 +0100
Feature/benchmark (#126 )
* Benchmark base
* fix shader library compile regression
* Fix FBX errors
* automated run from editor WIP
* more work, cleanup of UI prefabs
* static angle scene
First pass
* Squashed commit of the following:
commit fdd4ba7dc6a6fabd561ea186b4453735ac9103eb
Author: Andre McGrail <andrem@unity3d.com...
4 年前
937258d5
Merge branch 'master' into feature/new-clouds
# Conflicts:
# Assets/Data/UniversalRP/BoatDemoRenderer.asset
# Assets/Data/UniversalRP/PlanarReflectionRenderer.asset
4 年前
b3469914
Solved culling issue by having skybox follow camera, downside is shader code(world position etc)
4 年前
33fdb9a8
Small updates
4 年前
06289a37
Squashed commit of the following:
commit fdd4ba7dc6a6fabd561ea186b4453735ac9103eb
Author: Andre McGrail <andrem@unity3d.com>
Date: Fri Sep 4 13:54:37 2020 +0200
Changed Lod Lightmaps to run only in editor and only when needed (#118 )
4 年前
02722ac4
Update to 2020.2.0f1
4 年前
d00579aa
cloud mesh generator moved to utility, and asset
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 年前
c38e8a73
More cloud work, secondary layer, graph cleanup
4 年前
39df451d
additional work
4 年前
036f8f82
More work
4 年前
924abe5e
Added cloud layer to demo scene for iteration work
4 年前
bd44dad8
Merge branch 'demo-work' into prep-for-merge
5 年前
deed6b8d
Imposters working
4 年前
2addac81
Merge remote-tracking branch 'origin/demo_brandanddesign' into demo-work
# Conflicts:
# Assets/Objects/environment/Cliffs/Env_DistantCards.fbx.meta
# Assets/Objects/environment/Cliffs/Maps/BGcards_Albedo.png.meta
# Assets/Objects/environment/Cliffs/Maps/BGcards_Normal.png.meta
# Assets/Objects/environment/Cliffs/Materials/Env_DistantCards_MAT.mat
# Assets/Objects/environment/Cliffs/Materials/Env_DistantCards_MAT.mat.meta
# Assets/Objects/environment/Trees/Materials/SmallTreeA_bilboard_MAT.mat
# Assets/Objects/environment/Trees/Materials/SmallTreeA_bilboard_MAT.mat.meta
# Assets/Objects/environment/Trees/small_tree_A.fbx
# Assets/Objects/environment/Trees/small_tree_A.fbx.meta
# ProjectSettings/QualitySettings.asset
5 年前
f2a5c27b
Beginning work to divide up the world into gi param groups
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 年前
acc5c0e7
Updates for clouds
5 年前
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 年前
dc80faee
Assorted changed
- Fixed NaNs on bush normal map
- Added cloud rotation to day/night cycle
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 年前
7e67e768
Assorted cleanup and UI work
5 年前
dfacfd94
updates
5 年前
71d76279
Project cleanup
5 年前
a60e6f47
Merge branch 'demo-work-temp' into demo-work
# Conflicts:
# ProjectSettings/GraphicsSettings.asset
5 年前
3d8e8756
Project files cleanup
5 年前
be266629
fixed FBX frame rate error
3 年前
5cf50635
tweaks to the cloud system
3 年前
36477726
small changes
3 年前
5a392d1a
work on day/night controller
3 年前
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...
3 年前
e006090c
strip all lods but lod 0 for now
3 年前
Andre
Andre McGrail
GitHub
André McGrail
André McGrail
katem
Bruno Gagne
andytouch
Mike Geig
Andrem
mikegeig
David Llewelyn
tim