Andre
36b78bf8
Initial project push
7 年前
Andre
78808f0d
Boat trail tweaks
7 年前
Andre McGrail
23a48921
Tweaked boat physics, shaved off half a ms per boat
7 年前
Andre McGrail
d9fd1934
more work on buoyancy jobs conversion
7 年前
Andre McGrail
eb60867b
Level tweaks
Perf tweaks
Added shadow switcher for main camera rendering
7 年前
Andre McGrail
039ec916
level tweaks
7 年前
Andre McGrail
84e64de9
slight tweaks
7 年前
Andre McGrail
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 年前
Andre McGrail
14efaaf3
Updated boat
Tweaked wake/splash materials
Updated water system submodule
7 年前
Andre McGrail
8adcbeea
Updated water submodule
Updated LTpipe to version 1.1.2-preview
Updated shaders to work with new LTpipe
7 年前
Andre McGrail
9abb6a66
Added custom terrain shadegraph
Added new boat and shader
Started to add other props
7 年前
Andre McGrail
13b925a4
Camera work for cutscene
More set dressing
6 年前
Andre McGrail
c4011ea8
Updated packages and added basic debug menu
Fixed shadergraph GUID issue
6 年前
Andre McGrail
bc67bea6
Updated boat physics settings
Rebaked lighting
Updated submodules
6 年前
Andre McGrail
379cda8c
Setup MPBs on the boats
More set dressing
6 年前
Andre McGrail
7ec2acab
Large update, lots of visual differences, be careful updating to here
6 年前
Andre McGrail
88fbddf7
Massive cleanup
6 年前
GitHub
c330c77c
Merge pull request #2 from Verasl/custom-renderer
Custom renderer
6 年前
Andre McGrail
b1f6c73f
Fixed custom renderer for latest SRP
Updated Navmesh
Tweaked some materials
6 年前
Andre McGrail
316d47cb
Removed WaterSystem submodule and embedded as local Package.
No build tests so may not work in build in this commit
6 年前
Andre McGrail
48578b71
Water foam work
Beginning work on UI
AI tweaks
6 年前
GitHub
bd60d1e2
Merge pull request #7 from Verasl/MiscWork
Misc work merged into Master
6 年前
Andre McGrail
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 年前
Andre McGrail
309b3c34
Merge branch 'lw/shader-include' into lw/api-review-v4
# Conflicts:
# Assets/scenes/Island.unity
6 年前
GitHub
d58b7d71
Merge pull request #10 from Verasl/lw/api-review-v4
Lw/api review v4
6 年前
Andre McGrail
08c9a7be
Texture/Shader tweaks
6 年前
Andre McGrail
9c167dec
Small fixes/tweaks
6 年前
GitHub
599cccf6
Merge pull request #21 from Verasl/optimization
Optimization
6 年前
André McGrail
98dcb308
Assorted changes
-fix scene slowdown
-updated reflection probes
6 年前
GitHub
03081f47
Merge pull request #23 from Verasl/shader-api-cleanup
Shader api cleanup PR
6 年前
André McGrail
175825d8
Fixed planar reflections
- Planar reflections now work properly across multiple windows
- Fixed leaking of render texture
- Fixed multiple reflection cameras
- Added first pass seaweed
- Fixed tessellation shader
- Simplified water common to share more between tessellation and vertex displacement
- Enabled SRP batcher
- Fixed LODLightmaps to work with 4 LODs
- Cleared Occlusion data, was messing with planar reflections and also didnt cull anything at large distances
-
6 年前
GitHub
a6991323
Merge pull request #29 from Verasl/art-tweaks
Art tweaks
6 年前
André McGrail
192ef3fc
Final tweaks to branch
6 年前
GitHub
28758d0f
Merge pull request #31 from Verasl/lw/passes-in-objects
Lw/passes in objects
6 年前
André McGrail
1b25cca4
InitCommit
6 年前
André McGrail
ac2f0b59
Manifest update
-Merged boat and boat physics mesh into one fbx
5 年前
André McGrail
da3485f6
Merge branch 'GDC-temporary'
# Conflicts:
# Assets/Objects/boats/Maps/Interceptor_MRLL.tif.meta
# Packages/manifest.json
5 年前
André McGrail
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
5 年前
André McGrail
aac85ebe
edits
5 年前
André McGrail
c3ae69d1
Clean up
- Cleaned up shader graphs
- removed un-used textures
- converted some Universal namespace additions
5 年前
André McGrail
fde4e690
Added new Input System
5 年前
GitHub
c05078fa
Merge pull request #47 from Verasl/Update-to-package-7.0.0
Update to package 7.0.0
5 年前
André McGrail
bdc8378b
Changes
5 年前
GitHub
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 年前
André McGrail
ab2824e8
Revert "Changes"
This reverts commit a45704dd8550ef4ea82ecd3c4e5caf667d355355.
5 年前
André McGrail
2e7c3042
Fix Physix implementation
5 年前
André McGrail
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 年前
Mike Geig
c153ce71
-Added code to control boat with dots physics and input. Forces not applying correctly yet
5 年前
Andre McGrail
625fd653
Tweaks to water shader and fixed lifetime issue for caustics material
4 年前
André McGrail
b6b0ecb9
Random Deferred changes
5 年前
Mike Geig
8fec71b0
Merge branch 'dots-input' into dots-physics
5 年前
Marc Tanenbaum
f4dbb831
Updates to the Boat prefab to allow for impulses, state driven camera changes, and audio
5 年前
Mike Geig
ff35ecaa
Merge branch 'dots-physics' into merge-branch
# Conflicts:
# Assets/Objects/boats/Prefabs/_Boat.prefab
# Assets/Scripts/Boat/AIcontroller.cs
# Assets/Scripts/Boat/Engine.cs
# Assets/Scripts/GameSystem/RaceManager.cs
# Assets/Scripts/GameSystem/WaypointGroup.cs
# Packages/com.verasl.water-system/Scripts/BuoyantObject.cs
# Packages/com.verasl.water-system/Scripts/Water.cs
# Packages/manifest.json
5 年前
Mike Geig
97c4cb3a
-Merged all changes and repaired issues
5 年前
Mike Geig
5611be45
Merge branch 'merge-branch' into demo-work
5 年前
Mike Geig
5f1126f8
Merge branch 'merge-branch' into dots-physics
5 年前
André McGrail
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 年前
Mike Geig
a4269de5
Merge branch 'demo-work' into dots-physics
5 年前
Marc Tanenbaum
d7672a5a
Binary changes to add guns
5 年前
Marc Tanenbaum
36c63841
Added gun particles
5 年前
Andre McGrail
62f4e58f
Benchmark base
4 年前
Marc Tanenbaum
637b677e
Save the prefab properly
5 年前
GitHub
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 年前
HouseinCornell
3e1136e4
added some ProBuilder stuff and FBX export
5 年前
Mike Geig
41ccbee6
creating artist tools specific scene
5 年前
Andre McGrail
1cd0745c
Fix FBX errors
4 年前
André McGrail
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 年前
HouseinCornell
96340e8a
no message
5 年前
Mike Geig
6957e6b1
Merge branch '2019.3/marc' into mikesbranch
5 年前
André McGrail
937258d5
Merge branch 'master' into feature/new-clouds
# Conflicts:
# Assets/Data/UniversalRP/BoatDemoRenderer.asset
# Assets/Data/UniversalRP/PlanarReflectionRenderer.asset
4 年前
Mike Geig
4f1f8aa4
Merge branch 'dots-physics' into merge-branch
5 年前
HouseinCornell
efb37697
updates on fbx files
5 年前
Mike Geig
52c9b79b
working through the game hierarchy
5 年前
HouseinCornell
79154a70
updates for Mike
5 年前
HouseinCornell
17035492
added a bunch of assets.. not cleaned up, but should link to missing maps etc..
5 年前
Mike Geig
daf819d7
Merge branch '2019.3/marc' into mikesbranch
# Conflicts:
# ProjectSettings/Packages/com.unity.probuilder/Settings.json
5 年前
Mike Geig
f2d6a661
Added demo asset folder
4 年前
HouseinCornell
4d5f3022
new assets for Artist Tools
4 年前
HouseinCornell
4a913c84
newMap
4 年前
Mike Geig
65d7153b
Merge branch 'demo/artist_tools' of https://github.com/Verasl/BoatAttack into demo/artist_tools
4 年前
HouseinCornell
f09f99d1
new maps, models, organized for Demo
4 年前
mikegeig
d69901c9
-Cleaned up some of the scripts
-re-organized files preparing for merge into demo branch
5 年前
Mike Geig
47a4a17c
Added post processing
added timeline and signals
4 年前
Mike Geig
b9f8dda0
Added pirate animation and scripts to support
4 年前
HouseinCornell
b04f9d51
Shader Graph and Gun changes WIP Beta
4 年前
André McGrail
b8b2f3c5
Improvements to the Buoyant system
- trees are now affecting GI but using probes only
5 年前
André McGrail
34f1f05f
General lookdev update
5 年前
Mike Geig
e8ec38c4
Project cleanup
4 年前
André McGrail
eb377391
Assorted tweaks
- Added Speedboat
- Worked on cloud placement
- Tweaked water shader
5 年前
Mike Geig
eaf4c547
Merge branch 'temp' into demo/artist_tools
# Conflicts:
# Assets/_Artist Tools Demo/Artist tools demo_Start.meta
# Assets/_Artist Tools Demo/Materials/BoatShadergraph_Complete.mat
# Assets/_Artist Tools Demo/Materials/BoatSkin.shadergraph
# Assets/_Artist Tools Demo/Prefabs/_BoatPrototype.prefab
# Assets/_Artist Tools Demo/Prefabs/_BoatPrototype.prefab.meta
4 年前
André McGrail
fbe96a9c
Merge branch 'demo-work' of https://github.com/Verasl/BoatAttack into demo-work
5 年前
Andre McGrail
8517dfff
Assorted changes for Unite
5 年前
André McGrail
73f3a10b
Init commit
- WIP branch for sorting vertical slice
- Added gameplayingredients package from ThomasIche
5 年前
André McGrail
7e67e768
Assorted cleanup and UI work
5 年前
André McGrail
dfacfd94
updates
5 年前
André McGrail
a60e6f47
Merge branch 'demo-work-temp' into demo-work
# Conflicts:
# ProjectSettings/GraphicsSettings.asset
5 年前
André McGrail
3d8e8756
Project files cleanup
5 年前
André McGrail
f0505931
missed files from last commit
5 年前
Andrem
be266629
fixed FBX frame rate error
3 年前
tim
e006090c
strip all lods but lod 0 for now
3 年前