Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 09:31:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
44959 commits 75 branches 59 tags 1.2 GiB
Commit graph

18379 commits

Author SHA1 Message Date
Zander Otavka
d45694836f Add signal for display mode change in HMD 2016-06-24 11:57:12 -07:00
Brad Davis
a095da31fd Fix initial visibility of QML windows from scripts 2016-06-24 11:48:55 -07:00
Triplelexx
8928854820 lost change 2016-06-24 05:20:47 +01:00
Triplelexx
6542604d13 resolve conflicts with TouchscreenDevice 
updated to master
 2016-06-24 05:19:28 +01:00
Triplelexx
fd4d9761ce merge master and resolve conflicts 
* remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping
 2016-06-24 03:34:39 +01:00
Brad Hefta-Gaub
d7bffc3eab first cut at negotiating codecs 2016-06-23 17:14:41 -07:00
howard-stearns
f8391f0062 fix reticle bugs 2016-06-23 16:51:15 -07:00
Seth Alves
2fd38c1585 when adding or editing an entity from a script, make the _lastEdited in the transmitted properties be the same as the one in the Entity in the local tree 2016-06-23 13:10:15 -07:00
Brad Hefta-Gaub
da74114b32 Merge pull request #8070 from AndrewMeadows/triangle-soup-4 
support btBvhTriangleMeshShape for static mesh entities
 2016-06-23 12:17:32 -07:00
Brad Hefta-Gaub
6111e4952a fix comments 2016-06-23 10:59:26 -07:00
Brad Hefta-Gaub
be37921845 first cut at codec plugins 2016-06-23 10:42:02 -07:00
Andrew Meadows
1d8d1240ca remove override to avoid new Jenkins OSX warnings 2016-06-23 10:38:46 -07:00
Seth Alves
03b55e6a64 Merge branch 'master' of github.com:highfidelity/hifi into tmp-rez-cap-rather-than-reject 2016-06-23 10:33:31 -07:00
Brad Hefta-Gaub
c0be9aec6a cleanup the callers of the resamplers for mic to net and net to speaker, remove loopback resampler 2016-06-23 10:28:29 -07:00
Stephen Birarda
f9b3165350 use a QSet instead of a QStringList 2016-06-23 09:37:17 -07:00
Stephen Birarda
7307bc6a1b revert to domain connection refusal check with string 2016-06-23 09:27:17 -07:00
howard-stearns
581d87d653 feedback re magic numbers and variable name. 2016-06-22 16:40:10 -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
Andrew Meadows
e5b89ebd17 bump version number 2016-06-22 15:33:44 -07:00
Andrew Meadows
8009d23f70 more STATIC_MESH and dynamic overlap prevention 2016-06-22 15:20:45 -07:00
Zach Pomerantz
eebf8e91c6 add api_key to domains/public_key updates 2016-06-22 12:02:35 -07:00
Zach Pomerantz
3a36b0a2e5 add temporary domain info to account info 2016-06-22 12:02:35 -07:00
Seth Alves
c62b73bf61 when the entity-server caps a lifetime of an edit from a tmp-rez only interface, bump the lastEdited time forward so that the interface accepts the change back into its local tree 2016-06-22 11:42:57 -07:00
Seth Alves
fbfb6f169b Merge branch 'master' of github.com:highfidelity/hifi into tmp-rez-cap-rather-than-reject 2016-06-22 10:02:12 -07:00
howard-stearns
e4dbb5e61a Make mouse reticle be perpendicular to head. 2016-06-22 09:57:38 -07:00
Andrew Meadows
e88b264864 revert compound hull shape generation 2016-06-22 09:30:44 -07:00
Ryan Huffman
847685d224 Add tracking of away.js 2016-06-22 09:06:59 -07:00
Ryan Huffman
890de1bfea Add went-to user activity back in 2016-06-22 08:54:58 -07:00
Ryan Huffman
a7f30ced29 Fix infinite recursion in PluginManager 2016-06-21 21:39:40 -07:00
SamGondelman
78a1845afe fixed resizing of qml overlays when device pixel ratio changes 2016-06-21 18:13:11 -07:00
howard-stearns
d6095d1f11 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-21 16:52:22 -07:00
Seth Alves
9ca27f267d cap lifetime rather than reject edits from nodes which only have tmp-rez rights 2016-06-21 16:48:04 -07:00
Ryan Huffman
4e52521f8c Update UserActivityLogger device blacklist 2016-06-21 16:43:16 -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
Ryan Huffman
da71fcb57f Update connected device detection implementation 2016-06-21 16:37:58 -07:00
Brad Hefta-Gaub
d9e8026cd6 Merge pull request #8113 from AndrewMeadows/fix-kinematic-motion 
fix setting velocity of inactive kinematic RigidBody
 2016-06-21 16:32:04 -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
