Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-23 11:09:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
48308 commits 25 branches 0 tags 1.1 GiB
Commit graph

16181 commits

Author SHA1 Message Date
Zander Otavka
3c9f3f3927 Automatically enter first person when in HMD mode 2016-06-22 16:22:14 -07:00
howard-stearns
67f76db7e4 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-22 15:58:53 -07:00
SamGondelman
d4cfe6256a don't render mini mirror if rendering fullscreen mirror 2016-06-22 14:46:08 -07:00
howard-stearns
d3735322a5 Whitespace. 2016-06-22 13:03:13 -07:00
Ryan Huffman
2621add8e3 Fix nearby_avatars not tracking 2016-06-22 09:17:28 -07:00
SamGondelman
78a1845afe fixed resizing of qml overlays when device pixel ratio changes 2016-06-21 18:13:11 -07:00
SamGondelman
f0b78eae47 fix mini mirror 2016-06-21 16:48:32 -07:00
Ryan Huffman
70be7b3273 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions 2016-06-21 16:39:25 -07:00
howard-stearns
8421931c56 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-21 14:47:45 -07:00
Brad Davis
c928de6051 Merge pull request #8099 from howard-stearns/turn-hud-reset-behavior-on-by-default 
turn hud reset behavior on by default
 2016-06-21 13:33:23 -07:00
Brad Davis
f475dd1d85 Merge pull request #8100 from howard-stearns/minimize-trigger-distance-to-hud 
minimize trigger distance to hud
 2016-06-21 13:33:16 -07:00
Brad Hefta-Gaub
160a5de271 CR feedback 2016-06-21 12:49:42 -07:00
Brad Hefta-Gaub
c322317878 rework plugins to not depend on PluginContainer unless they want to 2016-06-21 12:07:05 -07:00
Ryan Huffman
6d753e317b Fix more osx warning 2016-06-21 10:51:31 -07:00
Ryan Huffman
a77dea9048 Fix osx warning 2016-06-21 10:30:05 -07:00
Ryan Huffman
cee897d6d3 Fix osx warning 2016-06-20 16:44:07 -07:00
Ryan Huffman
ab057010d6 Add changed display mode tracking 2016-06-20 16:09:34 -07:00
Ryan Huffman
1eaa9e40cd Cleanup nearby avatar tracking 2016-06-20 16:09:17 -07:00
SamGondelman
a52fab00a9 commit possible fix for testing 2016-06-20 16:04:39 -07:00
Ryan Huffman
3aac0cc4fb Update fps useractivity with more general stats 2016-06-20 16:02:36 -07:00
Ryan Huffman
7b3b01a96a Add more values to launch UserActivity 2016-06-20 16:02:14 -07:00
Brad Davis
37e9f66639 Additional toolbar work 2016-06-20 15:41:21 -07:00
Howard Stearns
81300ec127 turn hud reset behavior on by default 2016-06-18 14:35:37 -07:00
Howard Stearns
6196c657f8 Minimize triggering distance to HUD. 2016-06-18 14:17:47 -07:00
Bradley Austin Davis
ec615caa80 Support toolbar API 2016-06-17 13:06:42 -07:00
Bradley Austin Davis
5bc8b53d1b Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-17 10:56:53 -07:00
Brad Hefta-Gaub
d8d4eb65ec Merge pull request #8059 from Atlante45/feat/steamworks 
Initial Steamworks integration
 2016-06-16 18:49:51 -07:00
Ryan Huffman
c7955900ab Add new user activity events 2016-06-16 13:17:18 -07:00
Ryan Huffman
8b3b62aad7 Add UserActivityLogger scripting interface 2016-06-16 10:25:38 -07:00
Ryan Huffman
ed88232fb0 Move session id storage to AccountManager 2016-06-16 09:19:42 -07:00
Bradley Austin Davis
067539ff6d Fix overlay stuck to face 2016-06-15 17:44:58 -07:00
Bradley Austin Davis
33e9caa636 Simplify overlay conductor, menu interation 2016-06-15 17:24:39 -07:00
Bradley Austin Davis
6ad1008a56 Allow explicit overlay alpha from scripts 2016-06-15 17:24:32 -07:00
Bradley Austin Davis
bc838ac0b4 Fix vive json 2016-06-15 11:41:28 -07:00
Bradley Austin Davis
0b0977f362 Support keyboard suppresion, control suppresion while in keyboard mode 2016-06-15 10:48:48 -07:00
Bradley Austin Davis
71bf9384ce Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-15 10:45:51 -07:00
David Rowe
657f8fdad5 Fix reporting of JSON export failure 2016-06-15 14:12:49 +12:00
Atlante45
1403fad04e Add cmd line opt to disable settings reset popup 2016-06-14 16:34:46 -07:00
Atlante45
5560ba9a4c Quit application when SteamVR requests it 2016-06-14 16:29:50 -07:00
Brad Hefta-Gaub
1c391e626f Merge pull request #8054 from ctrlaltdavid/20957 
fix model export continued
 2016-06-14 10:57:25 -07:00
Bradley Austin Davis
175dbb8924 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-14 09:48:56 -07:00
Howard Stearns
d05987de6d Merge pull request #8042 from jherico/lasers 
First pass prototype of laser rendering in OpenVR plugin
 2016-06-13 18:06:15 -07:00
Howard Stearns
213479c530 Merge pull request #8043 from hyperlogic/bug-fix/hmd-ui-center-improvements 
HMD UI re-centering while driving improvements.
 2016-06-13 14:28:50 -07:00
Chris Collins
b14f9cd312 Merge pull request #8041 from sethalves/fix-avatar-entity-locking 
Fix avatar entity locking
 2016-06-13 13:10:32 -07:00
Brad Davis
9640727f51 Hand laser rendering support in HMD plugins. 2016-06-13 13:04:11 -07:00
Brad Davis
0ddee876c3 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-13 13:03:46 -07:00
David Rowe
5553c9f87f Code review 2016-06-14 07:46:41 +12:00
Anthony J. Thibault
21e67fc4d8 Another unused variable warning 2016-06-13 12:03:42 -07:00
Anthony J. Thibault
1ca1f98034 Fix unused variable warning 2016-06-13 12:01:42 -07:00
Anthony J. Thibault
ab4bef7d55 Fixes based on PR feedback 
* The "Clear Overlay When Driving" avatar preference is obeyed.
* sensor reset will also center the ui.
 2016-06-13 11:19:47 -07:00
Anthony J. Thibault
ccf85c1f7c Merge branch 'vive-ui' into bug-fix/hmd-ui-center-improvements 2016-06-13 09:48:58 -07:00
David Rowe
098432152d Merge branch 'master' into 20957 2016-06-13 16:16:12 +12:00
David Rowe
58f89c88a2 Remember last directory used for Window.browse() and Window.save() 
Use last directory if not specified in method call. Default to desktop.
 2016-06-11 16:45:17 +12:00
Seth Alves
4c45d081cd merge from upstream 2016-06-10 19:57:46 -07:00
Anthony J. Thibault
f6ed5a1dae Bugfixes based on feedback 
* When the overlay is hidden because your head is too close to the sphere,
  instead of coming back immediately, it waits until the avatar's velocity is near zero
  for a period of time.
* Hooked up jump and fly to MyAvatar::hasDriveInput()
* Added an internal state machine to OverlayConductor to manage hiding/showing transitions.
* The overlay menu state is now tied directly to the overlay, so it will change state as the
  overlay is dynamically hidden/shown from code.
* Removed slot going directly from MenuOption::Overlays directly to OverlayConductor::setEnable().
 2016-06-10 18:33:40 -07:00
Chris Collins
006eb8fe64 Merge pull request #8031 from birarda/api-recheck-on-fail 
re-instate domain API connection info refresh during failure, fix localhost connection after downgrade
 2016-06-10 15:26:42 -07:00
Brad Davis
472a3540d7 Merge remote-tracking branch 'upstream/master' into vive-ui 
Conflicts:
	scripts/system/controllers/handControllerGrab.js
 2016-06-10 10:43:09 -07:00
Stephen Birarda
3c4f336e72 re-instate NodeList reset on limit of check ins reached 2016-06-10 09:11:25 -07:00
Brad Hefta-Gaub
426d67f5bf Merge pull request #8038 from jherico/pure_virtual 
Attempt to get better logging from pure virtual call crashes
 2016-06-10 08:25:10 -07:00
Anthony J. Thibault
685710d0ec OverlayConductor improvments 
* the HUD will fade/in when driving, even in desktop mode.
* the HUD no longer pops when you lean outside of the UI sphere,
  instead it should smoothly fade out and fade back in.
* the overlay toggle button should override fading while driving, as expected.
* removed any notion of SITTING, STANDING or FLAT mode from overlay.
 2016-06-09 18:09:04 -07:00
Stephen Birarda
e4ebafa0d8 add a menu option to force the wrong DS connect version 2016-06-09 15:53:19 -07:00
Stephen Birarda
12e5851ba4 fix connection denial message, put version back 2016-06-09 15:53:19 -07:00
Stephen Birarda
4b5a554122 remove check in version downgrading from NodeList 2016-06-09 15:53:19 -07:00
Seth Alves
441b5a20d8 merge from upstream 2016-06-09 13:23:41 -07:00
Brad Davis
cd7c6be590 Fix formatting 2016-06-09 12:25:21 -07:00
Brad Hefta-Gaub
3c5af56421 Merge pull request #8010 from hyperlogic/feature/hmd-lean-recenter-property 
Added MyAvatar.hmdLeanRecenterEnabled property
 2016-06-09 12:17:51 -07:00
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
Brad Davis
eee1ba0906 trying to get buildability 2016-06-09 10:19:38 -07:00
Anthony J. Thibault
1aae22f5a5 Optimized MyAvatar.getCharacterControllerEnabled() 
Instead of doing a blocking queued invokeMethod, it just calls into CharacterController.isEnabled() which is now thread-safe.
 2016-06-09 09:35:19 -07:00
Brad Davis
ff8d4883b1 Attempt to get better logging from pure virtual call crashes 2016-06-08 22:35:39 -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
Seth Alves
f070708b4a _avatarEntityData is accessed by more than one thread. 2016-06-08 15:53:54 -07:00
Seth Alves
1977efae4f Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid 2016-06-08 10:36:52 -07:00
Howard Stearns
bf48099286 Merge pull request #8032 from jherico/pin-button 
Add a constant hud toggle button to the UI
 2016-06-08 10:33:11 -07:00
Brad Davis
ca6e86e767 Merge remote-tracking branch 'upstream/master' into vive-ui 
Conflicts:
	interface/resources/qml/hifi/dialogs/RunningScripts.qml
 2016-06-07 21:51:47 -07:00
Brad Hefta-Gaub
80100b1d34 Merge pull request #8000 from Atlante45/feat/plugins 
Select/Disable plugins via command line args
 2016-06-07 18:17:29 -07:00
Anthony J. Thibault
30d8ae36e8 Added MyAvatar.characterControllerEnabled property 2016-06-07 16:55:32 -07:00
Brad Davis
29d9f51b58 Adding missed file 2016-06-07 16:46:17 -07:00
Seth Alves
b2f63a2132 hook up can-rez-tmp and can-write-to-asset-server 2016-06-07 16:17:58 -07:00
Howard Stearns
38d0d28603 Merge pull request #8021 from AndrewMeadows/walk-follows-camera 
camera steers avatar when walking
 2016-06-07 10:43:01 -07:00
Atlante45
399517fcbd Activate Inputs after menus are setup 2016-06-06 13:28:36 -07:00
Atlante45
26acc6fd8b Typo 2016-06-06 13:28:36 -07:00
Atlante45
24bbb8db3f Remove input plugin menu dependency 2016-06-06 13:28:36 -07:00
Atlante45
6f75fab298 Revert header changes 2016-06-06 13:28:36 -07:00
Atlante45
ee62a211ac Remove "Input Devices" menu 2016-06-06 13:28:36 -07:00
Atlante45
992fa63932 Allow ordered list of preferred plugins 2016-06-06 13:28:36 -07:00
Atlante45
932838b1e3 Setup preferred display plugin 2016-06-06 13:28:36 -07:00
Atlante45
d8493f960a Add command line option to enable/disable plugins 2016-06-06 13:28:36 -07:00
Brad Hefta-Gaub
b4721ec57e Merge pull request #7973 from ctrlaltdavid/clipboard-dimensions 
add Clipboard.getContentsDimensions() JavaScript method
 2016-06-06 12:03:10 -07:00
Brad Davis
b7d1659852 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-06 09:32:33 -07:00
Andrew Meadows
e6844e2468 use world-UP rather than head-UP 2016-06-04 21:11:31 -07:00
Andrew Meadows
49c835b6fc use camera twist for walk steering 2016-06-04 20:53:30 -07:00
Brad Davis
39dcd1f9bd Eliminate file IO contentions for the settings 2016-06-04 17:55:30 -07:00
Anthony J. Thibault
9292a9ce0b Added MyAvatar.hmdLeanRecenterEnabled property 
Used to disable the 'room-scale' avatar re-centering code.
Disabling this can prevent sliding when the avatar is supposed to be sitting or mounted on a stationary object.

