Andre McGrail
88fbddf7
Massive cleanup
7 年前
GitHub
c330c77c
Merge pull request #2 from Verasl/custom-renderer
Custom renderer
7 年前
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 年前
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
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
6 年前
André McGrail
da3485f6
Merge branch 'GDC-temporary'
# Conflicts:
# Assets/Objects/boats/Maps/Interceptor_MRLL.tif.meta
# Packages/manifest.json
6 年前
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
6 年前
André McGrail
aac85ebe
edits
6 年前
André McGrail
fde4e690
Added new Input System
5 年前
André McGrail
bdc8378b
Changes
5 年前
André McGrail
ab2824e8
Revert "Changes"
This reverts commit a45704dd8550ef4ea82ecd3c4e5caf667d355355.
5 年前
André McGrail
2e7c3042
Fix Physix implementation
5 年前
Mike Geig
c153ce71
-Added code to control boat with dots physics and input. Forces not applying correctly yet
5 年前
Mike Geig
8fec71b0
Merge branch 'dots-input' into dots-physics
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 年前
Mike Geig
4f1f8aa4
Merge branch 'dots-physics' into merge-branch
5 年前
mikegeig
d69901c9
-Cleaned up some of the scripts
-re-organized files preparing for merge into demo branch
5 年前
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 年前
André McGrail
eb377391
Assorted tweaks
- Added Speedboat
- Worked on cloud placement
- Tweaked water shader
5 年前
André McGrail
fbe96a9c
Merge branch 'demo-work' of https://github.com/Verasl/BoatAttack into demo-work
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 年前