Andrew Meadows
702e83ba6a prevent incompatible entity properties combos 2016-06-21 14:03:21 -07:00
Andrew Meadows
4c9ec7ca43 protect physics against bad entity properties 2016-06-21 13:55:11 -07:00
Andrew Meadows
937bd0c1be SHAPE_TYPE_MESH --> SHAPE_TYPE_STATIC_MESH 2016-06-21 13:54:21 -07:00
Ryan Huffman
0ea9c5c26d Fix getMemoryInfo not returning false on non-Windows 2016-06-21 13:32:17 -07:00
Ryan Huffman
6c2c7f1eec Fix connected_device user activity event 2016-06-21 13:28:40 -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
Andrew Meadows
31706a3909 force activate kinmatic objects when necessary 2016-06-21 10:38:44 -07:00
samcake
117a39d52a Merge pull request #8103 from SamGondelman/compileShaderFix 
Reduce GLShader::compileShader log spam
 2016-06-21 10:30:05 -07:00
Andrew Meadows
f22a5613bd fix static mesh for model with per-mesh transforms 2016-06-20 17:29:20 -07:00
Andrew Meadows
5484b6fbb7 more correct extraction from triangle strips 2016-06-20 17:29:20 -07:00
Andrew Meadows
c0c77e9027 optimize/cleanup compound/mesh shape computation 2016-06-20 17:29:20 -07:00
Andrew Meadows
f444b70fdc fix collision shape for scaled models 2016-06-20 17:29:20 -07:00
Andrew Meadows
ab3548cac0 fix crash 2016-06-20 17:29:20 -07:00
Andrew Meadows
d1752211e6 make implicit casts explict 2016-06-20 17:29:20 -07:00
Andrew Meadows
2f6e5ab2ee remove fall-through in switch/case logic 2016-06-20 17:29:20 -07:00
Andrew Meadows
f41fb30ace add "Static Mesh" option to edit.js 2016-06-20 17:29:20 -07:00
Andrew Meadows
a519b77ae7 add SHAPE_TYPE_MESH and build mesh shapes 2016-06-20 17:29:20 -07:00
Andrew Meadows
9fc77ccfa2 use reference to avoid big copy 2016-06-20 17:29:20 -07:00
Andrew Meadows
13bb174b8b small change to commented out debug code 2016-06-20 17:29:20 -07:00
Andrew Meadows
5d5dc2837b fix comment 2016-06-20 17:29:20 -07:00
Andrew Meadows
d64729372a ShapeInfo name changes 2016-06-20 17:29:20 -07:00
Andrew Meadows
57760bca7d sort ShapeInfo data members 2016-06-20 17:29:20 -07:00
Ryan Huffman
154ccb8932 Add glVersionToInteger to GLHelpers 2016-06-20 16:10:07 -07:00
Ryan Huffman
0393777b03 Add getMemoryInfo helper function 2016-06-20 16:01:44 -07:00
Ryan Huffman
1fa274a527 Fix GPUIdent name trailing whitespace 2016-06-20 16:01:03 -07:00
Brad Hefta-Gaub
10d79945d1 Merge pull request #8101 from humbletim/fix-entity-lifetime-guards 
Fix entity lifetime guards (re: canRez/canRezTmp)
 2016-06-20 15:52:54 -07:00
Brad Hefta-Gaub
d5c6296db5 Merge pull request #8095 from SamGondelman/skeletonFix 
Fix skeleton switching bug
 2016-06-20 15:52:40 -07:00
