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

2909 commits

Author SHA1 Message Date
Anthony J. Thibault
6e3057479f fixes for warnings 
Also overlays menu option should work better in conjunction with ui-center/fading
 2016-06-09 11:27:02 -07:00
Anthony J. Thibault
5ef6847dc3 HMD re-centering while driving improvements. 
Previously the HUD fading in/out would also recenter the hmd sensor and the avatar, which caused many problems including:
  * The user's view could shift vertically.
  * Your avatar would briefly go into t-pose
  * other users would see your avatar go into t-pose.

Now we now move the UI sphere instead, which results in a much smoother experience.

MyAvatar: added hasDriveInput method.

OverlayConductor:
* removed avatar and sensor reset, instead the overlay's modelTransform is changed.
* revived STANDING mode, which is active if myAvatar->getClearOverlayWhenDriving() is true and you are wearing an HMD.
* SITTING & FLAT mode should be unchanged.
* Instead of using avatar velocity to fade out/fade in the hud, We use the presense or absanse of avatar drive input.
* Additionally, we check distance to the UI sphere, and quickly recenter the hud if the users head is too close to the actual hud sphere.

CompositorHelper:
* Bug fixes for ray picks not using the modelTransform.

HmdDisplayPlugin:
* Bug fixes for rendering not using the modelTransform.
 2016-06-08 18:36:36 -07:00
Brad Davis
8c13ff4ee1 Pinned UI support 2016-06-02 17:24:25 -07:00
Howard Stearns
029c76f489 Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving 2016-05-25 20:40:03 -07:00
howard-stearns
dc7d6d470d Don't reset head when we come back. 2016-05-25 12:21:50 -07:00
howard-stearns
8198a1b4d1 Add preference to control behavior. 2016-05-25 11:30:45 -07:00
Anthony J. Thibault
a1c32f8c44 Merge branch 'master' into tony/improved-avatar-mixer-precision 2016-05-23 10:24:52 -07:00
howard-stearns
9a428947e4 Simplify code. 2016-05-20 16:50:17 -07:00
howard-stearns
6568c0563d Delay on entry/exit. 2016-05-20 16:43:55 -07:00
Howard Stearns
3088a84035 Just bringing the code up to date and forcing a build to see how Jenkins/osx is doing. 
Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving
 2016-05-20 08:04:38 -07:00
Anthony J. Thibault
7f131e2c4f Reset avatar as well as displayPlugin when "driving" 2016-05-19 15:00:08 -07:00
Brad Hefta-Gaub
cef4a49c35 Merge pull request #7867 from huffman/fix/query-octree-crash 
Fix crash in JurisdictionMap
 2016-05-19 11:53:54 -07:00
Anthony J. Thibault
0294066668 Removed pupilData and translationRadix from AvatarData packet. 2016-05-18 16:41:50 -07:00
Ryan Huffman
dd093e3fcd Make AccountManager a DependencyManager singleton 2016-05-18 15:38:54 -07:00
Brad Hefta-Gaub
4df4829280 Merge pull request #7902 from jherico/gpu_breakup 
moving GL backend out of GPU
 2016-05-18 11:35:35 -07:00
Brad Hefta-Gaub
9a3b6bf081 Merge pull request #7858 from Atlante45/remove-deprecated-entity-props 
removed dead code for overlays/entities glow level
 2016-05-18 09:14:26 -07:00
Ryan Huffman
e7087c7393 Fix address bar becoming unusable after going backwards or forwards 
The address bar dialog was being disabled when a lookup request was finished,
but was not hidden - this was bug #1. Presumably, though, the intent was to have the
window _not_ disappear when going backwards or forwards, but hiding the
window when a lookup request finishes would cause the window
to be hidden when going backwards or forwards - this was bug #2.

I decided to disable the hide-on-request-finished functionality because
the window is already manually hidden after entering a new address.
 2016-05-17 11:17:34 -07:00
Ryan Huffman
ef6d758e7f Fix JurisdictionMap multithreading issues 
Make octal code pointers use shared_ptr, add locks around access.
 2016-05-17 10:59:51 -07:00