Also, removed a bunch of old, unused leaning and torso twisting code.
 2016-06-03 13:56:32 -07:00
Brad Hefta-Gaub
c85923c69b Merge pull request #7956 from jherico/web_entity_crash 
fix crash on click on non-visible web-entity
 2016-06-03 10:29:55 -07:00
Brad Hefta-Gaub
2e4480ee15 Merge pull request #7979 from jherico/steam_vr_exit_fix 
Fix crash on shutdown of SteamVR
 2016-06-03 10:28:53 -07:00
Atlante45
e2fa734024 Set collision threashold to walking speed 2016-06-02 19:15:55 -07:00
Atlante45
4e8b61dea0 Limit collision injectors count to 3 2016-06-02 19:12:37 -07:00
Atlante45
854bf82631 Raise and stretch collision sounds threshold 2016-06-02 17:37:36 -07:00
Brad Davis
8c13ff4ee1 Pinned UI support 2016-06-02 17:24:25 -07:00
Brad Davis
bf734395e5 More invisible web entity fixes 2016-06-02 16:37:45 -07:00
David Rowe
7a8954d851 Merge branch 'master' into clipboard-dimensions 2016-06-02 12:55:23 +12:00
Brad Davis
ac5912df01 Fix crash on shutdown of SteamVR 2016-05-27 13:40:47 -07:00
Howard Stearns
5b6660e7ea Default preference to false. 2016-05-27 10:35:46 -07:00
Howard Stearns
e4d36cc2c2 Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving 2016-05-27 10:32:01 -07:00
Anthony J. Thibault
b4d14f06d8 Bugfix for avatar LOD 
If an avatar was LOD'ed out, it would never become visible again, because the bounds of the skeleton model were never again.
This ensures that the model bound is updated, even when the avatar is LOD'ed away.
 2016-05-26 14:35:17 -07:00
howard-stearns
9ff1a695f0 Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving 2016-05-26 13:52:23 -07:00
howard-stearns
991da9e248 fix cut-paste error in settings. 2016-05-26 09:51:55 -07:00
Brad Hefta-Gaub
78b6a6c661 Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
 2016-05-25 17:18:27 -07:00
Brad Hefta-Gaub
f2acc82899 Merge pull request #7971 from birarda/session-id-with-place-request 
optionally include the metaverse session ID as HTTP header when sending usage data
 2016-05-25 17:14:27 -07:00
Brad Hefta-Gaub
06cb625d09 Merge pull request #7959 from hyperlogic/tony/improved-avatar-mixer-precision 
Improved Avatar Mixer Rotation Precision
 2016-05-25 17:14:12 -07:00
David Rowe
2f3fa80b96 Add Clipboard.getContentsDimensions() JavaScript method 2016-05-26 09:52:22 +12:00
howard-stearns
dc7d6d470d Don't reset head when we come back. 2016-05-25 12:21:50 -07:00
Stephen Birarda
66bdbf910d optionally include the metaverse session ID as an http header 2016-05-25 11:55:04 -07:00
howard-stearns
2accccef9e Merge branch 'reset-hud-on-driving' of https://github.com/howard-stearns/hifi into reset-hud-on-driving 2016-05-25 11:32:01 -07:00
howard-stearns
8198a1b4d1 Add preference to control behavior. 2016-05-25 11:30:45 -07:00
howard-stearns
5d806cba7f Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving 2016-05-25 10:47:31 -07:00
Brad Hefta-Gaub
fb9f6185db CR feedback 2016-05-24 17:19:53 -07:00
Brad Hefta-Gaub
183f38e4f0 pop up warning if domain over capacity 2016-05-24 16:07:57 -07:00
Brad Hefta-Gaub
2eef07e414 cleanup and dead code removal 2016-05-24 15:38:08 -07:00
Brad Hefta-Gaub
12a1857280 check point with protocol refusal working 2016-05-24 15:20:11 -07:00
Brad Hefta-Gaub
1cf8236860 Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck 2016-05-24 13:31:36 -07:00
Brad Hefta-Gaub
1d9981e624 first cut at support for verifying all protocol version compatibility 2016-05-24 13:31:19 -07:00
Brad Hefta-Gaub
f16a3ce6bb Merge pull request #7962 from zzmp/fix/throttle 
fix throttling when Interface is not in focus
 2016-05-24 08:25:38 -07:00
Zach Pomerantz
7dabce9cff Check throttle before idling/painting 2016-05-23 19:04:35 -07:00
Anthony J. Thibault
edfce0d5ba MyAvatar: reset fix, for both oculus and vive 2016-05-23 16:34:19 -07:00
Anthony J. Thibault
a1c32f8c44 Merge branch 'master' into tony/improved-avatar-mixer-precision 2016-05-23 10:24:52 -07:00
Seth Alves
40e862cf9e quiet gcc 5 warnings 2016-05-21 16:53:01 -07:00
Brad Hefta-Gaub
ac49feda22 Merge branch 'master' of https://github.com/highfidelity/hifi into removeDisableEntityNACKS 
Conflicts:
	libraries/entities/src/EntityEditPacketSender.h
 2016-05-21 09:23:45 -07:00
Seth Alves
f91a2403be merge from upstream 2016-05-20 17:07:34 -07:00
Brad Hefta-Gaub
18613908df Merge pull request #7800 from sethalves/no-fly-zones 
No fly zones
 2016-05-20 16:59:55 -07:00
howard-stearns
fa78eea434 Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving 2016-05-20 16:50:54 -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
Seth Alves
d95d3ff3ac clean up debugging prints 2016-05-20 14:56:47 -07:00
Brad Davis
07562f72af Doing a pass over the input plugins and controller code 2016-05-20 14:50:23 -07:00
Seth Alves
ff36b39067 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-20 14:38:53 -07:00
howard-stearns
dcc8764fa7 Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving 2016-05-20 13:41:41 -07:00
Brad Hefta-Gaub
770fab956f remove dead code 2016-05-20 12:23:06 -07:00
howard-stearns
1801e270af Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving 2016-05-20 09:26:25 -07:00
Zach Pomerantz
2026226fe2 Handle vsync without halving fps 2016-05-20 09:04:39 -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
Seth Alves
1de9598243 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-19 16:37:40 -07:00
Anthony J. Thibault
7f131e2c4f Reset avatar as well as displayPlugin when "driving" 2016-05-19 15:00:08 -07:00
Zach Pomerantz
9a4b30a50b Fix AvatarInputs phantom movement 2016-05-19 13:19:15 -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
Seth Alves
74520f5c92 Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones 2016-05-19 09:49:44 -07:00
Seth Alves
419c744bd4 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-19 09:49:18 -07:00
Anthony J. Thibault
0294066668 Removed pupilData and translationRadix from AvatarData packet. 2016-05-18 16:41:50 -07:00
Ryan Huffman
01944f5100 Remove unused DependencyManager include 2016-05-18 15:38:54 -07:00
Ryan Huffman
ce6ae40432 Replace foreach use with for() 2016-05-18 15:38:54 -07:00
Ryan Huffman
dd093e3fcd Make AccountManager a DependencyManager singleton 2016-05-18 15:38:54 -07:00
Ryan Huffman
cf49c8e2bf Add getUserAgent function that includes plugin information 2016-05-18 15:35:29 -07:00
Brad Hefta-Gaub
335d9abddd Merge pull request #7874 from AndrewMeadows/vertical-thrust 
allow MyAvatar.addThrust() to raise avatar from standing on ground
 2016-05-18 11:41:37 -07:00
Anthony J. Thibault
b48134e30c WIP commit testing for joint mapping transmission 2016-05-18 11:40:45 -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
Seth Alves
cf829f1bab magic number 2016-05-17 19:14:44 -07:00
Seth Alves
3380b2a668 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-17 19:10:33 -07:00
Ryan Huffman
47d897f669 Fix processOctreeStats recreating JurisdictionMap for every stat packet 2016-05-17 15:12:14 -07:00
Andrew Meadows
aa171578b7 remove cruft 2016-05-17 14:58:14 -07:00
Andrew Meadows
c64612c42b namechange keyboardMotor --> actionMotor 2016-05-17 14:46:50 -07:00
Andrew Meadows
e4cb6e2b87 order-independent CharacterController motors 2016-05-17 14:02:49 -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
34e574c148 Merge pull request #7816 from zzmp/perf/idle-event 
Drive render loop from DisplayPlugin instead of busy wait
 2016-05-17 09:36:09 -07:00
Brad Davis
5ba8372c21 Moving GL backend out of GPU 2016-05-16 12:54:17 -07:00
Seth Alves
a0c3224705 Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones 2016-05-16 10:56:09 -07:00
Brad Hefta-Gaub
06d1bd5728 Merge pull request #7799 from birarda/remove-avatar-billboard 
remove the last of the avatar billboard code
 2016-05-16 10:23:42 -07:00
Brad Hefta-Gaub
166fbdece5 Merge pull request #7853 from zzmp/fix/shutdown 
Fix hang on exit from dying scripts
 2016-05-16 10:17:34 -07:00
Seth Alves
3876a8037c Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-16 09:51:20 -07:00
Atlante45
38f74c1843 Remove the last of the glow level 2016-05-14 14:49:31 -07:00
Brad Hefta-Gaub
a5f99ba370 Merge pull request #7899 from sethalves/dont-send-file-urls-to-avatar-mixer 
fix invisible default avatars
 2016-05-14 07:48:16 -07:00
Brad Hefta-Gaub
0d5fdbdb6e Merge pull request #7879 from howard-stearns/fix-reticle-offset 
fix reticle position offset
 2016-05-13 17:17:23 -07:00
Seth Alves
6277bf8603 if avatar is set to the default avatar file that came with the distribution, don't save that url to settings. never send a file url to the avatar-mixer. 2016-05-13 16:37:43 -07:00
Zach Pomerantz
65e81077cb Merge branch 'master' of github.com:highfidelity/hifi into perf/idle-event 2016-05-13 16:24:42 -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
Brad Hefta-Gaub
65aae42714 move firstRun.set() to correct place 2016-05-13 13:28:02 -07:00
Seth Alves
eb19c5be13 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-13 07:04:58 -07:00
Stephen Birarda
2cf943b2b1 remove billboard code from AvatarData 2016-05-12 16:41:44 -07:00
howard-stearns
40f7212b1e Make uses of getReticlePosition consistent with respect to window offset. 2016-05-12 16:37:03 -07:00
Brad Davis
85272a87ba Merge pull request #7859 from samcake/lemon 
Introduce the "Unlit" shading model support and apply it to Web Enitities
 2016-05-12 15:09:50 -07:00
Seth Alves
c9c619916c Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones 2016-05-11 19:37:57 -07:00
Seth Alves
c784ca9771 debugging 2016-05-11 18:45:56 -07:00
Seth Alves
fcd2e45d67 merge from upstream 2016-05-11 18:45:32 -07:00
Zach Pomerantz
25deaf5bda Repost missed Presents with low priority 2016-05-11 18:27:48 -07:00
Anthony Thibault
8fecb51dde Merge pull request #7846 from hyperlogic/tony/improved-avatar-debug-draw 
Eye tracking bug fix and debug rendering improvements
 2016-05-11 17:41:49 -07:00
Brad Hefta-Gaub
d656f61c64 Merge pull request #7759 from jherico/app_plugin_type 
Don't expose raw pointer to the display plugin
 2016-05-11 14:49:22 -07:00
Seth Alves
ac506dc4b7 where needed, copy clientOnly into properties before calling queueEditEntityMessage 2016-05-11 12:46:16 -07:00
Brad Hefta-Gaub
e01681eb52 Merge pull request #7856 from ZappoMan/NUEtweaks 
don't show help or login on first run
 2016-05-11 10:53:09 -07:00
samcake
99dcfef5a8 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-05-11 10:47:38 -07:00
Seth Alves
9038647b65 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-11 09:07:44 -07:00
samcake
e40a795a27 Trying to clean up for pr 2016-05-10 19:25:22 -07:00
Seth Alves
872f1b0c64 clear avatarEntity data for entities that are deleted 2016-05-10 17:48:55 -07:00
Seth Alves
de12680ff1 don't put actions on other people's avatarEntities 2016-05-10 16:43:27 -07:00
Zach Pomerantz
2d4fd783bd Rename Paint/Idle events to Present 2016-05-10 16:09:04 -07:00
Seth Alves
b05ab1b17e set simulationOwner to be the same as the owningAvatar 2016-05-10 15:59:25 -07:00
Brad Hefta-Gaub
af6be7f5f3 Merge pull request #7845 from jherico/script_debug 
Enable script debugging
 2016-05-10 15:56:38 -07:00