SamGondelman
34d18da4e4 remove mutable 2016-06-20 11:11:54 -07:00
humbletim
e65e6dc9ce Fix entity lifetime guards (re: canRez/canRezTmp) 2016-06-19 13:40:03 -04:00
SamGondelman
c30c2b64b2 first pass at preventing repeated compileShader error prints 2016-06-17 17:49:27 -07:00
Seth Alves
d8a67850f2 treat usernames in permissions-grid on domain-server settings page as case-insensitive 2016-06-17 15:17:51 -07:00
SamGondelman
caf4a9fa34 got rid of comparison warning 2016-06-17 14:17:32 -07:00
Howard Stearns
e104429fa1 Merge pull request #8096 from hyperlogic/bug-fix/reticle-focus 
Change rendering of reticle when in HMD mode
 2016-06-17 13:25:26 -07:00
Anthony J. Thibault
e04d86a75a Change rendering of reticle when in HMD mode 
Properly take the overlay model matrix into account.
Reticle depth is now relative to the eye, not relative to the overlay sphere.
 2016-06-17 12:10:26 -07:00
SamGondelman
5f7e49b087 possible fix, needs testing 2016-06-17 11:50:56 -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
Brad Hefta-Gaub
3b132e7376 Merge pull request #8076 from ZappoMan/reduceLogSpam 
don't log spam on empty URL
 2016-06-16 18:25:54 -07:00
Brad Hefta-Gaub
7d0cd38c8e Merge pull request #8075 from ctrlaltdavid/20970 
fix reporting of JSON export failure
 2016-06-16 18:24:48 -07:00
Ryan Huffman
c2ebcd1f77 Make activity logging from scripts only available for certain events 2016-06-16 13:49:25 -07:00
Ryan Huffman
3650377745 Clean up NULL => nullptr 2016-06-16 13:17:31 -07:00
Ryan Huffman
c7955900ab Add new user activity events 2016-06-16 13:17:18 -07:00
Brad Hefta-Gaub
d7cd82a24e Merge pull request #8085 from ZappoMan/fixShaders 
fix v1 procedural shaders
 2016-06-16 13:06:15 -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
Brad Hefta-Gaub
5dae20975a fix v1 procedural shaders 2016-06-16 09:18:44 -07:00
SamGondelman
f02ffa92fd undo debugging 2016-06-15 18:00:08 -07:00
Bradley Austin Davis
6ad1008a56 Allow explicit overlay alpha from scripts 2016-06-15 17:24:32 -07:00
SamGondelman
59b785a33b trying to debug 2016-06-15 16:55:34 -07:00
David Rowe
775656eb1d Delete comment 2016-06-16 08:48:30 +12:00
Bradley Austin Davis
60035486d3 Build fix 2016-06-15 10:48:48 -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
Stephen Birarda
59912012c6 clear domain connection refusals on hard reset, not soft 2016-06-15 09:48:53 -07:00
Brad Hefta-Gaub
3e459085ac don't log spam on empty URL 2016-06-15 09:25:46 -07:00
David Rowe
657f8fdad5 Fix reporting of JSON export failure 2016-06-15 14:12:49 +12:00
Atlante45
5560ba9a4c Quit application when SteamVR requests it 2016-06-14 16:29:50 -07:00
Atlante45
fc7b271e50 Missed OS X Warning 2016-06-14 16:29:50 -07:00
Atlante45
96258a795a Initial Steamworks integration 2016-06-14 16:29:50 -07:00
Chris Collins
55330f2205 Merge pull request #8057 from jherico/settings 
Fixing issues with unclosed groups in settings persistence
 2016-06-14 14:34:14 -07:00
Chris Collins
0236af8bcd Merge pull request #8067 from birarda/api-recheck-on-fail 
only signal once on a protocol mismatch with DS
 2016-06-14 12:53:21 -07:00
Bradley Austin Davis
b1c472e82b Fixing settings, even in release builds 2016-06-14 12:16:40 -07:00
Brad Hefta-Gaub
b1de94f39d Merge pull request #8061 from imgntn/entityaddtypeserrors 
More verbose messaging about incorrect case in entity types
 2016-06-14 10:56:58 -07:00