Brad Davis
5ba8372c21 Moving GL backend out of GPU 2016-05-16 12:54:17 -07:00
Atlante45
38f74c1843 Remove the last of the glow level 2016-05-14 14:49:31 -07:00
howard-stearns
654ed33dd4 Fix warnings. 2016-05-13 15:32:59 -07:00
Zach Pomerantz
59e4b9c356 Merge branch 'master' of github.com:highfidelity/hifi into fix/shutdown 2016-05-13 15:28:12 -07:00
howard-stearns
1f664671f9 Remove overlay when velocity first indicates travel, and restore it (with 
reset) when returning to reset.
 2016-05-13 14:32:54 -07:00
samcake
e40a795a27 Trying to clean up for pr 2016-05-10 19:25:22 -07:00
Brad Hefta-Gaub
d7eee98acc Merge pull request #7827 from AndrewMeadows/threadsafe-viewfrustum 
resurrection of threadsafe ViewFrustum
 2016-05-10 09:06:38 -07:00
Zach Pomerantz
694dc1bbf6 Delay Overlays cleanup for scripting 2016-05-09 17:32:25 -07:00
Brad Hefta-Gaub
7bb21d3700 fix the update dialog to not show blank lines for missing version numbers 2016-05-09 16:19:03 -07:00
Andrew Meadows
bcf2cc8074 use references not pointers for ViewFrustums 
also unravelling some spaghetti:
(1) split Octree stuff out of ViewFrustum
(2) moved ViewFrustum from octree to shared lib
(3) removed some cruft
 2016-05-05 18:28:27 -07:00
Clément Brisset
2ef87557fc Merge pull request #7798 from zzmp/clean/override 
Fix warnings on vanilla XCode compilations
 2016-05-02 10:56:07 -07:00
Brad Hefta-Gaub
cddcac60c1 Merge pull request #7768 from ctrlaltdavid/20891 
Add Interface "Home" bookmark function
 2016-05-02 10:14:57 -07:00
Zach Pomerantz
13945aa4d9 Annotate all virtual fns with override 2016-04-30 13:48:59 -07:00
David Rowe
5e00a1ef49 Implement "go home" action 2016-04-27 11:24:19 +12:00
David Rowe
f74be226c8 Add "home" button to address bar 2016-04-27 10:28:05 +12:00
Zach Pomerantz
63b0c0a9ad Reset pipeline after rendering text3d 2016-04-26 13:23:16 -07:00
Brad Hefta-Gaub
04dab65b59 Merge pull request #7727 from ZappoMan/supportLargeClockSkew 
support for larger than 35 minute clock skew
 2016-04-23 08:42:38 -07:00
Chris Collins
9bd9de5710 Merge pull request #7636 from samcake/red 
Stereo drawcall amplification
 2016-04-22 15:46:18 -07:00
Brad Hefta-Gaub
ddf5b0f316 some debugging 2016-04-21 10:32:22 -07:00
Brad Hefta-Gaub
31f9d592e0 support for larger than 35 minute clock skew 2016-04-20 18:42:00 -07:00
Brad Hefta-Gaub
c7ecbb6b4b tweaks to LOD behavior 2016-04-19 11:19:28 -07:00
samcake
298300e42f Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-04-15 14:16:02 -07:00
Zach Pomerantz
f803ecd2e7 Merge pull request #7633 from Atlante45/fix/shared-resource 
Fix raw pointers in shared resource cache items
 2016-04-14 17:52:04 -07:00
Atlante45
4ed8573f74 CR 2016-04-14 17:28:24 -07:00
samcake
6c3e011b89 Expose cleanely the 3 different techniques 2016-04-14 02:43:28 -07:00
samcake
41d4d3b2d7 Providing a cleaner way to try different paths and exploring a simpler way 2016-04-13 19:21:17 -07:00
samcake
de4345bdc5 Trying to use several FBO instead to avoid changing the REnderBUffers for overlay but... 2016-04-13 01:27:57 -07:00
samcake
8800dd84f1 Trying to use several FBO instead to avoid changing the REnderBUffers for overlay but... 2016-04-13 01:25:46 -07:00
Atlante45
e45939d18f Make sure ResourceCacheSharedItems deals with strong refs 2016-04-12 13:51:11 -07:00
Atlante45
afdfef1482 Make sure we don't use raw resource ptr 2016-04-12 13:51:11 -07:00
Brad Davis
3349093908 Fix vr menu login item update 2016-04-12 11:15:06 -07:00
Brad Davis
df8ad57185 Fix FPS counter 2016-04-11 00:25:16 -07:00