Brad Hefta-Gaub
a17acc6f6b rename functions 2016-05-10 15:52:07 -07:00
Seth Alves
4b13fd969e split code that sends edits via avatar-mixer out of queueEditEntityMessage 2016-05-10 15:37:54 -07:00
Anthony J. Thibault
80a349c65b Merge branch 'master' into tony/improved-avatar-debug-draw 2016-05-10 14:50:13 -07:00
Seth Alves
1e849956c9 get rid of _avatarEntityChangedTime 2016-05-10 14:48:19 -07:00
Zach Pomerantz
4711c23d9d Delay AvatarInputs instantiation to first paint 2016-05-10 14:39:23 -07:00
Zach Pomerantz
783be53125 Trigger Idle from present Paint 2016-05-10 14:39:23 -07:00
Zach Pomerantz
c3f41cdd89 Add PAINT_DELAY_DEBUG log 2016-05-10 14:39:23 -07:00
Seth Alves
f90b9ec65d Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-10 12:08:45 -07:00
Brad Hefta-Gaub
350743454b Merge pull request #7839 from sethalves/entity-simulation-smart-pointers-1 
use smart pointers for entity simulations
 2016-05-10 11:35:57 -07:00
Brad Hefta-Gaub
33c5cb519a cleanup firstRun with a common setting 2016-05-10 11:32:29 -07:00
Clément Brisset
c3ce463b6c Merge pull request #7854 from zzmp/refactor/delayLoad 
Clean up resource cache's encapsulation of asynchronous loading
 2016-05-10 10:47:23 -07:00
Brad Hefta-Gaub
22f4beab1a on first run, go to home or entry 2016-05-10 10:45:57 -07:00
Seth Alves
c572e1dc3a delete avatar-associated entities when the avatar goes away 2016-05-10 10:30:49 -07:00
Seth Alves
4c1f815870 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-10 10:09:40 -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
Brad Hefta-Gaub
e478b72e67 Merge branch 'master' of https://github.com/highfidelity/hifi into NUEtweaks 2016-05-10 08:36:32 -07:00
Seth Alves
b761ecf44f merge from upstream 2016-05-10 08:18:45 -07:00
Brad Hefta-Gaub
466b535e4e Merge pull request #7852 from ZappoMan/fixUpdateDialogFormatting 
fix the update dialog to not show blank lines for missing version numbers
 2016-05-10 08:18:38 -07:00
Brad Hefta-Gaub
20b7e5f0a9 Merge pull request #7851 from Atlante45/remove-deadlock-status 
Remove Deadlock status
 2016-05-10 07:53:50 -07:00
Brad Hefta-Gaub
8b51746788 don't show help or login on first run 2016-05-09 18:49:29 -07:00
Zach Pomerantz
9ac783a88d Black box asynch resource retrieval 2016-05-09 18:03:19 -07:00
Zach Pomerantz
2d820221dc Clear queued processing on quit 2016-05-09 17:32:25 -07:00
Zach Pomerantz
694dc1bbf6 Delay Overlays cleanup for scripting 2016-05-09 17:32:25 -07:00
Brad Davis
40316498a4 Enable script debugging 2016-05-09 17:02:40 -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
Atlante45
5c196f3df5 Remove Deadlock status 2016-05-09 15:53:45 -07:00
Andrew Meadows
59c6a6dfea Merge pull request #7825 from sethalves/linux-qol 
Linux qol
 2016-05-09 15:34:10 -07:00
Andrew Meadows
ffc3123467 Merge pull request #7658 from sethalves/grab-fixes 
Grab fixes
 2016-05-09 15:30:37 -07:00
Brad Hefta-Gaub
2c0204b0d6 Merge pull request #7821 from Atlante45/fix/collision-sound 
Fix avatar/entity collision sound
 2016-05-09 14:24:19 -07:00
Anthony Thibault
87d513b5f8 fixed unused variable warnings 2016-05-08 18:14:18 -07:00
Anthony J. Thibault
641e152699 Eye tracking bug fix and debug rendering improvement 
* Bug fix for eye tracking in HMD, the "up" orientation of your eyes now match your head.
* DebugDraw: added drawRay method.
* Application: Renamed preRender to postUpdate
* AvatarManager: added postUpdate method that iterates over all avatars.
* MyAvatar: Renamed preRender to preDisplaySide
* MyAvatar: split preRender code into postUpdate and preDisplaySide.
* Removed "Show who is looking at me", "Render focus indicator" and "Render lookat target" debug draw.
* Split "Show Look At Vectors" into "Show My Look At Vectors" and "Show Other Look At Vectors", to make it easier to debug eye tracking.
* "Show Look at Vectors" now draws the right eye red and the left eye blue.
* Removed Avatar and MyAvatar renderBody
* Removed look at rendering from head.
* GLMHelpers: Bugfix for generateBasisVectors when up primary and secondary axis were orthogonal
 2016-05-08 16:20:32 -07:00
Brad Davis
c54d0bc993 Don't expose raw pointer to the display plugin 2016-05-08 10:35:31 -07:00
Seth Alves
0e6d9a1eec avatar mixer can relay "client-only" entities between interfaces -- the entity server wont know about them. 2016-05-07 14:48:31 -07:00
Seth Alves
f8f86a0d45 only _exit if not DEBUG 2016-05-07 11:05:38 -07:00
Seth Alves
4b1274cb0f Merge branch 'master' of github.com:highfidelity/hifi into linux-qol 2016-05-07 11:04:50 -07:00
Seth Alves
a0771f8ee5 use smart pointers for entity simulations 2016-05-07 09:14:33 -07:00
Clément Brisset
b234d94d25 Merge pull request #7832 from birarda/session-location 
repairs to user heartbeats
 2016-05-06 15:15:52 -07:00
Chris Collins
8eb61e9470 Merge pull request #7820 from imgntn/usersJS 
Add users.js to default, start visible to friends only
 2016-05-06 16:07:23 -06:00
Stephen Birarda
fb09efc0c9 send location updates immediately on mode change and startup 2016-05-06 12:01:03 -07:00
Stephen Birarda
258c5308db don't require an active domain connection for location update 2016-05-06 11:57:25 -07:00
Stephen Birarda
ed1ddc2a8b remove code to update/store wallet balance 2016-05-06 11:54:49 -07:00
Stephen Birarda
7dd8515bd8 send a simple heartbeat if location has not changed 2016-05-06 11:50:40 -07:00
Seth Alves
71738d4841 Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes 2016-05-06 09:59:17 -07:00
Andrew Meadows
778820edb4 fix broken dupe method implementation 2016-05-06 09:07:03 -07:00
Andrew Meadows
635e2e78e3 minor cleanup 2016-05-05 18:43:08 -07:00
Andrew Meadows
7d6424bdcc Head::render() was cruft 2016-05-05 18:28:27 -07:00
Andrew Meadows
71b2d647e8 add locks and explicitly copy ViewFrustums 2016-05-05 18:28:27 -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
Andrew Meadows
60a72c6660 getViewFrustum() provides const pointer 2016-05-05 18:28:27 -07:00
Stephen Birarda
a5d09e268d fix sessionID pull and re-sent for HB 2016-05-05 15:56:16 -07:00
Seth Alves
b5a3baf322 Merge branch 'master' of github.com:highfidelity/hifi into linux-qol 2016-05-05 15:55:37 -07:00
Stephen Birarda
839c7fb8c2 provide session ID for metaverse heartbeat once received 2016-05-05 15:45:11 -07:00
Stephen Birarda
0ea46cb415 send fallback socket, don't send HB if send usage disabled 2016-05-05 15:35:37 -07:00
Atlante45
bc6544a3c5 Fix MyAvatar's velocity change 2016-05-05 14:55:28 -07:00
Atlante45
07adef9465 Fix entities collision sounds 2016-05-05 14:55:28 -07:00
Atlante45
96ee33e80e Fix avatars collision sounds 2016-05-05 14:55:28 -07:00
James B. Pollack
67b1015f4a re add users to default, default to visible friends only 2016-05-05 14:54:04 -07:00
Zach Pomerantz
3619821b82 Improve timing tests with averages 2016-05-04 13:23:10 -07:00
Zach Pomerantz
0f6162d683 Use appropriate units for timing tests 2016-05-04 13:23:10 -07:00
Seth Alves
44beca1687 try having all spring derived actions agree on a target 2016-05-04 11:29:17 -07:00
Brad Hefta-Gaub
49d02b802a Merge pull request #7719 from zzmp/feat/resource-prefetch 
Add prefetching to exposed caches
 2016-05-02 18:04:26 -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
Seth Alves
5fd871d640 Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones 2016-05-02 10:28:53 -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
Seth Alves
4feb2944ed hook up zone's ghostingAllowed flag 2016-05-01 15:27:49 -07:00
Seth Alves
ef85cc7803 hook up zone flyingAllowed flag to character controller 2016-05-01 14:47:12 -07:00
Zach Pomerantz
13945aa4d9 Annotate all virtual fns with override 2016-04-30 13:48:59 -07:00
Andrew Meadows
5f98af1898 avoid crossed eyes 2016-04-27 16:58:13 -07:00
Andrew Meadows
8a691cf449 Merge pull request #7765 from hyperlogic/tony/cone-sphere-angle 
Improve eye tracking when face to face
 2016-04-27 16:54:07 -07:00
Zach Pomerantz
bc8a171fde Merge branch 'master' of github.com:highfidelity/hifi into feat/resource-prefetch 2016-04-27 11:55:24 -07:00
Brad Hefta-Gaub
db6a07171f Merge pull request #7764 from zzmp/fix/text3d-pipeline 
Fix strange rendering with Text3DOverlay
 2016-04-26 17:15:09 -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
Anthony J. Thibault
71f67c99cc MyAvatar: use coneSphereAngle for eyeTracking look at targets 2016-04-26 13:43:03 -07:00
Zach Pomerantz
63b0c0a9ad Reset pipeline after rendering text3d 2016-04-26 13:23:16 -07:00
David Rowe
7406e5fd9c Add Navigate > Set Home Location menu item 2016-04-27 07:57:43 +12:00
Brad Hefta-Gaub
ee277dcf9d Merge branch 'master' of https://github.com/highfidelity/hifi into qmlWindowFixes 2016-04-26 11:44:51 -07:00
Brad Hefta-Gaub
cf49ba26ad Merge pull request #7760 from hyperlogic/tony/away-reset-avatar 
Reset avatar on exit of away-mode.
 2016-04-26 09:51:47 -07:00
Brad Hefta-Gaub
4ab7b660d4 fix a bunch of bugs in qml window placement 2016-04-25 20:19:54 -07:00
Anthony J. Thibault
b7f157f4ff Reset avatar on exit of away-mode. 
Exposed MyAvatar.reset(bool) to script.
away.js now calls this on exit of away-mode.
 2016-04-25 14:10:20 -07:00
Clément Brisset
d74b5bdb17 Merge pull request #7756 from sethalves/add-missing-delete 
fix memory leak in AssetMappingModel
 2016-04-25 12:56:26 -07:00
Anthony Thibault
6dfd174285 Merge pull request #7750 from hyperlogic/tony/thousand-yard-stare 
Avatar eye gaze fix for HMDs
 2016-04-25 10:29:41 -07:00
Seth Alves
49566c8f26 fix memory leak in AssetMappingModel 2016-04-25 10:07:08 -07:00
Anthony J. Thibault
0c200e8c00 MyAvatar: coding convention fix for updateEyeContactTarget() 2016-04-25 09:27:43 -07:00
Anthony Thibault
0da3fb8eee Eye contact improvements 
* After eyes change targets there is now a minimum 1/3rd second delay before they will again.
* Changing gaze from eye to mouth is less likely then switching between eyes.
 2016-04-24 18:50:14 -07:00
Anthony Thibault
d8a32c8329 Avatar eye gaze fix for HMDs 
When no avatars are chosen for more detailed eye gaze tracking the eyes should look straight ahead.
Before this fix, if you were in room scale or not aligned with the camera sensor your gaze could drift to the left or to the right of your head's forward direction.
Now it should follow your head more closely.
 2016-04-24 17:59:51 -07:00
Seth Alves
2425baf6e6 don't early _exit on Linux 2016-04-24 08:14:56 -07:00
Brad Hefta-Gaub
88ab52d340 Merge pull request #7747 from hyperlogic/tony/avatar-look-at-fixes 
Fixes for avatar eye tracking.
 2016-04-23 17:04:15 -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
Anthony J. Thibault
c850880515 Head: compute _eyePosition properly. 2016-04-22 19:16:28 -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
79a1e6264e Merge pull request #7714 from hyperlogic/tony/default-anims-are-local 
Avatar animations are now stored locally
 2016-04-22 13:44:30 -07:00
Brad Hefta-Gaub
c410242fb2 Merge pull request #7688 from jherico/texture_derez 
Reducing GPU texture memory footprint
 2016-04-22 13:20:54 -07:00
Andrew Meadows
c35ddccba1 Merge pull request #7718 from zzmp/fix/release-motion-states 
Remove myAvatar motion states on shutdown
 2016-04-21 17:11:25 -07:00
Brad Hefta-Gaub
72c81e2378 Merge branch 'master' of https://github.com/highfidelity/hifi into supportLargeClockSkew 2016-04-21 16:26:44 -07:00
Brad Hefta-Gaub
d87d631871 Merge pull request #7708 from zzmp/feat/render-rates 
Add renderRates.js to visualize rates over time
 2016-04-21 15:59:58 -07:00