Stephen Birarda
2163f9b5f3 signal once for domain protocol mismatch, case 918 2016-06-14 10:43:45 -07:00
Bradley Austin Davis
d52a1fe6f9 Fix persistence for global scope settings handles, clean up invalid variants in settings 2016-06-14 09:49:38 -07:00
Bradley Austin Davis
34c8d257d2 Fixing issues with unclosed groups in settings persistence 2016-06-14 09:49:38 -07:00
Bradley Austin Davis
f3c47acbb2 Fix offset when UI transform is not identity 2016-06-14 09:49:25 -07:00
Bradley Austin Davis
175dbb8924 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-14 09:48:56 -07:00
Brad Davis
196ab401e5 Merge pull request #8046 from SamGondelman/proceduralRaymarch 
Exposed orientation and eye position to procedural entity shaders
 2016-06-14 09:48:07 -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
James B. Pollack
1306417c8e more verbose messaging about incorrect entity types 2016-06-13 17:48:58 -07:00
Bradley Austin Davis
6707f889b8 Fixing laser offset, support laser in Oculus 2016-06-13 17:33:18 -07:00
SamGondelman
dc9121433d trying to fix skeleton switching bug 2016-06-13 16:37:34 -07:00
Bradley Austin Davis
aab42ff841 Merge branch 'settings' into lasers 2016-06-13 15:43:03 -07:00
Bradley Austin Davis
b9bf797753 Fixing issues with unclosed groups in settings persistence 2016-06-13 15:26:48 -07:00
Seth Alves
f8f62a4ff1 remove unused function 2016-06-13 15:10:52 -07:00
Bradley Austin Davis
62051ad297 Working on touch 2016-06-13 14:40: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
Seth Alves
eba518cb65 try to make code that converts bullet-calculated values to parent-frame values more effecient 2016-06-13 14:26:41 -07:00
Seth Alves
998a5594c0 Merge branch 'master' of github.com:highfidelity/hifi into quiet-es-sim-spam 2016-06-13 13:41:32 -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
130c0dda31 PR feedback 2016-06-13 13:04:11 -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
Seth Alves
52245f25f2 rework code that transforms global _server* values into parent-frame values 2016-06-13 11:48:45 -07:00
Seth Alves
99bfc76dd3 Merge branch 'master' of github.com:highfidelity/hifi into quiet-es-sim-spam 2016-06-13 11:14:26 -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
Brad Hefta-Gaub
da28b0f3e7 Merge pull request #8048 from ctrlaltdavid/20961 
fix import of invalid JSON file failing silently
 2016-06-12 19:42:53 -07:00
Seth Alves
924c949af5 permissions for the local node were being updated without the various *changed* signals being called. this was keeping the asset-server menu item from being correct, among other things 2016-06-11 15:16:45 -07:00
Seth Alves
4c45d081cd merge from upstream 2016-06-10 19:57:46 -07:00
SamGondelman
8a682450a9 still trying to fix cmake errors 2016-06-10 17:01:22 -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
SamGondelman
7b21d71180 try to fix cmake error 2016-06-10 14:09:04 -07:00
SamGondelman
53435fc730 removed extra argument 2016-06-10 14:04:33 -07:00
SamGondelman
f32e29ac2d small changes 2016-06-10 13:46:02 -07:00
SamGondelman
da98ee0916 reorganized procedural shader code, added getWorldEyeWorldPos(), removed iWorldEyePosition 2016-06-10 13:42:19 -07:00
Seth Alves
41c399897a remove some debug prints 2016-06-10 12:08:13 -07:00
Seth Alves
4a49ade21b Merge branch 'master' of github.com:highfidelity/hifi into quiet-es-sim-spam 2016-06-10 11:50:06 -07:00
Seth Alves
e1ae2a193f EntityMotionState now uses parent-relative position and rotation and velocity when deciding if it needs to send an edit packet to the entity-server 2016-06-10 11:49:15 -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
Brad Hefta-Gaub
fda91677f8 Merge pull request #8049 from kencooke/master 
Use shared CPUDetect.h for CPU detection
 2016-06-10 08:25:27 -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
David Rowe
2953ca08cb Fix import of invalid JSON file failing silently 2016-06-10 12:04:41 +12:00
Ken Cooke
dd0d594524 cleanup 2016-06-09 16:31:09 -07:00
SamGondelman
8cccd5416a try to fix mac errors 2016-06-09 16:10:27 -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
f963adb5dd send connection denial for connect version mismatch 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
Stephen Birarda
c5a4a72a84 trigger domain API refresh from DomainHandler 2016-06-09 15:53:19 -07:00
Stephen Birarda
e39c708bf6 require two triggers for API refresh, fix check for ICE domain 2016-06-09 15:53:19 -07:00
Stephen Birarda
f59335ceff don't thrash API re-check when connection denied 2016-06-09 15:53:19 -07:00
Stephen Birarda
8318e9ccc8 Revert "additional revert related change" 
This reverts commit 3119b654dc.
 2016-06-09 15:53:19 -07:00
