36b78bf8
Initial project push
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 年前
3e297a4c
Fixed vegetation shaders
7 年前
40418733
Small tweaks, removed unneeded shaders and variants
7 年前
13b925a4
Camera work for cutscene
More set dressing
7 年前
379cda8c
Setup MPBs on the boats
More set dressing
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 年前
bd60d1e2
Merge pull request #7 from Verasl/MiscWork
Misc work merged into Master
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 年前
5e65d97b
SRP batcher on
6 年前
a6991323
Merge pull request #29 from Verasl/art-tweaks
Art tweaks
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 年前
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
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 年前
625fd653
Tweaks to water shader and fixed lifetime issue for caustics material
4 年前
5f1126f8
Merge branch 'merge-branch' into dots-physics
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 年前
62f4e58f
Benchmark base
4 年前
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 年前
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 年前
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 年前
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 年前
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 年前
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 年前
e006090c
strip all lods but lod 0 for now
3 年前
Andre
Andre McGrail
GitHub
André McGrail
André McGrail
katem
Bruno Gagne
Mike Geig
mikegeig
Andrem
David Llewelyn
tim