Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 19:01:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
57391 commits 25 branches 0 tags 1.1 GiB
Commit graph

57391 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
7e9ea596a0 Add more efficient overlay getters, don't use blocking calls 2017-07-07 21:00:31 -07:00
Zach Fox
cdfbb02471 Merge pull request #10921 from zfox23/spectatorCamera_fixOverlayDrift 
Prevent Image3DOverlays from drifting
 2017-07-07 19:29:29 -07:00
Zach Fox
d0c521d7b4 Add clarifying comment. 2017-07-07 19:19:48 -07:00
Atlante45
7160fca4f7 Fix bad read access on shutdown 2017-07-07 17:14:08 -07:00
Atlante45
aa306c3450 Fix debug asserts on shutdown 2017-07-07 17:01:07 -07:00
Chris Collins
8a00efde72 Merge pull request #10922 from highfidelity/revert-10835-bug/invisible-avatars 
Revert "fix for invisible avatars after radius ignore"
 2017-07-07 16:51:06 -07:00
Stephen Birarda
420e9233b6 Revert "fix for invisible avatars after radius ignore" 2017-07-07 16:50:28 -07:00
druiz17
6e44c95d53 Merge pull request #10906 from druiz17/audio-qml-fix 
Made the output audio listview dynamically change height base on content size
 2017-07-07 16:48:15 -07:00
Stephen Birarda
f07ce6d294 Merge pull request #10835 from birarda/bug/invisible-avatars 
fix for invisible avatars after radius ignore
 2017-07-07 16:06:44 -07:00
Zach Fox
e537c494e5 Prevent Image3DOverlays from drifting 2017-07-07 16:04:08 -07:00
Zach Fox
dbb48cd1aa Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-07 16:03:04 -07:00
Atlante45
0778fbaea9 Fix Debug Mode Assert 2017-07-07 15:58:39 -07:00
David Kelly
f18e64ed1a first pass at blitting correct hmd preview (in mono) 2017-07-07 15:53:29 -07:00
Andrew Meadows
665aa92da2 Merge pull request #10877 from sethalves/atp-client 
Atp client
 2017-07-07 14:04:50 -07:00
Zach Fox
3d14d3755e Merge pull request #10898 from 1P-Cusack/21425 
Add View->Enter First Person Mode in HMD checkbox.
 2017-07-07 14:01:36 -07:00
Andrew Meadows
57842ce5a5 Merge pull request #10878 from mnafees/21355 
CR for Job #21355 - Clean up and remove menu hotkeys
 2017-07-07 14:01:21 -07:00
1P-Cusack
77001712ab Default 'Enter First Person Mode in HMD' to true. 2017-07-07 15:35:32 -04:00
Liv
060e3a9c5a Add signal for avatar skeleton changing 2017-07-07 11:48:12 -07:00
Ryan Huffman
84345e6db1 Merge pull request #10915 from birarda/bug/bake-with-ext-textures 
fix for FBX baking with external textures
 2017-07-07 10:57:35 -07:00
Seth Alves
01b612fd14 Merge branch 'master' of github.com:highfidelity/hifi into faster-getters-on-avatar-for-scripts 2017-07-07 10:42:12 -07:00
Seth Alves
6782a891d0 rename the joint-name caches in AvatarData and Avatar so it's more clear that they are different 2017-07-07 10:35:45 -07:00
David Kelly
688b5dad8b allow switching display modes to work in desktop 2017-07-07 10:34:11 -07:00
Brad Davis
e22a3c6af9 Fixing overlay crashes, for real 2017-07-07 10:28:36 -07:00
Zach Fox
e222753aac Merge pull request #10911 from zfox23/PAL_adminFix2 
Set admin status even if QML can't find user in PAL
 2017-07-07 10:24:53 -07:00
Andrew Meadows
2349057306 Merge pull request #10879 from AndrewMeadows/avoid-null-shape 
fix crash in ObjectMotionState::handleEasyChanges()
 2017-07-07 10:22:05 -07:00
Stephen Birarda
bff54d260e fix for baking FBX with external textures 2017-07-07 10:11:13 -07:00
Anthony J. Thibault
64375c0438 Merge branch 'master' into feature/smooth-ik-chains 2017-07-07 09:31:46 -07:00
Anthony J. Thibault
bd8d6280a8 Interpolate out of ik chains when they are disabled 2017-07-07 09:29:57 -07:00
Sam Gateau
c3dd25e499 Drafting the mechanism to add shape pipeline 2017-07-07 18:26:10 +02:00
Olivier Prat
06d69d04c3 TransitionStage + FadeJob compiling but not linked to entity events 2017-07-07 18:22:11 +02:00
Seth Alves
88c39f3237 off-by-one 2017-07-07 09:15:42 -07:00
Seth Alves
29baca20e3 Merge branch 'master' of github.com:highfidelity/hifi into faster-getters-on-avatar-for-scripts 2017-07-07 09:10:47 -07:00
Seth Alves
e4aa4823f9 Merge branch 'master' of github.com:highfidelity/hifi into dont-think-during-mouse-move 2017-07-07 08:51:38 -07:00
Zach Fox
ea77557e38 Correctly close PAL when switching domains 2017-07-07 08:09:19 -07:00
Seth Alves
fc8b7c7cc5 Merge pull request #10904 from druiz17/window-root-spam 
fixed log spamming from windowRoot.qml in toolbar mode
 2017-07-07 07:17:08 -07:00
Seth Alves
81cc46beb4 Merge pull request #10909 from jherico/overlay_crashes 
Fixing overlay crashes, for real
 2017-07-07 07:11:52 -07:00
Olivier Prat
4256a1f2a7 Preparing for merge with stage. DOESN'T COMPILE! 2017-07-07 15:16:20 +02:00
Sam Gateau
d15c4ea2d3 Merging with the stage branch 2017-07-07 15:12:40 +02:00
Sam Gateau
a8086764da REmoving warnings for unused var 2017-07-07 12:19:22 +02:00
Sam Gateau
4c1bf6af47 REmoving comments 2017-07-07 11:38:25 +02:00
Olivier Prat
5ab093dc38 Preparing to introducte TransitionStage 2017-07-07 11:01:47 +02:00
Sam Gateau
156c20d01e Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-07-07 10:58:05 +02:00
Olivier Prat
69a7ec42fd Added fade state in render::Item 2017-07-07 09:16:54 +02:00
Zach Fox
ee9cdaff90 Set admin status even if QML can't find user in PAL 2017-07-06 23:26:40 -07:00
Seth Alves
baf63181d2 Merge pull request #10900 from hyperlogic/bug-fix/pucks-in-desktop 
Can now use chest, hips, shoulder & feet pucks in desktop mode.
 2017-07-06 19:53:44 -07:00
Seth Alves
ddabe940d6 dry up some code 2017-07-06 18:42:00 -07:00
Atlante45
0c18f04e58 Fix Audio Mixer crash 2017-07-06 18:41:25 -07:00
Seth Alves
801c45898f dry up some code 2017-07-06 18:41:11 -07:00
Seth Alves
57ba2c5cd6 add invalidateJointIndicesCache method 2017-07-06 18:16:41 -07:00
David Kelly
93840bf936 hack to not switch display to hmdPreviewFrame texture (temporary) 2017-07-06 18:13:24 -07:00