Stephen Birarda
1e9e264124 Revert "Revert "refresh API info during re-connect - case 570"" 
This reverts commit b8c80e2222.
 2016-06-09 15:53:19 -07:00
Ken Cooke
d7079fce8c Use shared CPUDetect.h for CPU detection 2016-06-09 15:07:24 -07:00
Seth Alves
5650ef9d52 have code where physics guesses at server values also avoid doing simple simulation of children of avatars 2016-06-09 14:35:17 -07:00
Seth Alves
3b85fc9ae3 Merge branch 'master' of github.com:highfidelity/hifi into quiet-es-sim-spam 2016-06-09 14:02:15 -07:00
Seth Alves
441b5a20d8 merge from upstream 2016-06-09 13:23:41 -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
Seth Alves
bade215907 maximum 'tmp' entity lifetime is now a domain-server setting, defaults to 1 hour 2016-06-09 10:41:30 -07:00
Seth Alves
203ea5ddc7 Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid 2016-06-09 09:53:33 -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
SamGondelman
24e5000aeb exposed orientation and eye position to procedural entity shaders 2016-06-08 18:26:54 -07:00
Brad Hefta-Gaub
262e0262fc Merge pull request #7889 from samcake/color 
add support for ambient occlusion texture and lightmap texture for fbx exported from Blender
 2016-06-08 17:38:45 -07:00
Brad Hefta-Gaub
fc5214c938 Merge pull request #8033 from SamGondelman/xboxFix 
Game pads work after falling asleep and being reactivated
 2016-06-08 16:27:26 -07:00
Brad Hefta-Gaub
8434aa9416 Merge pull request #8027 from SamGondelman/exposeHaptics 
Expose haptics to JS
 2016-06-08 16:17:04 -07:00
Seth Alves
2e940e1055 Merge branch 'master' of github.com:highfidelity/hifi into fix-avatar-entity-locking 2016-06-08 15:54:12 -07:00
Seth Alves
f070708b4a _avatarEntityData is accessed by more than one thread. 2016-06-08 15:53:54 -07:00
Anthony Thibault
05ca715074 Merge pull request #7974 from hyperlogic/tony/daz3d-model-fix 
Fix for models exported from Daz3D.
 2016-06-08 15:44:50 -07:00
Brad Hefta-Gaub
69ae33ad9a Merge pull request #7997 from SamGondelman/touchFixes 
Corrected Oculus Touch coordinate system so that hands track properly
 2016-06-08 15:39:17 -07:00
Brad Davis
0565d3aea1 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-08 14:59:58 -07:00
Seth Alves
a312218722 back out some changes 2016-06-08 14:07:16 -07:00
Seth Alves
d7fc789ea7 try harder to not do simple-simulation on things that have an avatar ancestor 2016-06-08 13:47:52 -07:00
Brad Hefta-Gaub
0df72548f8 Merge pull request #8024 from kencooke/audio-src-avx2 
AVX2 optimized audio resampler
 2016-06-08 12:43:52 -07:00
Seth Alves
a1766539f4 don't do simple simulation on children of avatars 2016-06-08 12:17:07 -07:00
Seth Alves
201d7a7d3b when parent is an avatar, set velocity to zero (still incorrect, but avoids server-side problems) rather than the world-frame velocity 2016-06-08 12:11:08 -07:00
Seth Alves
5cbaf05e45 also zero angular velocity for child of avatar 2016-06-08 11:55:17 -07:00
Seth Alves
1b4b38c85b when parent is an avatar, set velocity to zero (still incorrect, but avoids server-side problems) rather than the world-frame velocity 2016-06-08 11:28:49 -07:00
Seth Alves
1977efae4f Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid 2016-06-08 10:36:52 -07:00
Brad Davis
c2aa9e7f61 Update SteamVR keyboard behavior 2016-06-07 21:52:21 -07:00
Brad Davis
eab611acc0 Enable Steam VR text input 2016-06-07 21:52:20 -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
338557358d Merge pull request #8035 from Atlante45/master 
Fix OS X warning
 2016-06-07 18:17:58 -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