Brad Hefta-Gaub
d9ae788818 more CR feedback 2016-04-21 15:55:50 -07:00
Brad Davis
6c30194916 Support lowering the minimum mip of a texture at runtime 2016-04-21 14:46:12 -07:00
Brad Hefta-Gaub
ddf5b0f316 some debugging 2016-04-21 10:32:22 -07:00
Zach Pomerantz
e3131d2098 Rm prefetchAnimation from avatar/rig 2016-04-20 20:14:15 -07:00
Brad Hefta-Gaub
31f9d592e0 support for larger than 35 minute clock skew 2016-04-20 18:42:00 -07:00
Zach Pomerantz
2c7cf3ea83 Fix RateScriptingInterface headers 2016-04-20 14:32:25 -07:00
Zach Pomerantz
ad225b3aed Fix RatesScriptingInterface ctor 2016-04-20 13:58:06 -07:00
Zach Pomerantz
1fe12e7029 Mv Rates to RatesScriptingInterface.h 2016-04-20 13:26:23 -07:00
Anthony J. Thibault
8e5785cdf8 Avatar animations are now stored locally 
Improves FTUE, by no longer going over the network to download default avatar animations.
This also includes support for relative animation urls within the animation.json
 2016-04-19 16:11:14 -07:00
Zach Pomerantz
4dacb04ee1 Rm myAvatar motion states on shutdown 2016-04-19 16:01:55 -07:00
Howard Stearns
cbb76013c4 Merge pull request #7710 from ZappoMan/LODtweaks 
tweaks to LOD behavior
 2016-04-19 13:50:21 -07:00
samcake
3dad4f576e Merging with master 2016-04-19 11:59:44 -07:00
Brad Hefta-Gaub
c7ecbb6b4b tweaks to LOD behavior 2016-04-19 11:19:28 -07:00
Howard Stearns
9ff9682b2a Merge pull request #7692 from ZappoMan/resetScriptEngineOnDomainChange 
Reset entities script engine on domain change
 2016-04-19 11:14:28 -07:00
samcake
a997f9bb1b Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-04-19 10:49:53 -07:00
Zach Pomerantz
fc61f85bf9 Merge pull request #7698 from hyperlogic/tony/avatar-on-load-complete-callback 
Added MyAvatar onLoadComplete Callback
 2016-04-19 10:36:20 -07:00
samcake
265f6f1275 Updating & Merging with master 2016-04-19 10:05:44 -07:00
Brad Hefta-Gaub
8eff47f922 Merge pull request #7705 from hyperlogic/tony/avatar-attachment-lag-fix 
Fix for laggy avatar attachments
 2016-04-19 07:15:38 -07:00
Brad Hefta-Gaub
0ac9601ea7 Merge pull request #7690 from ZappoMan/improveHMD 
Introduce "recommended overlay rectangle" to display plugins
 2016-04-18 18:04:21 -07:00
Brad Hefta-Gaub
0a79b5dd69 Merge pull request #7707 from huffman/fix/osx-default-script-dir 
Remove fix for old QT file path bug in OSX
 2016-04-18 18:01:47 -07:00
Brad Hefta-Gaub
0e9bd9a776 Merge pull request #7682 from zzmp/clean/stars 
Cleanup stars to persist a single BufferView
 2016-04-18 17:59:48 -07:00
Zach Pomerantz
f48541961d Expose Rates to JS/QML 2016-04-18 17:43:34 -07:00
Ryan Huffman
4e0ac2a4be Remove fix for old QT file path bug in OSX 2016-04-18 16:07:53 -07:00
Brad Hefta-Gaub
01907f181f Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD 2016-04-18 16:01:42 -07:00
Seth Alves
3298883774 Merge pull request #7702 from zzmp/fix/clear-octree-on-exit 
Clear entities and avatars on exit
 2016-04-18 15:48:35 -07:00
Anthony J. Thibault
279e77f523 updated comment 2016-04-18 15:18:08 -07:00
samcake
dccf549118 Merge pull request #7676 from jherico/perf_testing 
Manually generate mipmaps for textures while loading
 2016-04-18 15:09:12 -07:00
Zach Pomerantz
146ea066db Update AvatarManager.cpp 2016-04-18 14:53:04 -07:00
Anthony J. Thibault
544928b46e MyAvatar: fix for laggy avatar attachments 2016-04-18 14:51:33 -07:00
Zach Pomerantz
c9dc642d76 Fix type in AvatarManager::clearAllAvatars 2016-04-18 14:48:24 -07:00
Zach Pomerantz
c87eec4182 Fix typo in AvatarManager::clearAllAvatars 2016-04-18 14:45:33 -07:00
Zach Pomerantz
790e325248 Clear entities and avatars on exit 2016-04-18 14:31:16 -07:00
Anthony J. Thibault
dc92ccc2b2 MyAvatar: Removed unnecessary slot. 2016-04-18 13:19:49 -07:00
Brad Hefta-Gaub
374ba10524 more CR feedback 2016-04-18 12:23:36 -07:00
Brad Hefta-Gaub
0d20f2468e CR feedback 2016-04-18 12:13:21 -07:00
Anthony J. Thibault
1682598be7 Added onLoadComplete signal to MyAvatar 
This can be used in javaScript to detect when the model has finished loading because the url has changed or the model has been reset.
 2016-04-18 11:37:02 -07:00
Brad Hefta-Gaub
0520363da8 cleanup 2016-04-18 10:37:15 -07:00
Brad Hefta-Gaub
d1f6b371c9 cleanup 2016-04-18 10:27:12 -07:00
Brad Davis
b50f835d35 Warning and error fixes 2016-04-17 10:22:26 -07:00
Brad Davis
f3e5306f90 Working on an automated performance test 2016-04-17 10:20:00 -07:00
Brad Hefta-Gaub
8f3d48190a switch to QRect instead of vec4 2016-04-16 16:59:47 -07:00
Brad Hefta-Gaub
6b5fd1e807 code review feedback 2016-04-16 16:11:36 -07:00
Brad Hefta-Gaub
54777c9cd5 Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD 2016-04-16 15:19:35 -07:00
Brad Hefta-Gaub
87078b1ea2 first cut at resetting entities script engine on domain change 2016-04-16 11:09:23 -07:00
David Rowe
8f6cfb72ea Fix QML warnings at shutdown 2016-04-16 15:23:41 +12:00
Brad Hefta-Gaub
04df84974c handle repositioning of qml windows 2016-04-15 19:50:12 -07:00
Zach Pomerantz
d96c97cdb4 Cleanup stars to persist BufferView 2016-04-15 16:40:02 -07:00
samcake
298300e42f Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-04-15 14:16:02 -07:00
Brad Hefta-Gaub
c7f58dc17c first cut at exposing recommend overlay rectangle 2016-04-14 20:47:31 -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
Brad Hefta-Gaub
ea4da05cba Merge pull request #7643 from AndrewMeadows/faster-bullet 
faster Bullet kinematics
 2016-04-14 12:16:54 -07:00
Brad Hefta-Gaub
c9b0531f55 Merge pull request #7662 from zzmp/fix/model-anim-cache 
Use AnimationCache for models
 2016-04-14 12:16:32 -07:00
Andrew Meadows
dcf28937cf cleanup cached Physics::sessionUUID 2016-04-14 11:18:10 -07:00
Zach Pomerantz
e80898f095 Merge branch 'master' of github.com:highfidelity/hifi into fix/model-anim-cache 2016-04-14 10:12:16 -07:00
Ryan Huffman
e76ed6f73a Merge branch 'master' of https://github.com/highfidelity/hifi into feat/crash-handling 2016-04-14 09:47:03 -07:00
Brad Hefta-Gaub
7b5075cce5 Merge pull request #7645 from sethalves/dont-run-bullet-too-soon 
add a heuristic for deciding when it's safe to enable bullet
 2016-04-14 09:35:58 -07:00
Brad Hefta-Gaub
285ebe8ec5 Merge pull request #7655 from sethalves/dont-spam-about-expired-actions 
don't flood log with messages about expired actions
 2016-04-14 09:32:56 -07:00
Brad Hefta-Gaub
623bfa3c35 Merge pull request #7653 from hyperlogic/tony/avatar-meta-item-bound-fix 
Fix for occasional invisible avatars
 2016-04-14 09:32:46 -07:00
Brad Hefta-Gaub
37dcfdad8a Merge pull request #7652 from huffman/feat/crash-menu 
Move crash menu items to submenu and add new crash types
 2016-04-14 09:32:36 -07:00
Seth Alves
ba0549dddd Merge branch 'master' of github.com:highfidelity/hifi into dont-run-bullet-too-soon 2016-04-14 09:18:58 -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
Chris Collins
47522e1774 Merge pull request #7659 from ZappoMan/newLODSettings 
improve reset settings
 2016-04-13 16:49:22 -07:00
Zach Pomerantz
7a15339631 Use AnimationCache for models 2016-04-13 15:44:47 -07:00
Ryan Huffman
47c2a1722b Merge branch 'master' of https://github.com/highfidelity/hifi into feat/crash-menu 2016-04-13 14:40:46 -07:00
Ryan Huffman
bc247ec058 Remove unused Application::crashApplication() 2016-04-13 14:01:41 -07:00
Howard Stearns
f24c2c7714 Merge pull request #7657 from ZappoMan/avatarLicenseSupport 
add support for avatar licenses in FST files
 2016-04-13 14:01:37 -07:00
Brad Hefta-Gaub
0af47fd3d5 Merge pull request #7617 from jherico/vr_menu 
VR menu fixes
 2016-04-13 13:53:36 -07:00
Brad Hefta-Gaub
9c437c0824 CR feedback 2016-04-13 13:36:28 -07:00
Brad Hefta-Gaub
67af3917bc improve reset settings 2016-04-13 13:18:23 -07:00
Brad Hefta-Gaub
4b3b917af6 add support for avatar licenses in FST files 2016-04-13 12:26:09 -07:00
Ryan Huffman
2d39551a35 Fix style in CrashReporter.cpp 2016-04-13 10:56:27 -07:00
Ryan Huffman
fa49c213cc Add threaded crashes 2016-04-13 10:24:56 -07:00
Seth Alves
3288bff963 don't flood log with messages about expired actions. also, try to remove such actions 2016-04-13 09:47:07 -07:00
Brad Hefta-Gaub
93f8cfc80a new default LOD settings, and support for reset settings without crashing 2016-04-13 09:26:01 -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
Anthony J. Thibault
97f836d3bb Avatar: fix for avatar meta item bound. 
* In the case where a SkeletonModel was renderable, but had not actually
  created the render items yet, don't use the the rendererableMeshBound
  for the meta render item, because it hasn't been computed yet!  Instead
  wait until the render items have been added to the scene before using
  the more accurate bound...
 2016-04-12 17:32:49 -07:00
Ryan Huffman
0c1277ae7a Add CrashHelpers.h and add to separate submenu 2016-04-12 16:44:11 -07:00
Seth Alves
688de6f100 quiet warning 2016-04-12 14:10:14 -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
Seth Alves
e4c91e5064 add a heuristic for deciding when it's safe to enable bullet 2016-04-12 11:46:00 -07:00
Brad Davis
3349093908 Fix vr menu login item update 2016-04-12 11:15:06 -07:00
Brad Hefta-Gaub
83494c4a96 Merge pull request #7594 from huffman/feat/include-rolled-logs-bugsplat 
Add rolled log files to BugSplat
 2016-04-12 08:33:17 -07:00
Brad Hefta-Gaub
3f05ded932 Merge pull request #7611 from zzmp/guard/amd 
Disable gradient QML items on AMD
 2016-04-12 08:32:57 -07:00
Brad Hefta-Gaub
a1fe6aee6d Merge pull request #7625 from hyperlogic/tony/third-person-hmd-camera-improvements 
Improve comfort of third-person HMD camera.
 2016-04-12 08:32:23 -07:00
Brad Hefta-Gaub
c5840f217a Merge pull request #7630 from jherico/fps_fix 
Fix FPS counter
 2016-04-12 08:31:58 -07:00
Ryan Huffman
2dfe96a654 Cleanup headers 2016-04-11 14:50:28 -07:00
Ryan Huffman
afe502e1d2 Fix typo 2016-04-11 14:43:05 -07:00
Ryan Huffman
02a17c4497 Fix commented out code 2016-04-11 14:38:29 -07:00
Ryan Huffman
9faeb13ae9 Remove error testing code 2016-04-11 14:38:19 -07:00
Ryan Huffman
63aee23bf1 Move crash testing to CrashHelpers.h 2016-04-11 14:29:16 -07:00
Ryan Huffman
316d533d19 Update crash reporting to cover a larger area 2016-04-11 13:50:42 -07:00
Zach Pomerantz
ab72d8d8fb Init QML GL from share context 2016-04-11 13:47:45 -07:00
Brad Davis
df8ad57185 Fix FPS counter 2016-04-11 00:25:16 -07:00
Anthony J. Thibault
93a5bdd79a Prevent avatar rotation due to HMD head turning in third-person camera. 
Also, fix one frame glitch during snap turning, by updating the sensorToWorld matrix
after the MyAvatar::updateOrientation rotates the avatar, but before we perform IK.
 2016-04-08 15:27:43 -07:00
