Zach Fox
b8c45b0c30
Don't always do precision picking inside mouseMoveEvent
2017-08-09 14:23:43 -07:00
Seth Alves
af1e27dc36
Merge pull request #11053 from hyperlogic/feature/secondary-pose-support
...
Improved support for Vive Trackers on biceps
2017-08-07 13:11:48 -07:00
Seth Alves
c570d483d8
Merge pull request #11113 from elisa-lj11/zip_drag
...
Zip drag (needs review)
2017-08-07 03:17:31 -07:00
Seth Alves
83a30e2f35
missed some statics
2017-08-06 13:12:27 -07:00
Seth Alves
6f9460162d
avoid calling a pure virtual function from GLBackend dtor
2017-08-06 12:47:45 -07:00
Seth Alves
186035dc5d
adjust various things that cause a crash-on-exit on Linux
2017-08-06 11:57:55 -07:00
Elisa Lupin-Jimenez
af432087e3
small revisions to bracketing/variable name
2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
ebc28a6557
Renamed isBlocks to isZip, added debug print for non-entity files
2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
c6d5b1a5e6
Removed extraneous print statements
2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez
ed1ed4f3e0
Blocks drag does not work yet
2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez
ca6a323d54
Can drag blocks zip folder into hifi and upload the .obj
2017-08-04 16:57:48 -07:00
Anthony J. Thibault
98bbe887b9
Merge branch 'master' into feature/secondary-pose-support
2017-08-04 16:11:13 -07:00
Brad Davis
0e508432c4
PR comments
2017-08-04 15:27:33 -07:00
Brad Davis
86e3489167
Updates from Threaded Rendering project
2017-08-04 15:22:14 -07:00
anshuman64
83e50f894a
Merge pull request #11106 from seefo/tracked-objects
...
Added Vive pucks as an input channel and added new puck-attach script
2017-08-03 17:03:45 -07:00
Howard Stearns
71ce5a6494
Merge pull request #11016 from highfidelity/context-overlays
...
Context Overlays
2017-08-03 16:28:14 -07:00
Chris Collins
ddb7d0f1ba
Merge pull request #11112 from kencooke/audio-gate-bugfix
...
Possible fix for "screeching noise" after audio input device changes
2017-08-03 13:55:47 -07:00
vladest
a439cc1837
Make connection to tablet shown signal more consistent, eliminates missed signals
2017-08-03 20:58:44 +02:00
vladest
b049b0f415
Merge conflicts
2017-08-03 19:43:42 +02:00
Ken Cooke
6ea4ed80cd
Suppress initial PacketType::SilentAudioFrame on audio gate startup
2017-08-03 09:19:08 -07:00
Andrew Meadows
e465186511
Merge pull request #11048 from 1P-Cusack/21389
...
WL21389 PR1: Representation of collision shapes need updating (details below).
2017-08-03 09:04:31 -07:00
David Kelly
4b7779f0f5
add flag to outline render flags, fix pal.js/edit.js interaction
2017-08-03 07:57:21 -07:00
seefo
106b0ad8bb
Added Vive pucks as an input channel
2017-08-02 13:08:43 -07:00
vladest
638eeede43
Merge conflict
2017-08-02 20:07:06 +02:00
Seth Alves
728e7fb253
Merge pull request #11099 from druiz17/bug-blank-tablet-switch
...
fix blank tablet when switching between HMD and Desktop mode quickly
2017-08-02 10:09:56 -07:00
Seth Alves
2319006868
Merge pull request #11100 from hyperlogic/bug-fix/teleport-crash
...
Fix for crash when attempting to teleport while avatar was loading
2017-08-02 10:00:13 -07:00
Dante Ruiz
8d69cd8999
Merge branch 'master' of github.com:highfidelity/hifi into bug-blank-tablet-switch
2017-08-02 16:36:17 +01:00
Dante Ruiz
05f1caab01
better solution to help and blank tablet issues
2017-08-02 16:35:58 +01:00
vladest
2d4396ac8e
Merge branch 'master' into fix_toolbar_apps_switch
2017-08-02 16:34:49 +02:00
vladest
4330e31212
Toolbar mode: 1. Fixed switching between different apps. 2. Fixed switching from Create
2017-08-02 16:32:09 +02:00
Seth Alves
baad9f1af4
Merge pull request #11097 from druiz17/bug-entity-crash2
...
Lock the script engine in EntityEditPacketSender
2017-08-02 06:40:41 -07:00
Anthony J. Thibault
1b6feb63c8
Fix for crash when attempting to teleport while avatar was loading
...
The fix had two parts.
* Make Avatar::getAbsoluteDefaultJointXXXInObjectFrame thread safe
* Make teleport.js handle a zero foot offset more gracefully, to prevent the avatar from teleporting into the floor.
2017-08-01 18:40:43 -07:00
Anthony Thibault
8a87ebd2a8
Merge pull request #11036 from AndrewMeadows/walkabout
...
fix bugs preventing avatar from walking on spherical planet
2017-08-01 16:36:35 -07:00
David Kelly
6ae516c46a
Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde
2017-08-01 15:45:34 -07:00
Dante Ruiz
cca29e849b
fix issue of tablet begin blank when switching between HMD and Desktop mode
2017-08-01 23:18:42 +01:00
Anthony J. Thibault
25b5cb4762
Switch order of precondition and setSecondaryTargets
2017-08-01 13:17:33 -07:00
Dante Ruiz
c22e08f3e8
loacked script engine in EntityEditPacketSender
2017-08-01 19:58:23 +01:00
anshuman64
97b4fd4032
Merge pull request #11071 from vladest/fix_menu_landscape
...
Fix Landscape mode, when menu pushed in Create mode
2017-08-01 11:29:15 -07:00
LaShonda Hopper
0b79809f54
[WL21389] PR1 Feedback: Small change missed last commit (details below).
...
Until they're properly implemented, default the hedrons and polygons to
SHAPE_TYPE_ELLIPSOID within RenderableShapeEntity::computeShapeInfo.
Changes committed:
modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
2017-07-31 17:08:30 -04:00
David Kelly
bd7c4b3b26
Merge remote-tracking branch 'upstream/master' into context-overlays
2017-07-31 13:14:53 -07:00
Anthony J. Thibault
2383933252
Merge branch 'master' into feature/secondary-pose-support
2017-07-31 10:55:40 -07:00
Chris Collins
5bdaa4daa1
Merge pull request #11087 from jherico/crash_null_entity_element
...
Fix potential nullptr access in EntityTreeElement
2017-07-31 09:15:52 -07:00
vladest
e30e0b1a5f
Make sure Tablet will be shown with opened running scripts dialog. Fixed potential stack corruption
2017-07-31 16:45:21 +02:00
vladest
751f12df89
Merge branch 'master' into fix_opened_running_scripts
2017-07-30 19:25:55 +02:00
vladest
bb7110d81b
Desktop Running scripts window now closed and as soon as Tablet opened, it will show Running Script. TODO: make Tablet opens automatically
2017-07-30 19:22:54 +02:00
Brad Davis
861b33a845
Fix potential nullptr access in EntityTreeElement
2017-07-29 17:22:25 -07:00
Brad Davis
17b06e8e12
Fix log warnings from non-notifiable properties
2017-07-29 11:54:39 -07:00
vladest
0333849aa8
Merge branch 'master' into fix_menu_landscape
2017-07-29 11:44:58 +02:00
Stephen Birarda
17dd028ec7
make Paths available to desktop and tablet QML context
2017-07-28 14:23:18 -07:00
LaShonda Hopper
cc4fbc97cd
[WL21389] PR1 Update based on code review discussion & feedback (details below).
...
* Removed some left overs from prior approach.
* Moved _collisionShapeType & getShapeType override from ShapeEntityItem to
RenderableShapeEntityItem (see thread: https://github.com/highfidelity/hifi/pull/11048#discussion_r130154903 )
* Switched _collisionShapeType default from SHAPE_TYPE_NONE to SHAPE_TYPE_ELLIPSOID
** see thread: https://github.com/highfidelity/hifi/pull/11048#discussion_r129982909
Note(s):
* Retested and the cylinder behaves as expected along with the Box & Sphere shapes
save from the previously mentioned caveats in the PR notes (https://github.com/highfidelity/hifi/pull/11048 )
* Confirmed that currently unsupported shapes (hedrons, polygons, & cone) fallback to
ellipsoid behavior given default change.
Changes Committed:
modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
modified: libraries/entities-renderer/src/RenderableShapeEntityItem.h
modified: libraries/entities/src/ShapeEntityItem.cpp
modified: libraries/entities/src/ShapeEntityItem.h
modified: libraries/shared/src/ShapeInfo.cpp
2017-07-28 15:59:17 -04:00
