Zach Fox
|
51c22eb7db
|
Also re-enable spectator camera after switching domains
|
2017-07-11 15:38:10 -07:00 |
|
Zach Fox
|
1001097f92
|
Fix button state
|
2017-07-11 15:29:00 -07:00 |
|
Zach Fox
|
b0639be8bd
|
Use function pointers correctly
|
2017-07-11 15:23:50 -07:00 |
|
Zach Fox
|
c4a4623ba8
|
Workaround the bug where Avatar Entities can't get deleted after switching domains
|
2017-07-11 15:18:08 -07:00 |
|
David Kelly
|
8fd02c1d0c
|
Merge pull request #10938 from davidkelly/dk/hmdPreviewFix
fix hmd preview image
|
2017-07-11 12:27:18 -07:00 |
|
David Kelly
|
e2426c538e
|
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/noPreviewAfterDismissing
|
2017-07-11 11:01:58 -07:00 |
|
David Kelly
|
e1df3feb5c
|
fix hmd preview
|
2017-07-11 10:54:35 -07:00 |
|
Zach Fox
|
5bec6cc7f5
|
Merge pull request #10936 from zfox23/spectatorCamera_activeButtonWhenOn
Make Spectator Camera icon active when Camera is on
|
2017-07-11 10:31:29 -07:00 |
|
Zach Fox
|
2e8bd3c9cb
|
Make Spectator Camera icon active when Camera is on
|
2017-07-11 10:16:55 -07:00 |
|
Zach Fox
|
ea62ef165c
|
Fix image container background
|
2017-07-10 16:13:45 -07:00 |
|
Zach Fox
|
5ce409e2e2
|
Merge pull request #10935 from zfox23/spectatorCamera_tabletButtonFix
Ensure tablet button shows up; protections for controller mapping; Ensure instructions show
|
2017-07-10 15:52:21 -07:00 |
|
Zach Fox
|
5823efce76
|
Cleanup
|
2017-07-10 15:51:27 -07:00 |
|
Zach Fox
|
4a74522884
|
Ensure tablet button shows up; protections for controller mapping
|
2017-07-10 15:16:16 -07:00 |
|
Zach Fox
|
78d12f27ed
|
Merge pull request #10933 from zfox23/spectatorCamera_forceMonoPreview
Force Mono Preview when using Spectator Camera
|
2017-07-10 13:29:22 -07:00 |
|
David Kelly
|
339cfed3c4
|
Merge pull request #10932 from davidkelly/dk/noPreviewAfterDismissing
Ensure spectator camera preview is up when reopening tablet
|
2017-07-10 13:28:01 -07:00 |
|
Zach Fox
|
303a3d1e4c
|
Force Mono Preview when using Spectator Camera
|
2017-07-10 13:27:45 -07:00 |
|
David Kelly
|
fcf4bfd59a
|
spacing issue
|
2017-07-10 13:25:33 -07:00 |
|
David Kelly
|
b87d69b15d
|
Insure spectator camera preview is up when reopening tablet
|
2017-07-10 13:16:08 -07:00 |
|
David Kelly
|
91ffb003fd
|
Merge pull request #10908 from davidkelly/dk/hmdPreview
hmd preview
|
2017-07-10 11:14:28 -07:00 |
|
Zach Fox
|
fcf11915c5
|
Merge pull request #10930 from zfox23/spectatorCamera_noDesktopApp
Don't show SPECTATOR app in Desktop mode
|
2017-07-10 11:14:16 -07:00 |
|
Zach Fox
|
f170449b88
|
Don't show SPECTATOR app in Desktop mode
|
2017-07-10 10:25:37 -07:00 |
|
David Kelly
|
1c9c36a8c8
|
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/hmdPreview
|
2017-07-10 10:22:31 -07:00 |
|
David Kelly
|
4843b91f47
|
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
|
2017-07-10 09:50:17 -07:00 |
|
Andrew Meadows
|
96b88dccd7
|
Merge pull request #10913 from samcake/orange
Introducing the Stages to the render::Scene, Better scene update phase and getting away from the singleton model
|
2017-07-10 09:46:09 -07:00 |
|
Sam Gateau
|
0c3755483b
|
adding assert or checks whenever getting a scene stage
|
2017-07-10 12:37:26 +02:00 |
|
Sam Gateau
|
4edea433ce
|
Rename the _pipeline into _shapePipeline in the render::Args
|
2017-07-10 12:16:53 +02:00 |
|
Seth Alves
|
39db7b0329
|
Merge pull request #10905 from sethalves/faster-getters-on-avatar-for-scripts
Faster getters on avatar for scripts
|
2017-07-08 15:01:23 -07:00 |
|
Brad Davis
|
8043caa9e9
|
Merge pull request #10925 from jherico/overlay_performance
Fix terrible script performance when rendering load is too high
|
2017-07-08 14:19:14 -07:00 |
|
Brad Davis
|
cd11f5cfa6
|
More tweaks for improved script performance
|
2017-07-07 22:02:56 -07:00 |
|
Brad Davis
|
148eece065
|
Tweak frame timing to avoid overloading the main thread
|
2017-07-07 21:00:33 -07:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|