Anthony J. Thibault
711a1b8c7d Avatar: update renderItems when avatar position or render mesh is in the frustum. 
Previously, when render mesh was visible the renderItems they were not updated with the latest avatar mixer joints rotations and position.
This would result in a frozen avatar being visible.

Now the renderItems are updated when the render mesh is in the frustum or the bounding sphere around the avatar position is visible.
 2016-04-08 13:14:50 -07:00
Ryan Huffman
6232c82f66 Update BugSplat to only send first and last log files 2016-04-08 09:39:25 -07:00
Ryan Huffman
2d60a9a51e Reduce log size limit from 1MB to 512KB 2016-04-08 09:39:08 -07:00
Zach Pomerantz
e08c9db469 Expose GL property to QML 2016-04-07 18:27:07 -07:00
Brad Hefta-Gaub
5287c174b4 Merge pull request #7605 from jherico/route_log_errors 
Fixing logging errors on initial load of controller routes
 2016-04-07 17:13:13 -07:00
Brad Hefta-Gaub
3d94558d6b Merge pull request #7589 from jherico/oculus_input 
Support oculus remote input
 2016-04-07 15:05:45 -07:00
Brad Hefta-Gaub
157dd96303 Merge pull request #7612 from ZappoMan/mirrorReturnsToLastView 
when using the fullscreen mirror hot key, return to the view mode you were in when leaving full screen mirror
 2016-04-07 14:56:53 -07:00
Brad Davis
72d8990fed Fix menu launch from Oculus remote 2016-04-07 14:13:02 -07:00
Brad Hefta-Gaub
d1a2a30c02 fix build buster 2016-04-07 13:41:05 -07:00
Brad Hefta-Gaub
09004680d0 handle a couple edge cases 2016-04-07 13:32:26 -07:00
Brad Hefta-Gaub
81bb5ff07d when using the fullscreen mirror hot key, return to the view mode you were in when leaving full screen mirror 2016-04-07 13:13:19 -07:00
Brad Hefta-Gaub
bd1eb5842a fix crash related to menu vs watchdog create order 2016-04-07 12:45:24 -07:00
Brad Davis
85019b2b5e Fixing logging errors on initial load of controller routes 2016-04-07 10:41:54 -07:00
Brad Hefta-Gaub
2c3aeddbe4 reduce log spam for the deadlock watchdog 2016-04-07 10:25:08 -07:00
Brad Hefta-Gaub
e78b202433 Merge pull request #7602 from ZappoMan/default1PView 
default to first person view
 2016-04-07 09:16:04 -07:00
Brad Hefta-Gaub
5f4d6ca1d3 CR feedback 2016-04-06 19:07:26 -07:00
Brad Hefta-Gaub
47aed9c8bd fix redraw issue when logging in to or out of a domain 2016-04-06 14:56:20 -07:00
Brad Hefta-Gaub
1f708ccb57 default to first person view 2016-04-06 13:35:08 -07:00
Brad Hefta-Gaub
2ee5b45ca6 Merge pull request #7583 from zzmp/log/bookmarks-exists 
Do not warn if no bookmarks file
 2016-04-06 11:20:06 -07:00
Ryan Huffman
5fb898de74 Add rolled log files to BugSplat 2016-04-06 10:14:12 -07:00
Brad Hefta-Gaub
51660ab3a8 Merge pull request #7579 from sethalves/log-about-webengine-remote-debugging 
Log about webengine remote debugging
 2016-04-06 08:28:37 -07:00
Brad Hefta-Gaub
699c717828 Merge pull request #7580 from hyperlogic/tony/keyboard-focus-on-web-entity-fix 
Application: focusOut keyboard device when clicking on web entity.
 2016-04-05 18:44:30 -07:00
Brad Hefta-Gaub
70f3a39463 Merge pull request #7593 from hyperlogic/tony/keyboard-focus-improvements 
Application: change keyboard input focus when using ui overlay.
 2016-04-05 18:44:16 -07:00
Anthony J. Thibault
07ff687bfe Application: change keyboard input focus when using ui overlay. 
call focusOutEvent on keyboard input plugin when an offscreen ui has activeFocus.
 2016-04-05 18:12:02 -07:00
Brad Hefta-Gaub
891cc12d3f Merge pull request #7549 from zzmp/feat/resource-vis 
Add a visualization of cacheable resource usage
 2016-04-05 15:43:27 -07:00
Zach Pomerantz
cba866b375 Do not warn if no bookmarks file 2016-04-05 14:59:57 -07:00
Seth Alves
bda8761e00 fix how env variable is accessed 2016-04-05 14:30:41 -07:00
Seth Alves
f42e968dda commit to repush to see if github is working yet 2016-04-05 14:12:46 -07:00
Anthony J. Thibault
4c632cb4c4 Application: focusOut keyboard device when clicking on web entity. 2016-04-05 14:00:43 -07:00
Seth Alves
d8282ae799 log value of QTWEBENGINE_REMOTE_DEBUGGING before exit 2016-04-05 13:56:39 -07:00
Brad Hefta-Gaub
08a19c0471 Merge pull request #7554 from jherico/load_stutter2 
Addressing stuttering in the frame while loading content - Part 2
 2016-04-05 09:45:31 -07:00
Brad Davis
e86066c1ce Merge pull request #7563 from hyperlogic/tony/jittery-hands-fix 
Application: fix for jittery hands when moving.
 2016-04-04 15:58:22 -07:00
Brad Hefta-Gaub
04471f1c88 Merge branch 'master' of https://github.com/highfidelity/hifi into simpleTestPR 
Conflicts:
	interface/src/Application.cpp
 2016-04-04 13:16:39 -07:00
Brad Hefta-Gaub
b3b5c5d1ea small change to trigger a build 2016-04-04 13:14:52 -07:00
Anthony J. Thibault
d7b13d226f Application: fix for jittery hands when moving. 
The issue was that the hands are sampled in sensor coordinates.
But when the avatar is moved via physics, the sensor to world matrix
must be updated to move the hands in the world by the correct amount.
These new hand positions are then computed before IK is performed.
 2016-04-04 12:36:18 -07:00
Triplelexx
a4775983a2 Merge branch 'master' into 20769 
# Conflicts:
# interface/src/Application.cpp

conflicting line 2528 wheelEvent is now const
 2016-04-04 19:19:55 +01:00
Brad Davis
d98abbc7df First pass at threaded texture transfers 2016-04-04 10:23:01 -07:00
Thijs Wenker
2be4097bc5 another 3.1.2.1 rollback 2016-04-04 17:36:43 +02:00
Thijs Wenker
142f37da1c fix accidentally violated style rule 3.1.2.1 2016-04-04 17:33:47 +02:00
Thijs Wenker
b2058376ba used "ReSharper C++" to fix some style and spelling in Application.(h|cpp) 2016-04-04 17:03:05 +02:00
Triplelexx
fb242be50f resolved merge conflict 
got to stick to command line, this should have been added with add
command at merge....
 2016-04-03 22:59:48 +01:00
Triplelexx
11af0a421b Merge branch 'master' into 20769 2016-04-03 22:57:55 +01:00
Brad Hefta-Gaub
ecaaa34576 Merge pull request #7547 from howard-stearns/lock-trees-on-import-export 
Lock trees on import export
 2016-04-03 14:23:54 -07:00
Anthony Thibault
d899d7d696 Merge pull request #7530 from hyperlogic/tony/culling-fixes 
Culling fixes
 2016-04-01 21:29:34 -07:00
Zach Pomerantz
5b9198ed3d Expose tex/model cache to js/qml 2016-04-01 19:52:43 -07:00
Seth Alves
5fa9f662fc Merge pull request #7542 from birarda/refresh-on-asset-connect 
refresh/close the asset browser dialog on domain switch
 2016-04-01 18:08:59 -07:00
Zach Pomerantz
d72c695417 Sanitize ResourceCache to expose to JS/QML 
fix sanitize
 2016-04-01 17:42:36 -07:00
howard-stearns
b5cbd7720e Lock entity tree on export, and clipboard on import. 2016-04-01 14:56:56 -07:00
Brad Hefta-Gaub
5f710782eb Merge pull request #7528 from howard-stearns/fbx-reader-safety 
Fbx reader safety
 2016-04-01 13:34:17 -07:00
Brad Hefta-Gaub
270a9b0483 Merge pull request #7534 from hyperlogic/tony/only-update-model-on-main-thread 
Application: don't call Model::simulate on network thread.
 2016-04-01 13:05:54 -07:00
Stephen Birarda
309d327a37 change My Asset Server to Asset Browser in Menu 2016-04-01 13:02:26 -07:00
Stephen Birarda
ee7bee95f8 use nodeActivated to trigger refresh of Asset Browser 2016-04-01 11:35:33 -07:00
Stephen Birarda
459cbebcee don't show the My Asset Server option beside Reload All Content 2016-04-01 11:15:32 -07:00
Stephen Birarda
194226103c refresh the Asset Browser when switching domains 2016-04-01 11:13:59 -07:00
Anthony J. Thibault
5e81cccc6c Merge branch 'master' into tony/culling-fixes 2016-04-01 09:29:46 -07:00
Brad Hefta-Gaub
5a665f9aef Merge pull request #7482 from huffman/extra-logging 
Add system information to log file
 2016-04-01 09:10:21 -07:00
Anthony J. Thibault
3d43f73a88 Application: don't call Model::simulate on network thread. 
This can cause a crash.

On startup the Application::processOctreeStats method on the network thread will call into entities entity->isReadyToComputeShape() (without a tree lock) and trigger Model::simulate.  Model is NOT thread safe.  This was leading to a single model to be initialized on two threads simultaneously.

This might be somewhat rare, I only caught it because I was running a debug build.
 2016-03-31 17:57:20 -07:00
Anthony J. Thibault
bc967f0ab0 Model: update renderItems when items are added to the scene. 
* Renamed enqueueLocationChange to updateRenderItems
* Call updateRenderItems when models are added to the scene.

This will fix entity render bounds being incorrect when they are first added to the scene,
then later being correct after a position update.

* Renamed getMeshPartBound to getRenderableMeshBound.
* Avatar now uses getRenderableMeshBound() to do boundingRadius vs frustum check.
* Model::getRenderableMeshBound now returns a more accurate bound, because it is the same one used for rendering.

This will fix avatar freezing, when they are in the corner of your frustum.
This was due to matrices not being updated because the avatar had to a small bounding sphere.
 2016-03-31 14:59:27 -07:00
Brad Davis
97e96f7b67 PR comments 2016-03-31 13:19:26 -07:00
howard-stearns
1df9a57e58 Merge branch 'master' of https://github.com/highfidelity/hifi into fbx-reader-safety 2016-03-31 10:56:55 -07:00
Andrew Meadows
74633ca8c8 Merge pull request #7522 from ZappoMan/optimizeFindZones 
optimize checkEnterLeaveEntities() to do distance check and stationary checks less frequently
 2016-03-31 10:14:32 -07:00
howard-stearns
258ffbc8ac Merge branch 'master' of https://github.com/highfidelity/hifi into fbx-reader-safety 2016-03-31 10:08:01 -07:00
Brad Hefta-Gaub
a7f93aa75c Merge pull request #7519 from zzmp/fix/avatar-crash 
Fix crash from updating/resetting avatar
 2016-03-30 21:31:17 -07:00
Brad Hefta-Gaub
b76f8509aa Merge branch 'master' of https://github.com/highfidelity/hifi into optimizeFindZones 2016-03-30 19:29:28 -07:00
Brad Hefta-Gaub
28978c8adb optimize checkEnterLeaveEntities() to do distance check and stationary checks less frequently 2016-03-30 17:49:30 -07:00
Brad Hefta-Gaub
f0cc8c0dd3 Merge pull request #7491 from jherico/oculus_release 
Update to latest Oculus SDK, add input device support
 2016-03-30 17:42:32 -07:00
howard-stearns
51a4154ae7 Check results of qUncompress, and catch fbx reader throws in utility 
programs.
 2016-03-30 16:56:39 -07:00
Brad Hefta-Gaub
4a1e82892a Merge pull request #7494 from sethalves/use-local-scripts 
Use local scripts
 2016-03-30 15:46:32 -07:00
Seth Alves
92981a6660 Merge pull request #7503 from sethalves/lock-tree-before-moving-av-children 
lock entity-tree before moving entity-children of avatars
 2016-03-30 15:05:38 -07:00