SamGondelman
2c1d20bd1a removed _deviceCounts, cache joystick available inputs, added deadzone to gamepad thumbsticks 2016-06-07 17:12:24 -07:00
Atlante45
71fb0e665f Fix OSX warning 2016-06-07 16:46:32 -07:00
Seth Alves
b2f63a2132 hook up can-rez-tmp and can-write-to-asset-server 2016-06-07 16:17:58 -07:00
SamGondelman
545dda0a98 whoops 2016-06-07 15:15:42 -07:00
SamGondelman
5daccba235 xbox controller works on restart 2016-06-07 15:14:08 -07:00
SamGondelman
dd97f16728 investigating xbox failure on restart (WIP) 2016-06-07 11:42:58 -07:00
Ken Cooke
27d39eb1b0 Lightweight functions to detect SSE3, SSSE3, SSE4.1, SSS4.2, AVX and AVX2. 
These are cross platform, and return false on unsupported platforms.
 2016-06-07 06:53:50 -07:00
Ken Cooke
14b51d6615 Use common code for AVX detection 2016-06-07 06:50:38 -07:00
Seth Alves
e16d1fdc23 Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid 2016-06-06 16:32:26 -07:00
Seth Alves
0c18df6278 don't restart domain-server if the only settings changes where permissions 2016-06-06 16:32:18 -07:00
Brad Hefta-Gaub
30526374bc Merge pull request #7996 from ctrlaltdavid/get-entity-children 
add Entities.getChildrenIDs() method
 2016-06-06 16:25:25 -07:00
SamGondelman
e7743cd8e2 added options for both hands (default), all devices, short pulse, and fixed touch timing mechanism 2016-06-06 15:03:08 -07:00
Ken Cooke
b60b9bb312 compiler fixes for GCC/clang 2016-06-06 14:54:15 -07:00
Atlante45
399517fcbd Activate Inputs after menus are setup 2016-06-06 13:28:36 -07:00
Atlante45
24bbb8db3f Remove input plugin menu dependency 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
5190d8ab6b Merge pull request #8023 from jherico/settings 
Eliminate extraneous writes for unchanged values
 2016-06-06 12:22:11 -07:00
Ken Cooke
8faaa36913 moved table of precomputed data into AudioSRCData.h 2016-06-06 12:05:48 -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 Hefta-Gaub
11effb6feb Merge pull request #8007 from hyperlogic/feature/avatar-recording-version 
Add version number to avatar recording frame
 2016-06-06 12:02:49 -07:00
Brad Hefta-Gaub
1782a6ba4a Merge pull request #8011 from hyperlogic/bug-fix/remove-avatar-data-warning 
Removed innocuous "AvatarData packet size mismatch" warning
 2016-06-06 12:02:34 -07:00
Seth Alves
d202a2bf11 better handling of missing settings keys 2016-06-06 11:59:39 -07:00
Ken Cooke
4f35d3df02 AVX2 code must be in /avx for CMAKE to compile it properly 2016-06-06 11:57:17 -07:00
Ken Cooke
34f46b860b AVX2 optimized audio resampler 2016-06-06 11:54:18 -07:00
Brad Davis
b7d1659852 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-06 09:32:33 -07:00
Seth Alves
880c4f18b5 Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid 2016-06-05 08:27:59 -07:00
Brad Hefta-Gaub
f2bedc546f Merge pull request #8019 from jherico/settings 
Eliminate file IO contentions for settings
 2016-06-04 21:04:50 -07:00
Brad Davis
bc81f00dc7 Eliminate extraneous writes for unchanged values 2016-06-04 20:47:10 -07:00
Brad Davis
65d8f65ed7 Fix unix builds, make settings ACID 2016-06-04 18:39:46 -07:00
Brad Davis
39dcd1f9bd Eliminate file IO contentions for the settings 2016-06-04 17:55:30 -07:00
Brad Hefta-Gaub
d9542107c2 Merge pull request #8006 from AndrewMeadows/convexification-2 
fix bad convex hull simplification
 2016-06-04 16:58:03 -07:00
