Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 22:29:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
71771 commits 76 branches 59 tags 1.2 GiB
Commit graph

71771 commits

This branch
This branch
All branches
Author SHA1 Message Date
Olivier Prat
a127c1e3b2 Merge branch 'master' of http://github.com/highfidelity/hifi into ao 2018-09-19 08:41:43 +02:00
Sam Gateau
d768809fbc
Merge pull request #13969 from SamGondelman/modelBugs 
Fixing Model animation bugs
 2018-09-18 11:28:37 -07:00
Olivier Prat
03814e7653 Preparing for split rendering of HBAO directions 2018-09-18 18:33:28 +02:00
Olivier Prat
3d096d0644 Added shared header 2018-09-18 16:10:39 +02:00
Olivier Prat
9141be9124 Shader compile fix 2018-09-18 15:29:27 +02:00
Olivier Prat
60418b36d7 Preparing for halton taps 2018-09-18 15:18:06 +02:00
Olivier Prat
fb7a8bdd4d Mip depth sampling in HBAO now works 2018-09-18 12:13:49 +02:00
Olivier Prat
f7379dfcc9 Switched AO buffer to single R8 component 2018-09-18 11:54:39 +02:00
Olivier Prat
a2abf33669 Removed falloff distance as we're directly using the radius 2018-09-18 11:45:58 +02:00
Olivier Prat
acc6d0b79e Fixed wrong AO with far objects! 2018-09-18 10:22:35 +02:00
Olivier Prat
c27f3dcafe Some cleanup, still trying to solve the problem 2018-09-18 08:45:04 +02:00
Olivier Prat
0f467ceeb9 Border clamping for linear depth texture 2018-09-17 17:19:07 +02:00
Olivier Prat
d0eef1b8d0 Some cleanup 2018-09-17 16:12:54 +02:00
Olivier Prat
d9e2c8df69 Fixed uniform buffer slot index in DebugAmbientOcclusion 2018-09-17 15:06:00 +02:00
Olivier Prat
ad5064b045 Removed falloff distance from shader 2018-09-17 14:33:48 +02:00
Olivier Prat
acab748f57 Merge with master 2018-09-17 14:29:54 +02:00
John Conklin II
be76c43aec
Merge pull request #13999 from gcalero/dont_popup_login_android 
Don't popup login dialog in android
 2018-09-14 16:06:03 -07:00
John Conklin II
cb8e3c6452
Merge pull request #14003 from danteruiz/snap-fix 
Fix snapshot settings issue in HMD
 2018-09-14 15:34:22 -07:00
John Conklin II
49e578ebef
Merge pull request #13998 from AndrewMeadows/dont-zero-kinematic 
don't zero kinematic velocities when releasing simulation ownership
 2018-09-14 15:18:06 -07:00
John Conklin II
65ef04ae75
Merge pull request #13937 from luiscuenca/stt_teleport_wip 
Safe Teleport Target
 2018-09-14 15:11:18 -07:00
Dante Ruiz
ff52639bc3 fix update 2018-09-14 14:10:36 -07:00
Dante Ruiz
4eb5c9714b fix snapshot settings 2018-09-14 12:59:28 -07:00
luiscuenca
04e6225a95 Threshold back 2018-09-14 11:22:47 -07:00
luiscuenca
8c9173b639 Safe landing for discrepancies 2018-09-14 11:06:30 -07:00
David Back
86972cf4fb
Merge pull request #13992 from dback2/entityListSearchCase 
Fix entity list search case-sensitivity and allow id search
 2018-09-14 10:58:44 -07:00
Gabriel Calero
72eeeac2ba Don't popup login dialog in android 2018-09-14 14:40:30 -03:00
Andrew Meadows
9390687e2d remove redundant EntityMotionState::updateSendVelocities() call 2018-09-14 10:37:55 -07:00
Andrew Meadows
9073e1ade3 don't zero kinematic velocity at end of sim ownership 2018-09-14 10:37:17 -07:00
Howard Stearns
4378f5bf1c
Merge pull request #13996 from howard-stearns/text-tuning-for-wallet-setup-cta 
Text tuning for wallet setup call to action
 2018-09-14 10:17:22 -07:00
David Back
296e2ba488 lowercase search term at start 2018-09-14 09:57:27 -07:00
David Back
30f0bd577a Merge branch 'entityListSearchCase' of github.com:dback2/hifi into entityListSearchCase 2018-09-14 09:42:44 -07:00
David Back
a45be897ec Merge branch 'master' of https://github.com/highfidelity/hifi into entityListSearchCase 2018-09-14 09:42:04 -07:00
Sam Gateau
81a69c7769
Merge pull request #13995 from samcake/black 
Attempt to fix LOD setting getting stuck
 2018-09-14 09:31:35 -07:00
sam gateau
b35f09fead Address review comments 2018-09-14 08:43:35 -07:00
howard-stearns
685b2978ce Text tuning for wallet setup call to action 2018-09-14 08:26:25 -07:00
John Conklin II
44041fcc14
Merge pull request #13986 from Atlante45/fix/ess-crash 
Fix ESS crash caused by concurrent access to _entityScripts
 2018-09-14 07:56:45 -07:00
Sam Gateau
eccca053f9 Clean changes 2018-09-13 23:58:40 -07:00
Sam Gateau
1438643a5f Adding extra sanity checks on all time dependant values to avoid bad behavior maybe 2018-09-13 23:48:50 -07:00
unknown
f9480c24a5 store search term lower 2018-09-13 20:07:49 -07:00
unknown
ae2005b8c4 Merge branch 'master' of https://github.com/highfidelity/hifi into entityListSearchCase 2018-09-13 19:37:16 -07:00
Wayne Chen
568b5b9142
Merge pull request #13991 from wayne-chen/fixGoToButtonInterstitial 
Fix GOTO TheSpot Button in Interstitial Page
 2018-09-13 18:46:10 -07:00
luiscuenca
fb37e13aae fix hat stand fail 2018-09-13 18:21:22 -07:00
David Back
b65bd6736f also allow search using entity id 2018-09-13 18:20:11 -07:00
David Back
c5b5a5e8c1 Merge branch 'master' of https://github.com/highfidelity/hifi into entityListSearchCase 2018-09-13 18:03:13 -07:00
Wayne Chen
79cf1cb612
Merge pull request #13993 from highfidelity/revert-13989-fixLoginFailTwiceCall 
Revert "Fix login fail twice call"
 2018-09-13 17:49:06 -07:00
Wayne Chen
53582bddcd pushing more changes 2018-09-13 17:26:08 -07:00
Wayne Chen
bf7dd94db7 button was clipped; adding higher res img 2018-09-13 17:25:33 -07:00
Wayne Chen
2b8aebdb6b Revert "Merge branch 'master' into fixGoToButtonInterstitial" 
This reverts commit b4b0c519f3, reversing
changes made to aef3ed3e01.
 2018-09-13 17:21:29 -07:00
Wayne Chen
40451a1fc1 Revert "Revert "Merge branch 'master' into fixGoToButtonInterstitial"" 
This reverts commit c5468fd8e9.
 2018-09-13 17:21:07 -07:00
Wayne Chen
c5468fd8e9 Revert "Merge branch 'master' into fixGoToButtonInterstitial" 
This reverts commit b4b0c519f3, reversing
changes made to 77d5ebf34f.
 2018-09-13 17:18:49 -07:00