Zach Pomerantz
b6bf392f94 Defer avatar URL change to render thread 2016-03-30 14:39:35 -07:00
Seth Alves
bb43347599 Merge branch 'master' of github.com:highfidelity/hifi into use-local-scripts 2016-03-30 13:33:59 -07:00
Brad Davis
f569cbf70e Add debugging output, fix timewarp 2016-03-30 10:40:32 -07:00
Brad Hefta-Gaub
d99dcf5450 Merge pull request #7487 from hyperlogic/tony/animated-culling 
Improved render bounding boxes for animated models
 2016-03-30 09:27:43 -07:00
Brad Hefta-Gaub
6fdedb8f34 Merge pull request #7508 from howard-stearns/import-export-parents 
Make export/import and copy/paste be parent/child-clean.
 2016-03-30 09:06:33 -07:00
Brad Hefta-Gaub
c64b2bb236 Merge pull request #7495 from Atlante45/fix/audio-client 
Fix crash in Audio Client
 2016-03-30 09:00:07 -07:00
howard-stearns
5381be6902 Whitespace 2016-03-29 17:06:19 -07:00
howard-stearns
4ebf816166 cleanup 2016-03-29 16:17:19 -07:00
Seth Alves
537c6fa3c6 fix indentation 2016-03-29 15:39:42 -07:00
howard-stearns
bcb729eac2 Abstract out globalizeProperties. 2016-03-29 15:21:06 -07:00
Seth Alves
9d8e01f2a5 lock entity-tree before moving entity-children of avatars 2016-03-29 15:01:23 -07:00
howard-stearns
4a28dadae5 Working, but not cleaned up. 2016-03-29 13:26:50 -07:00
Anthony J. Thibault
a2c520a74a ModelOverlay: use a shared_ptr<Model> not a model member 
This is necessary for shared_ptr and weak_ptr to work for Models contained within a ModelOverlay.
 2016-03-29 10:47:26 -07:00
Seth Alves
b88770228e convert running-scripts window to use local script files 2016-03-29 10:40:56 -07:00
howard-stearns
3f18e0cd09 Merge branch 'master' of https://github.com/highfidelity/hifi into import-export-parents 2016-03-29 09:20:07 -07:00
Howard Stearns
5db1c33e4d kill offsets 2016-03-29 09:18:29 -07:00
Eric Levin
830d08c385 Merge pull request #7498 from Atlante45/fix/import-entities 
Make svo loading use ResourceManager
 2016-03-29 08:09:47 -07:00
Anthony J. Thibault
940f3e636d Merge branch 'master' into tony/animated-culling 2016-03-28 19:58:38 -07:00
Anthony J. Thibault
115fd607a0 Address performance issues introduced with this PR. 
* Prevent clusterMatrices from being invalidated and re-computed in each updateItem lambda.
  We do this by not setting _model->_needsUpdateClusterMatrices = true;
* Prevent redundant work if Model::enqueueLocationChange is called multiple times per frame.
  We do this by introducing a preRenderLambdas map in the Application class.
  Instead of adding work directly to the scene PendingChanges queue Model::enqueueLocationChange
  adds a lambda to the Application preRenderLambdas map.  The Application ensures that only one lambda will
  be invoked for each model per frame.
 2016-03-28 19:47:30 -07:00
Atlante45
807698f0bb Make svo loading use ResourceManager 2016-03-28 18:07:48 -07:00
howard-stearns
1b3d9d7ab6 Merge branch 'master' of https://github.com/highfidelity/hifi into import-export-parents 2016-03-28 16:59:20 -07:00
Atlante45
238131014b Fix avatar manager naming 2016-03-28 15:00:36 -07:00
Atlante45
92ef8cafb1 Make sure pos/rot getters don't crash 2016-03-28 14:37:06 -07:00
Zach Pomerantz
2de94e672b Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching 2016-03-28 14:08:30 -07:00
howard-stearns
d07967d6d8 Merge branch 'master' of https://github.com/highfidelity/hifi into import-export-parents 2016-03-28 14:02:20 -07:00
howard-stearns
c6347eb92a checkpoint for debugging/comparing edit.js 2016-03-28 13:39:43 -07:00
Zach Pomerantz
7bcef1d319 Fallback display to last, then desktop 2016-03-28 12:54:38 -07:00
Zach Pomerantz
37a725b06d Fallback to desktop if display plugin fails 2016-03-28 12:12:52 -07:00
Anthony J. Thibault
49a4d104a6 Minimize diff with master 2016-03-26 13:27:05 -07:00
Anthony J. Thibault
bf433487fa Dynamic bound update for skinned mesh 
* Use all cluster matrices to compute bound for skinned mesh.
  This is far less expensive then doing per-vertex work, but it's not free, for avatars especially.
* Remove skinnedMeshBound, compute it instead.
* Compute clusterMatrices in render update, because we need them to update bounds.
 2016-03-26 12:22:02 -07:00
Anthony J. Thibault
b4e70d9101 WIP: checkpoint 
* bug fix in AABox::operator+=
* added AABox::emiggen
* Avatar now has a default bound for it's skinned mesh.
* WIP: AABox tests;  NEED MORE
* Model: split collision and model mesh render items.
  Because ModelMeshRenderItems need special handling to update bounds for animated joints.