Seth Alves
be403865fc don't request public keys for the standard psuedo-account-names 2016-06-04 10:44:59 -07:00
Seth Alves
80eeff5a64 bump packet versions. change how domainObject[RESTRICTED_ACCESS_FLAG] is decided 2016-06-04 10:32:07 -07:00
Seth Alves
adf893ea19 rename AgentPermissions to NodePermissions 2016-06-04 09:50:36 -07:00
Seth Alves
09b0e3eaaf use constants rather than bare strings for standard psuedo-account-names 2016-06-04 09:07:34 -07:00
Ken Cooke
89bfa5bc09 fixed typo 2016-06-03 19:22:29 -07:00
Ken Cooke
280289045c Revert change to reverb settings. 2016-06-03 18:48:23 -07:00
Ken Cooke
cd29aac185 Merge branch 'master' of github.com:kencooke/hifi 2016-06-03 18:42:30 -07:00
Ken Cooke
54293fdad0 Replace the linear interpolation embedded in the .WAV/.RAW loader with high quality polyphase resampling. 
When downsampling 48khz to 24khz, linear interpolation creates aliasing distortion that is quite audible.  This change greatly improves the audio quality for all sound assets.
 2016-06-03 18:39:43 -07:00
SamGondelman
2367cb1995 fixing input mapping for vive/touch grip button/trigger, script needs fixing 2016-06-03 15:07:21 -07:00
Anthony J. Thibault
3a5d5aab01 Removed innocuous "AvatarData packet size mismatch" warning 
This should not have been a warning, it is expected behavior when a BulkAvatarData packet is filled
with data from more then one avatar.
 2016-06-03 14:33:50 -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
Seth Alves
4cad94216c Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid 2016-06-03 13:16:08 -07:00
Seth Alves
b88bba8672 add code to convert older domain-settings to current style 2016-06-03 13:15:53 -07:00
Anthony J. Thibault
8f9fc08226 Add version number to avatar recording frame 
New recordings will have a version number of 1.
A missing version field indicates the initial version of 0.
Warn when playing back version 0 files which are no longer fully supported and fall back to default pose.
Playback of version 1 files should work as expected.
 2016-06-03 11:08:05 -07:00
Andrew Meadows
c2317adf06 undo ambitious cleanup (try again another day) 2016-06-03 11:06:36 -07:00
Andrew Meadows
3280a2b967 fix indentation 2016-06-03 10:47:54 -07:00
Andrew Meadows
f17330ea82 diff method for capping convex hull point count 2016-06-03 10:47:54 -07:00
Andrew Meadows
c73757f740 use many colors for collision hull rendering 2016-06-03 10:47:54 -07:00
Andrew Meadows
2a3da60ed4 remove some magic numbers 2016-06-03 10:47:54 -07:00
Andrew Meadows
eff59d3fd3 build compound sub meshes shapes with less copying 2016-06-03 10:47:54 -07:00
Andrew Meadows
bce8879d7c remove ShapeInfo::clearPoints() 
use getPoints() by ref and then clear
 2016-06-03 10:47:54 -07:00
Andrew Meadows
9dc0fa7796 don't automatically clear ShapeInfo points 2016-06-03 10:47:54 -07:00
Andrew Meadows
211bbb88e6 purge SHAPE_TYPE_ELLIPSOID which wasn't used 2016-06-03 10:47:54 -07:00
Andrew Meadows
7858ef84b3 don't copy points onto itself 2016-06-03 10:47:54 -07:00
Andrew Meadows
c066b4d4ac purge collision shape for ParticleEffectEntityItem 2016-06-03 10:47:54 -07:00
Andrew Meadows
5d9e320dd7 purge SHAPE_TYPE_LINE 2016-06-03 10:47:54 -07:00
Andrew Meadows
654468619c swap order of if-else blocks 2016-06-03 10:47:54 -07:00
Andrew Meadows
d591561a88 remove RenderableModelEntityItem::_points 
use ShapeInfo::_points instead
 2016-06-03 10:47:54 -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
Andrew Meadows
a22de76052 Merge pull request #8003 from ZappoMan/improveActionGlitches 
fix glitches when observer client watches object with action
 2016-06-03 09:35:12 -07:00
Brad Hefta-Gaub
1075ba1599 CR feedback 2016-06-03 08:01:09 -07:00
Brad Hefta-Gaub
7ed35399e9 make the application of redundant physics update idempotent to improve action glitches 2016-06-02 18:01:23 -07:00