* Model: dynamically update the bound for rigidly bound animated meshes
* Rig: added access to geometryToRigTransform
* RenderableModelEntityItem: try to update bounds for skinned mesh to be the entity dimentions (this doesn't seem to be working)
* Geometry.cpp: removed unused bounds parameter in evalPartBounds
* ModelMeshPartPayload: bounds updating
   * non-animated: use existing _localBound
   * rigid bound mesh: use _localBound transformed by clusterMatrix joint transform
   * fully skinned mesh: use _skinnedMeshBound provided by the application.
 2016-03-25 21:29:20 -07:00
Brad Hefta-Gaub
f7e6f60e87 one more crack at fixing false deadlock 2016-03-25 19:04:01 -07:00
Brad Hefta-Gaub
9a66d779ae Merge pull request #7463 from zzmp/guard/bugsplat-2177 
Guard against lack of GL support to avoid crash
 2016-03-25 16:31:14 -07:00
Ryan Huffman
8d7670a4e8 Move system information logging to SharedUtil 2016-03-25 16:00:04 -07:00
Ryan Huffman
9efef21527 Fix indentation 2016-03-25 15:38:25 -07:00
Ryan Huffman
c4a87925e2 Add system information to log file 2016-03-25 15:34:53 -07:00
Zach Pomerantz
9f8848e833 Log on first login 2016-03-25 15:07:14 -07:00
Brad Hefta-Gaub
fe31be71eb protect against unexpected rollover 2016-03-25 14:59:43 -07:00
Zach Pomerantz
b252139704 LMK when running with old GL version 2016-03-25 14:42:58 -07:00
Brad Hefta-Gaub
541c1e5c6f Merge branch 'master' of https://github.com/highfidelity/hifi into reduceFalsePositiveDeadlocks 2016-03-25 13:03:31 -07:00
Brad Hefta-Gaub
941821e2c7 add some extra debugging at deadlock detection to explain unreasonable numbers 2016-03-25 12:17:24 -07:00
Zach Pomerantz
c5e5195db1 Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching 2016-03-25 12:07:00 -07:00
Zach Pomerantz
5d306a74d5 Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching 2016-03-25 10:09:37 -07:00
Brad Hefta-Gaub
fb09ad51b3 CR feedback 2016-03-24 21:14:07 -07:00
Brad Hefta-Gaub
7de8a2267f one more try 2016-03-24 18:09:14 -07:00
Anthony J. Thibault
6a5a443eff Avatar: Eye-tracking works again 
This replaces the calculation of the Head left and right eye positions used for eye tracking.
Which was inadvertently removed in this commit 7483b8546b
 2016-03-24 18:07:46 -07:00
Brad Davis
0ac70049c7 Merge pull request #7431 from hyperlogic/tony/vive-rendering-work 
OpenVR rendering & Nsight instrumentation improvements
 2016-03-24 17:44:30 -07:00
Brad Hefta-Gaub
cfaa97d8f3 one more try 2016-03-24 17:39:23 -07:00
Brad Hefta-Gaub
6d76a5872f Merge pull request #7461 from hyperlogic/tony/avatar-culling-fix 
Avatar: fix for Avatar animation updates while wearing HMD
 2016-03-24 17:34:20 -07:00
Brad Hefta-Gaub
5b13ebf72b more mac build busters 2016-03-24 17:19:11 -07:00
Brad Hefta-Gaub
2b595fb329 break out thread safe moving average to get around unix build hell 2016-03-24 16:26:28 -07:00
Brad Hefta-Gaub
8691aa6905 fix unix build and CR feedback 2016-03-24 15:45:44 -07:00
Brad Davis
520cccb219 Make display plugin switching atomic from other threads 2016-03-24 15:19:46 -07:00
Brad Hefta-Gaub
deed643ca7 add additional tracking of max elapsed 2016-03-24 13:30:39 -07:00
Anthony J. Thibault
ba4520fe56 Avatar: fix for Avatar animation updates while wearing HMD 
The boundingSphere vs frustum check now uses the displayViewFrustum, which
more accurately reflects the actual projection matrix used for rendering.
 2016-03-24 13:23:30 -07:00
Brad Hefta-Gaub
208b594ef8 make the deadlock watchdog more generous and add some logging so we can see heatbeats on slow machines 2016-03-24 12:37:07 -07:00
Zach Pomerantz
3e9e083df5 Update users of NetworkGeometry 2016-03-24 11:35:41 -07:00
Ozan
003af03b33 Merge pull request #7400 from Menithal/default-use-pre-post 
Set UserAnimPreAndPostRotations true by Default
 2016-03-24 09:57:03 -07:00
Brad Hefta-Gaub
2b0670718f Merge pull request #7449 from howard-stearns/report-previous-session-data 
Report previous session data
 2016-03-23 20:58:51 -07:00
Anthony J. Thibault
de3144cde5 Merge branch 'master' into tony/vive-rendering-work 2016-03-23 18:13:59 -07:00
Anthony J. Thibault
0ef5c45815 DeadlockWatchdogThread: bumped up age from 10 to 15 seconds. 
This will, hopefully, prevent false positives from people loading content on slow PCs.
 2016-03-23 17:59:54 -07:00
Howard Stearns
a393f36978 Forgot important comment. 2016-03-23 17:31:21 -07:00
Howard Stearns
c09c1438f8 ivar init order. 2016-03-23 17:28:54 -07:00
Philip Rosedale
e1f3665185 Merge pull request #7435 from hyperlogic/tony/all-jitter-must-die 
MyAvatar: fix jitter in hands when moving
 2016-03-23 17:28:47 -07:00
Anthony J. Thibault
cec6e7dd8d Application: reduced idle PROFILE_RANGE spam 2016-03-23 17:12:48 -07:00
howard-stearns
dbdf79f96f Restore whitespace so there aren't superfluous diffs. 2016-03-23 17:01:50 -07:00
howard-stearns
c435ca212a Report previous session time. 2016-03-23 16:59:17 -07:00
Anthony J. Thibault
0d37515784 Merge branch 'master' into tony/vive-rendering-work 2016-03-23 15:59:59 -07:00
howard-stearns
550738776c Pass whether or not previous session crashed to the UserActivityLogger. 2016-03-23 15:56:29 -07:00
Anthony J. Thibault
df187499ff MyAvatar: fix jitter in hands when moving 
Store hand controller positions within the avatar in sensor space, not world space.
Before IK the sensorToWorld matrix is updated to reflect the world space motion of the
character controller during physics.  This ensures the IK hand targets move properly with the character.
 2016-03-22 19:19:52 -07:00
Zach Pomerantz
9c11474dd7 Expose qApp->updateHeartbeat 2016-03-22 17:17:36 -07:00
Anthony Thibault
50ac101d56 Avatar and Rig NSIGHT instrumentation 2016-03-22 10:36:32 -07:00
Anthony Thibault
9faccabf0d Merge branch 'master' of https://github.com/highfidelity/hifi into tony/vive-rendering-work 2016-03-21 21:55:53 -07:00
Anthony Thibault
225c462685 Improved NSIGHT instrumentation 
* Application::idle, physics and avatar processing are tracked
* Application::paintGL frameNumber payload is tracked
* OpenGLDisplayPlugin::present is profiled with corresponding frameNumber payload
* Added color and payload support to Nsight ProfileRange class.
 2016-03-21 21:47:59 -07:00
Philip Rosedale
6b3a4eb327 Merge pull request #7419 from hyperlogic/tony/no-locks-no-problem 
Prevent deadlocks in AvatarUpdate
 2016-03-21 17:54:27 -07:00
Stephen Birarda
6b28523cb5 don't release the OPP processed packet 2016-03-21 16:29:18 -07:00
Anthony J. Thibault
7cab8f63fb Merge branch 'master' of github.com:highfidelity/hifi into tony/no-locks-no-problem 2016-03-21 16:03:33 -07:00
Brad Hefta-Gaub
a6bf84b90e Merge pull request #7399 from zzmp/fix/qml-thread 
Move QML rendering to a defined thread
 2016-03-21 15:31:42 -07:00
Anthony J. Thibault
0f31c3da10 Application: guard idle from being called within paintGL() 2016-03-21 15:21:16 -07:00
Anthony J. Thibault
ce47f83288 Prevent deadlock if idle is called during rendering 
This extraordinary event can occur if a MessageBox is popped up by the opengl driver.

* removed AvatarData::avatarLock
* removed AvatarUpdate

This code was left over from an earlier avatar threading experiment.

Removed AvatarData avatarLock and AvatarUpdate class
 2016-03-21 15:11:15 -07:00
Andrew Meadows
0a00436700 Merge pull request #7411 from ZappoMan/fixBlenderCrashRedux 
Fix blender crash redux
 2016-03-21 15:04:22 -07:00
Andrew Meadows
47c4b226ea Merge pull request #7395 from hyperlogic/tony/openvr-crash-on-exit 
openvr crash on exit fix
 2016-03-21 13:04:45 -07:00
Brad Hefta-Gaub
492e71345a Revert "Revert "Fix ModelBlender crash"" 
This reverts commit f274cdcc7f.
 2016-03-21 11:42:25 -07:00
Zach Pomerantz
d3d0f229aa Merge branch 'master' of github.com:highfidelity/hifi into fix/qml-thread 2016-03-21 11:25:14 -07:00
Brad Hefta-Gaub
091e34e792 Merge pull request #7396 from AndrewMeadows/do-not-trust 
prevent crash in SwingTwistConstraint
 2016-03-21 11:13:41 -07:00
Brad Hefta-Gaub
f274cdcc7f Revert "Fix ModelBlender crash" 2016-03-21 10:47:31 -07:00
Andrew Meadows
d7d428d1b2 Merge pull request #7387 from ZappoMan/fixBlenderCrash 
Fix ModelBlender crash
 2016-03-21 09:14:11 -07:00
Anthony Thibault
5b2a050df7 display-plugins: Pulled getHeadPose into common base class. 
* Moved getHeadPose and _headPoseCache out of each derived class and into HmdDisplayPlugin.
* updated comment in application.
 2016-03-20 14:08:35 -07:00
Anthony Thibault
b71a56de38 Application: disable deadlock watchdog for debug builds 
Cause it will cause a crash if you sit on a breakpoint for too long.
 2016-03-20 12:18:33 -07:00
Menithal
cdbb7b2ad4 Set UserAnimPreAndPostRotations true by Default 
If Blender avatars are animated by Blender animations, they have missing
Pre and Post rotations. This step is no longer necessary to have false,
and also makes sure all animations from Blender Work on all avatars (from
other platforms).

This commit make it default to be enabled:
 2016-03-19 12:49:57 +02:00
Anthony J. Thibault
4321c5a62b OculusLegacyDisplayPlugin: fixes for macosx and linux 2016-03-18 15:59:48 -07:00
Andrew Meadows
e81e49b32e prevent crash in SwingTwistConstraint 2016-03-18 15:59:25 -07:00
Anthony J. Thibault
960ffd9c9e DisplayPlugins: updateHeadPose() no longer returns a value. 
Also, moved updateHeadPose so that the overlay and the main rendering use the same headPose.
Which should also be the same place the latencyMarker for the ovr_GetTrackingState is set.
 2016-03-18 15:16:58 -07:00
Brad Hefta-Gaub
2ef5b3727e Merge branch 'master' of https://github.com/highfidelity/hifi into fixBlenderCrash 2016-03-18 14:04:45 -07:00
Anthony J. Thibault
d218ca4960 openvr: fix for crash on exit 
Before this fix, a script could call into HMD.getHUDLookAtPosition2D() while the app was shutting down, which in turn would call
getHeadPose() on the currently active display plugin.  This call could cause a crash within the openvr plugin, because the SDK was either shutdown, or in the process of shutting down on the main thread.

This fixes this by spliting the previous DisplayPlugin::getHeadPose(int) into two parts:

* updateHeadPose(int) which is only called once a frame and only by the main thread.
* getHeadPose() which is thread-safe and will return a cached copy of the hmd pose sampled by the last updateHeadPose.
 2016-03-18 12:26:11 -07:00
Brad Hefta-Gaub
481a75faca Merge pull request #7366 from markej/ShowDownloadURLs 
Show which URLs are being actively downloaded
 2016-03-18 10:42:01 -07:00
Howard Stearns
0cbddb217c Don't ask about differences over after the user has said no -- until the external file changes again. 2016-03-17 19:58:28 -07:00
Brad Hefta-Gaub
eb8a6527c6 change ModelBlender to use a set<WeakPointers> to safely handle model lifetime 2016-03-17 19:44:42 -07:00
Brad Hefta-Gaub
917c4644a5 make SkeletonModel be shared_ptr friendly as well 2016-03-17 18:03:49 -07:00
Brad Hefta-Gaub
7483b8546b remove FaceModel, make Model support shared_from_this() so we can ave shared and weak pointers to it 2016-03-17 17:05:35 -07:00
howard-stearns
d59d5549a1 Merge branch 'master' of https://github.com/highfidelity/hifi into os-window-vs-modal-overlay-in-script-editor 2016-03-17 17:04:54 -07:00
howard-stearns
a957716511 Disable script editor close and tab close when we have a modal dialog up 
about external changes to the file.
 2016-03-17 16:54:59 -07:00
Zach Pomerantz
5e953c9833 Rm Enable3DTVMode const 2016-03-17 15:56:57 -07:00
Brad Hefta-Gaub
edcf642410 Merge pull request #7374 from jherico/plugin_switch_crash 
Reduce crashes on switching display plugins
 2016-03-17 15:51:39 -07:00
Brad Hefta-Gaub
6f8f5ed15c Merge pull request #7382 from hyperlogic/tony/crash-fix-focus-out-event 
Application: prevent crash on startup when "Crashed" dialog is shown
 2016-03-17 15:51:15 -07:00
Bradley Austin Davis
d6d7e67ca3 Fix OpenVR shutdown crash 2016-03-17 14:37:43 -07:00
Ryan Huffman
d7d447c998 Add log to bugsplat report 2016-03-17 13:05:57 -07:00
Anthony J. Thibault
a8bc8a7843 Application: prevent crash on startup when "Interface Crashed" dialog is shown. 
If the application "Interface Crashed" dialog is shown at startup, it can cause Application to receive events before it has been fully constructed.
In this case the QMainWindow _window pointer is uninitialized, causing Menu::getInstance() to de-reference an invalid pointer.

The fix for this is three fold.

1. Construct the QMainWindow before calling setupEssentials (which in turn spawns the "Interface Crashed" dialog).
2. Change Menu::getInstance() from a static_cast to a dynamic_cast.  This will cause it to return a nullptr if [QMainWindow::menuBar()](http://doc.qt.io/qt-4.8/qmainwindow.html#menuBar) returns an instance of QMenuBar and not a ui::Menu instance.
3. In Application::event return false if Menu::getInstance() returns a nullptr.  This should prevent any code that relies on having a valid ui::Menu instance from running.
 2016-03-17 12:13:01 -07:00
Bradley Austin Davis
1cf89f046c Fix off by one error 2016-03-17 10:13:52 -07:00
Bradley Austin Davis
7045680bc7 Reduce crashes on switching display plugins 2016-03-17 10:13:52 -07:00
Andrew Meadows
4bb705360d interface calls _exit() on Release shutdown 2016-03-17 09:48:50 -07:00
Brad Hefta-Gaub
10a0bac90b Merge pull request #7375 from jherico/display_switch_shortcut 
Allow display plugin switching by keyboard
 2016-03-16 18:38:09 -07:00
Bradley Austin Davis
80e2025ebf Allow display plugin switching by keyboard 2016-03-16 18:28:48 -07:00
Mark Johnson
66f9effd12 Update to match coding standards 
- Single letter for loop variable names
- Preface bool variables with is/has/should/can/want
 2016-03-16 15:15:42 -07:00
David Rowe
5faa7b3e87 Merge branch 'master' into 20851 
Conflicts:
	interface/resources/qml/dialogs/MessageDialog.qml
 2016-03-17 09:29:56 +13:00
Chris Collins
733e4d74f8 Merge pull request #7290 from huffman/bugsplat-username 
Add HF username as default username for bugsplat
 2016-03-16 08:42:26 -07:00
Andrew Meadows
6028c3e841 Merge pull request #7318 from birarda/atp 
Asset Transfer Protocol Mappings
 2016-03-15 16:52:36 -07:00
Stephen Birarda
0012967734 use curly braced initialization for consts 2016-03-15 14:38:41 -07:00
Stephen Birarda
29cd487f84 fixes for styling and logging from CR 2016-03-15 14:38:08 -07:00
Atlante45
03efde5b3c Change text in case of drag and drop. 2016-03-15 13:53:13 -07:00
Chris Collins
e47c8896db Merge pull request #7364 from hyperlogic/tony/fix-for-p-and-h 
Application: fix third-person and fullscreen-mirror toggle
 2016-03-15 11:50:22 -07:00
Atlante45
4265ddbd0e Can't drop fbx if you can't rez 2016-03-15 11:42:48 -07:00
Atlante45
4a90ec303c Fix drag&drop 2016-03-15 11:22:42 -07:00
Anthony Thibault
addde84bee Merge pull request #7363 from markej/master 
Fill in the Downloads: line of the stats window
 2016-03-15 10:42:09 -07:00
Ryan Huffman
1b81b4f01b Merge branch 'atp' of github.com:birarda/hifi into atp-upload 2016-03-15 10:19:20 -07:00
Anthony J. Thibault
7539eec134 Application: fix third-person and fullscreen-mirror toggle 2016-03-15 10:11:56 -07:00
Ryan Huffman
7947bd7724 Fix message typo enter => entering 2016-03-15 10:11:53 -07:00
Ryan Huffman
cbed674cba Merge pull request #112 from Atlante45/feat/atp 
In place editing
 2016-03-15 09:54:03 -07:00
Clément Brisset
bbfbbf6565 Merge pull request #109 from birarda/asset-migrator 
tweaks to the ATP asset migrator for compound URLs and mappings
 2016-03-15 09:25:11 -07:00
Atlante45
98851679c5 Remove unused AssetMappingItem 2016-03-15 09:14:22 -07:00
Stephen Birarda
72c64532f5 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-15 09:12:49 -07:00
Brad Hefta-Gaub
11e88f965d Merge pull request #7347 from hyperlogic/tony/prevent-roll-in-goto-location 
MyAvatar: prevent roll and pitch in avatar via snapshot url.
 2016-03-14 18:58:49 -07:00
Brad Hefta-Gaub
447918d148 Merge pull request #7348 from hyperlogic/tony/cppcheck-fixes 
Avatar & Animation cppcheck static analysis fixes
 2016-03-14 18:58:25 -07:00
Mark Johnson
bc2aea8774 Show the (generally truncated) urls being downloaded 2016-03-14 18:18:33 -07:00
Stephen Birarda
605474a32c actually use the JSONTypePair alias 2016-03-14 18:11:34 -07:00
David Rowe
ab963b4a4b Fix up script editor's "reload script?" message box 2016-03-15 09:04:23 +13:00
Ryan Huffman
4b6dd4636f Merge branch 'atp' of github.com:birarda/hifi into atp-upload 2016-03-13 21:32:25 -07:00
Ryan Huffman
6c27bd9eb2 Update upload flow and make asset list dynamically sized 2016-03-13 21:04:07 -07:00
Anthony Thibault
1e94d9bdf5 interface/src/avatar: cppcheck fixes 2016-03-13 18:56:15 -07:00
Anthony Thibault
b921ac7757 MyAvatar: prevent roll and pitch in avatar via snapshot url. 2016-03-13 11:32:48 -07:00
Mark Johnson
b7a47d7bf2 Tabs -> Spaces 2016-03-12 17:35:57 -08:00
Mark Johnson
47d3f418e3 Merge remote-tracking branch 'highfidelity/master' 2016-03-12 17:30:22 -08:00
Mark Johnson
00829db375 Fill in the downloads line of the stats window 
Will show the active download, current download limit and how many
pending requests
 2016-03-12 17:27:43 -08:00
Anthony Thibault
ea95295e66 ApplicationOveraly: Fix for gray line at top of HMD UI overlay 2016-03-12 14:52:26 -08:00
Stephen Birarda
76e547498d support compound shape URLs in ATPAssetMigrator 2016-03-11 18:02:06 -08:00
Stephen Birarda
8375de4517 make the ATPAssetMigrator hmd friendly and a little less brittle 2016-03-11 17:32:24 -08:00
Anthony Thibault
9fb897476e Application: fix for mouse control in third-person camera 
Process the keyboard & mouse input plugin after the userInputMapper()->update().
 2016-03-11 17:29:18 -08:00
Philip Rosedale
7e581cc831 Merge pull request #7325 from hyperlogic/tony/smooth-hands 
Smoother hand motion when using hand controllers
 2016-03-11 15:08:59 -08:00
Stephen Birarda
66e572f226 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-11 14:44:49 -08:00
Ryan Huffman
55817e6b5a Merge branch 'master' of https://github.com/highfidelity/hifi into bugsplat-username 2016-03-11 14:01:45 -08:00
Ryan Huffman
d7b800283b Adjust bugsplat to use qPrintable 2016-03-11 13:57:05 -08:00
Stephen Birarda
1502348731 Merge pull request #105 from Atlante45/feat/atp 
Disable asset browser if user can't rez
 2016-03-11 13:25:28 -08:00
Atlante45
7efe26e854 Disable asset browser if user can't rez 2016-03-11 11:53:14 -08:00
Chris Collins
ae596d79f1 Merge pull request #7317 from jherico/hmd_worn 
Expose a property in display plugins to determine if the device is visible to the user
 2016-03-11 11:46:06 -08:00
Stephen Birarda
e51aedeb35 fix error handling for diff request types 2016-03-11 11:36:52 -08:00
Brad Davis
75c3fd18c9 Expose HMD worn to scripting 2016-03-11 11:00:58 -08:00
Anthony Thibault
ab390f7d2e Merge branch 'master' into tony/smooth-hands 2016-03-11 10:06:31 -08:00
Ryan Huffman
631aad80f9 Add Q_DECLARE_METATYPE(AssetMappingModel*) and fix indentation 2016-03-11 09:53:08 -08:00
Anthony J. Thibault
5eeb4ca594 Fix one frame lag controller lag/jitter 
Move userInputMapper->update() after inputPlugin->pluginUpdate().
 2016-03-11 09:28:25 -08:00
Brad Hefta-Gaub
d1c024fb39 Merge pull request #7286 from zzmp/fix/skybox-tex 
Clean up skybox rendering
 2016-03-11 08:50:23 -08:00
Brad Hefta-Gaub
9b89654d6a Merge pull request #7312 from jherico/crashes 
Better threaded handling of QML overlays
 2016-03-11 08:45:08 -08:00
Seth Alves
0d15706f34 Merge pull request #7315 from hyperlogic/tony/avatar-speed-stat-fix 
Stats: fix for avatar velocity stat being stuck at 0.1
 2016-03-11 06:37:23 -08:00
Zach Pomerantz
40378920b1 Merge branch 'master' of github.com:highfidelity/hifi into fix/skybox-tex 2016-03-10 21:44:31 -08:00
Stephen Birarda
a9dd88d834 Merge pull request #7320 from zzmp/feat/shader-includes 
Compile shaders into separate dir for inclusion
 2016-03-10 21:07:49 -08:00
Anthony J. Thibault
ab19d3e5a2 Moved animation after physics, hand poses are in world frame. 
There are still some debug hacks enabled so I can test in the vive room.
 2016-03-10 20:44:35 -08:00
Zach Pomerantz
11867aa71d Compile shaders to their own folders 2016-03-10 20:10:54 -08:00
Anthony J. Thibault
807d31743c Removed Hand, HandData & PalmData 
Instead, we just store two controller::Poses in MyAvatar.
Existing behavior and scripting APIs have been preserved.

The hand controller debug drawing is slightly different, but still works.
 2016-03-10 19:33:31 -08:00
Philip Rosedale
e87ef52a4c Merge pull request #7302 from hyperlogic/tony/wrong-way-overlay 
More reliable and usable UI sphere overlay location
 2016-03-10 17:43:50 -08:00
Stephen Birarda
625032f748 fix for add to world after upload name change 2016-03-10 17:10:49 -08:00
Stephen Birarda
979fda7c8b add trimming for upload mapping 2016-03-10 16:57:39 -08:00
Stephen Birarda
96a112290f use mapping for overwrite prompt 2016-03-10 16:56:22 -08:00
Atlante45
35f5ebb938 Don't allow folder overwrite 2016-03-10 16:44:39 -08:00
Ryan Huffman
ad0fb18d81 Add / to beginning of mapping on upload if missing 2016-03-10 16:02:41 -08:00
Brad Davis
e452020126 Better threaded handling of QML overlays 2016-03-10 15:50:07 -08:00
Ryan Huffman
2d4864ed33 Merge branch 'atp' of github.com:birarda/hifi into atp-more 2016-03-10 15:40:07 -08:00
Anthony J. Thibault
c0880a570e Stats: fix for avatar velocity stat being stuck at 0.1 2016-03-10 15:15:46 -08:00
Atlante45
a6ccfb1685 CR 2016-03-10 15:11:39 -08:00
Atlante45
63571a7c36 Make sure Upload is not clicked several times 2016-03-10 14:59:20 -08:00
Atlante45
548d826a4e Couple bug fixes 2016-03-10 14:59:20 -08:00
Atlante45
7d7a683b18 Add uploadFile method that prompts the user 2016-03-10 14:59:20 -08:00
Stephen Birarda
1678c9be20 add a keyboard shortcut for the asset directory 2016-03-10 14:48:44 -08:00
Stephen Birarda
8cc0ae3148 menu and naming changes for asset server directory 2016-03-10 14:48:44 -08:00
samcake
ad7d567932 Fixing the overlay renderItem access issue 2016-03-10 14:09:34 -08:00
Stephen Birarda
5ad4645b47 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-10 13:28:59 -08:00
Anthony J. Thibault
6d11dd465c Application: reset avatar on displayMode change 
but not HMD sensor.
 2016-03-10 13:12:09 -08:00
Zach Pomerantz
b627a17ce9 Allow px/color skybox without tex 2016-03-10 12:58:49 -08:00
Stephen Birarda
9d19bf85b1 add consistent error handling for asset request and upload 2016-03-10 10:52:05 -08:00
Anthony J. Thibault
4a78300607 MyAvatar: Allow user to raise hands directly overhead. 
Previously we were using a infinitely tall vertical cylinder
to push hand IK targets out of the body, this had the
side-effect of preventing the hands from being raised over
the head.  Now, we collide against the same 3d capsule
used by the physics system for avatar collisions.
 2016-03-10 10:20:17 -08:00
Brad Hefta-Gaub
ee727b0632 Merge pull request #7304 from Atlante45/master 
Fix messed up LogDialog multi-lines
 2016-03-10 09:23:35 -08:00
Brad Hefta-Gaub
82ca78b37b Merge pull request #7300 from sethalves/fix-detach-crash 
fix removing attachments
 2016-03-10 08:23:52 -08:00
Ryan Huffman
3e5e2eef17 Add mapping sorting, copying, and isKnownMapping 2016-03-10 08:18:32 -08:00
Anthony J. Thibault
5f1b8805cf Removed unnecessary include 2016-03-09 17:37:51 -08:00
Atlante45
f6e01bbd36 Fix messed up LogDialog multi-lines 2016-03-09 17:31:04 -08:00
Brad Davis
9645ed9120 Update the watchdog heartbeat manually during startup 2016-03-09 17:00:45 -08:00
Anthony J. Thibault
886457939d Merge branch 'master' into tony/wrong-way-overlay 2016-03-09 16:50:18 -08:00
Howard Stearns
2b576e86f0 Merge pull request #7259 from jherico/crashes 
Crash fixes
 2016-03-09 16:42:36 -08:00
Chris Collins
ddb09ec222 Merge pull request #7285 from hyperlogic/tony/hand-controller-move-improvements 
Hand controller mouse improvements
 2016-03-09 16:34:35 -08:00
Ryan Huffman
0d2ae4f3a4 Merge branch 'atp' of github.com:birarda/hifi into atp-model 2016-03-09 16:33:53 -08:00
Anthony Thibault
5df616be37 OpenVR: More usable UI Sphere overlay location 
Also, added a debug option to display SensorToWorld matrix in Developer > Avatar menu.
 2016-03-09 16:24:08 -08:00
Ryan Huffman
f5497aa1e7 Add new AssetMappingsScriptingInterface and add mappings model 2016-03-09 14:53:04 -08:00
Brad Davis
23a89a63d8 Set deadlock thread name 2016-03-09 14:51:19 -08:00
Seth Alves
d95d0f59cb keep removed attachment models around for one extra call to fixupModelsInScene 2016-03-09 14:36:50 -08:00
Anthony J. Thibault
4af3766804 Don't reset sensors when initializing or changing display plugins. 
This should fix the issue with the Oculus starting up with the UI aligned
to the HMD on your desk, rather then the configured default sitting pose.
 2016-03-09 14:28:26 -08:00
Stephen Birarda
57ea51d244 Merge pull request #84 from Atlante45/feat/atp 
Replace old drag&drop with new UI
 2016-03-09 14:26:49 -08:00
Zach Pomerantz
21719b3980 Wait 10m for DEBUG deadlocks 2016-03-09 14:07:36 -08:00
Ryan Huffman
fd5a5dd8f4 Add QJSEngine compatible AssetMappingScriptInterface 2016-03-09 14:03:25 -08:00
Brad Davis
d428f3b96f Working on crash bugs 2016-03-09 14:00:05 -08:00
Brad Davis
cac31761c0 Safer shutdown code in deadlock thread 2016-03-09 13:45:01 -08:00
Stephen Birarda
9a2b2b4c16 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-09 12:16:46 -08:00
Brad Hefta-Gaub
e038c8a43c Merge branch 'master' of https://github.com/highfidelity/hifi into bugfixes 2016-03-09 11:47:55 -08:00
Atlante45
5a0beec1f5 Replace old drag&drop with new UI 2016-03-09 11:47:31 -08:00
Brad Davis
80fdef4348 Ensure the heartbeat has a valid value before the thread starts 2016-03-09 10:53:01 -08:00
Ryan Huffman
eb402eab75 Fix bugsplat username setting 2016-03-09 10:21:59 -08:00
Ryan Huffman
d20cf12941 Add HF username as default username for bugsplat 2016-03-09 10:21:59 -08:00
Anthony J. Thibault
4691ca1716 Merge branch 'master' into tony/hand-controller-move-improvements 2016-03-09 10:06:28 -08:00
Brad Hefta-Gaub
1c07276501 fix a couple bugs 2016-03-09 09:45:55 -08:00
Brad Hefta-Gaub
5862181e70 Merge pull request #7288 from jherico/watchdog 
Add a watchdog thread to trigger a crash on detecting a deadlock
 2016-03-09 09:18:48 -08:00
Seth Alves
efdef52081 Merge pull request #7269 from ctrlaltdavid/20822 
Restyle bookmark dialogs
 2016-03-09 07:31:15 -08:00
Brad Davis
95f5d82d37 Add a watchdog thread to trigger a crash on detecting a deadlock 2016-03-09 00:32:46 -08:00
samcake
bfed0304c3 Merge pull request #7218 from zzmp/fix/resort-in-octree 
Fix item key lookup on updated items in scene
 2016-03-08 17:48:51 -08:00
Anthony J. Thibault
deb17e1f93 Merge branch 'master' into tony/hand-controller-move-improvements 2016-03-08 17:45:50 -08:00
Stephen Birarda
87d5958eb8 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-08 17:11:18 -08:00
Brad Hefta-Gaub
35d6afbe77 Merge branch 'master' of https://github.com/highfidelity/hifi into fixSceneNotStable 2016-03-08 14:53:41 -08:00
Brad Hefta-Gaub
6d211dd4e5 first cut at fixing the scene not stable bug 2016-03-08 14:52:21 -08:00
David Rowe
10e4e5e3a7 Use OffscreenUI icon enum instead of QMessageBox icon enum 2016-03-09 11:33:55 +13:00
David Rowe
03fb6b1444 Add ability to have icons in query dialogs 
Add icon to bookmark dialogs' titles.
 2016-03-09 10:45:14 +13:00
Atlante45
ded449072f Rename window 2016-03-08 13:13:45 -08:00
Atlante45
784f669998 First draft Assets Manager 2016-03-08 13:13:45 -08:00
Stephen Birarda
969244927b use extension for entity add for drag and drop upload 2016-03-08 13:09:20 -08:00
Stephen Birarda
28af9c51e6 add a missing parenthesis 2016-03-08 12:22:13 -08:00
Stephen Birarda
8fa32e75b2 client side fixes for upload with no extension 2016-03-08 12:19:15 -08:00
Stephen Birarda
bfb9801b22 Merge branch 'atp' of github.com:birarda/hifi into atp-mappings 2016-03-08 11:37:27 -08:00
Anthony J. Thibault
e046ba64dd Properly marshal fakeMouseEvent data from script thread to main thread 2016-03-08 10:58:54 -08:00
Seth Alves
b780fad83f Merge pull request #7270 from birarda/local-socket-check 
add a secondary method for local socket check
 2016-03-08 10:48:08 -08:00
Brad Hefta-Gaub
19ad4314ca Merge pull request #7276 from jherico/bookmarks 
Don't trigger modal dialog from menu handler
 2016-03-08 10:29:29 -08:00
Zach Pomerantz
d1324b2e7a Merge branch 'master' of github.com:highfidelity/hifi into fix/resort-in-octree 2016-03-08 10:22:25 -08:00
Brad Hefta-Gaub
50eb07d465 Merge pull request #7221 from jherico/threaded_compositing2 
Migrate composition of the overlay and pointer to the present thread
 2016-03-08 10:22:02 -08:00