Elisa Lupin-Jimenez
|
a246c59277
|
changed debug print for unsupported entity files
|
2017-08-04 16:59:21 -07:00 |
|
Elisa Lupin-Jimenez
|
8c9ce82986
|
Fixed Mac and Ubuntu platform build issue (hopefully)
|
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
|
06ff766952
|
Drag zip cleaned up, marketplaces stylized, back button fixed
|
2017-08-04 16:58:33 -07:00 |
|
Elisa Lupin-Jimenez
|
692aa4c4b9
|
Clara download working again, still can drag in Blocks zip
|
2017-08-04 16:58:15 -07:00 |
|
Elisa Lupin-Jimenez
|
c6d5b1a5e6
|
Removed extraneous print statements
|
2017-08-04 16:58:15 -07:00 |
|
Elisa Lupin-Jimenez
|
c3d943ff72
|
Drag zip folder works
|
2017-08-04 16:57:48 -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
|
86e3489167
|
Updates from Threaded Rendering project
|
2017-08-04 15:22:14 -07:00 |
|
Brad Hefta-Gaub
|
57f62f59fb
|
Merge pull request #11110 from Armads/WL21423
Camera mode on startup is determined by user settings and HMD status
|
2017-08-04 13:16:34 -07:00 |
|
Brad Hefta-Gaub
|
0f85769098
|
Merge pull request #11116 from vladest/fix_menu_caps
Cleanup top menu on menu re instantiation
|
2017-08-04 12:37:14 -07:00 |
|
Brad Hefta-Gaub
|
0d0a1af166
|
Merge pull request #11085 from jherico/script_console_crash
Fix for potential crash in JS console
|
2017-08-04 11:44:20 -07:00 |
|
Anthony J. Thibault
|
9fdc044ae1
|
Crash fix for web3d overlays that are not the tablet.
|
2017-08-04 11:19:59 -07:00 |
|
Anthony J. Thibault
|
85500841fb
|
Crash fix for avatars that are missing "Hips", "Head" and other required joints.
|
2017-08-04 11:19:09 -07:00 |
|
Dante Ruiz
|
9be60ee658
|
made more requested changes
|
2017-08-04 17:57:53 +01:00 |
|
Dante Ruiz
|
b72ac63662
|
Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts
|
2017-08-04 17:19:06 +01:00 |
|
vladest
|
9058a8e2ca
|
Cleanup top menu on menu reinstantiation
|
2017-08-04 16:36:00 +02: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 |
|
druiz17
|
27f508ad9b
|
Merge pull request #11088 from vladest/fix_opened_running_scripts
Fix opened running scripts
|
2017-08-03 13:09:50 -07:00 |
|
Chris Collins
|
6d57b4df38
|
Merge pull request #11108 from jherico/installer_remove_pdb
Fix installer issues
|
2017-08-03 12:51:58 -07:00 |
|
Armads
|
dff4e6e32c
|
WL21423 Changing order of camera setup steps
|
2017-08-03 15:40:38 -04:00 |
|
vladest
|
b049b0f415
|
Merge conflicts
|
2017-08-03 19:43:42 +02:00 |
|
David Kelly
|
4b7779f0f5
|
add flag to outline render flags, fix pal.js/edit.js interaction
|
2017-08-03 07:57:21 -07:00 |
|
Armads
|
24718e2424
|
WL21423 Camera mode on startup is determined by user settings and HMD status
|
2017-08-03 09:03:23 -04:00 |
|
Dante Ruiz
|
1e1ddf2941
|
making requested changes
|
2017-08-02 22:22:55 +01:00 |
|
Brad Davis
|
5a7a6bab70
|
Remove PDB files, eliminate sixense
|
2017-08-02 14:08:46 -07:00 |
|
seefo
|
106b0ad8bb
|
Added Vive pucks as an input channel
|
2017-08-02 13:08:43 -07:00 |
|
druiz17
|
6680be2a03
|
Merge pull request #11103 from vladest/fix_toolbar_apps_switch
Fix toolbar apps switch
|
2017-08-02 12:59:31 -07:00 |
|
vladest
|
7d361c69c2
|
Audio mic bar show only rectangle on mouse over
|
2017-08-02 19:52:47 +02:00 |
|
Dante Ruiz
|
90db4aa9c0
|
Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts
|
2017-08-02 18:18:17 +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 |
|
David Kelly
|
588afaaa85
|
unused variable...
|
2017-08-01 16:59:42 -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
|
762b409814
|
unused variable
|
2017-08-01 16:20:33 -07:00 |
|
David Kelly
|
479d6abc58
|
Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde
|
2017-08-01 16:18:20 -07:00 |
|
David Kelly
|
6ae516c46a
|
Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde
|
2017-08-01 15:45:34 -07:00 |
|
anshuman64
|
9bf4977e09
|
Merge pull request #11096 from humbletim/21487
WL 21487: Fix Camera behavior in Mirror mode
|
2017-08-01 14:59:06 -07:00 |
|
Dante Ruiz
|
51652482a4
|
Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts
|
2017-08-01 20:51:56 +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 |
|
humbletim
|
3a9b8c02a6
|
* disable Avatar "follow" / recentering behavior when using HMD + "View > Mirror"
* restore access to "View > Mirror" from HMD mode
|
2017-08-01 13:41:28 -04:00 |
|
Brad Davis
|
bea91be521
|
Fix for potential crash in JS console
|
2017-07-31 17:50:30 -07:00 |
|
David Kelly
|
b371c875c4
|
undo tab mapping to bring up tablet, for now
|
2017-07-31 14:46:26 -07:00 |
|
David Kelly
|
43c8079f03
|
temporary inspectionMode setting to turn ContextOverlays completely off/on
|
2017-07-31 13:55:43 -07: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 |
|
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 |
|
Olivier Prat
|
490aad2a06
|
Merged from master
|
2017-07-31 12:00:35 +02:00 |
|
Brad Davis
|
7d18d2e017
|
Restore corrected touch event simulation
|
2017-07-29 08:51:51 -07:00 |
|
vladest
|
3c9ab36416
|
Remove already already implemented fix
|
2017-07-29 12:00:41 +02:00 |
|
vladest
|
0333849aa8
|
Merge branch 'master' into fix_menu_landscape
|
2017-07-29 11:44:58 +02:00 |
|
Brad Davis
|
5946a965da
|
Disable touch event emulation for tablet until we fix crash
|
2017-07-28 18:54:16 -07:00 |
|
Chris Collins
|
cfd9f8b64e
|
Merge pull request #11077 from jherico/overlay_event_crashes
Fix overlay event handling thread issues
|
2017-07-28 15:56:09 -07:00 |
|
anshuman64
|
e11388f7f7
|
Merge pull request #11068 from ctrlaltdavid/dominant-hand-signal
Add a "dominant hand changed" signal
|
2017-07-28 15:17:50 -07:00 |
|
Brad Davis
|
d42052a299
|
Fix overlay event handling thread issues
|
2017-07-28 14:56:21 -07:00 |
|
Stephen Birarda
|
17dd028ec7
|
make Paths available to desktop and tablet QML context
|
2017-07-28 14:23:18 -07:00 |
|
Andrew Meadows
|
d4e72df928
|
Merge pull request #10711 from burtsloane/midi
Midi support for Entities
|
2017-07-28 10:51:43 -07:00 |
|
utkarshgautamnyu
|
f407bf6f5a
|
Merge pull request #11064 from highfidelity/bug/6513
Enabled multiple selection and deletion in Asset Browser
|
2017-07-28 09:46:34 -07:00 |
|
Andrew Meadows
|
3ec9640ea1
|
fix calculation of walk motor for HMD
|
2017-07-28 09:22:47 -07:00 |
|
vladest
|
45934cb53e
|
Fix Landscape mode, when menu pushed in Create mode. Fix pages gets white in Create mode
|
2017-07-28 18:04:29 +02:00 |
|
Brad Davis
|
bb57504498
|
Prevent deadlocks from Overlays update logic recursing into other Overlays calls
|
2017-07-27 19:39:22 -07:00 |
|
David Rowe
|
c1d179eba1
|
Add "dominant hand changed" signal
|
2017-07-28 14:20:49 +12:00 |
|
Brad Hefta-Gaub
|
d572510770
|
Merge pull request #11009 from AndrewMeadows/fix-QueryAACube
update EntityItem bounding cube when on changed dimensions
|
2017-07-27 18:21:06 -07:00 |
|
Anthony J. Thibault
|
6c2b6674bb
|
load and save shoulderConfig to settings.
|
2017-07-27 17:33:54 -07:00 |
|
utkarshgautamnyu
|
1beec26003
|
Update TabletAssetServer.qml
|
2017-07-27 15:55:55 -07:00 |
|
utkarshgautamnyu
|
a6a4bd5923
|
Update AssetServer.qml
|
2017-07-27 15:55:30 -07:00 |
|
utkarshgautamnyu
|
07fc9a6dc3
|
Indentation fixes
|
2017-07-27 14:53:49 -07:00 |
|
utkarshgautamnyu
|
4680911264
|
Enabled multiple selection and multiple deletion in asset browser
|
2017-07-27 14:47:30 -07:00 |
|
Brad Hefta-Gaub
|
9b3be6d164
|
Merge pull request #10808 from humbletim/21400
WL 21400 -- Setting that lets you switch from cursor to reticle
|
2017-07-27 13:16:58 -07:00 |
|
Anthony J. Thibault
|
bcb4cc32d2
|
another clang error fix
|
2017-07-27 10:26:10 -07:00 |
|
Anthony J. Thibault
|
778c8bf9a7
|
clang build error fix
|
2017-07-27 10:08:35 -07:00 |
|
anshuman64
|
bcb819206b
|
Merge pull request #11037 from sethalves/bug-camera-mode-mods
use Qt menu hotkeys to drive camera-mode changes
|
2017-07-27 09:44:53 -07:00 |
|
Anthony J. Thibault
|
8f5c41af2d
|
changed _controllerPoseMap from unordered_map to map
|
2017-07-27 09:44:37 -07:00 |
|
Anthony J. Thibault
|
78c6564174
|
Merge branch 'master' into feature/secondary-pose-support
|
2017-07-27 09:09:32 -07:00 |
|
Anthony J. Thibault
|
8dc9714282
|
Pass armCircumference and shoulderWidth to qml.
|
2017-07-27 09:08:34 -07:00 |
|
Chris Collins
|
853101fcbc
|
Merge pull request #10928 from 1P-Cusack/21362
Add point and thumb up gestures to the Vive.
|
2017-07-26 22:07:14 -07:00 |
|
Zach Fox
|
8a7561d61b
|
IT'S WORKING SOB SOB SOB
|
2017-07-26 16:35:55 -07:00 |
|
Zach Fox
|
39cb0bc357
|
WHYYYY DOESN'T THIS WORK
|
2017-07-26 16:14:35 -07:00 |
|
Seth Alves
|
9c9cfad4c4
|
use ctrl rather than alt to activate camera-mode shortcuts
|
2017-07-26 15:56:08 -07:00 |
|
Seth Alves
|
71023bcb1b
|
Merge branch 'master' of github.com:highfidelity/hifi into bug-camera-mode-mods
|
2017-07-26 15:54:57 -07:00 |
|
Zach Fox
|
3a05219c59
|
Closer still
|
2017-07-26 14:10:41 -07:00 |
|
burtsloane
|
d4ae298a8d
|
Merge branch 'master' into midi
|
2017-07-26 13:59:07 -07:00 |
|
Burt Sloane
|
4f7243e444
|
Merge branch 'master' of https://github.com/burtsloane/hifi into midi
|
2017-07-26 13:30:57 -07:00 |
|
Zach Fox
|
65c28ca821
|
Bugfixes
|
2017-07-26 13:17:51 -07:00 |
|
Zach Fox
|
62f6c10b2b
|
Renaming things; bugfixes; improvements
|
2017-07-26 12:45:10 -07:00 |
|
Zach Fox
|
24ddbb4b22
|
Silly bug preventing the whole thing from working
|
2017-07-26 12:08:55 -07:00 |
|
Zach Fox
|
9147bc21d0
|
Getting there.
|
2017-07-26 11:41:27 -07:00 |
|
utkarshgautamnyu
|
71ddf1e7c1
|
Removed Compound Collision type
|
2017-07-26 10:20:17 -07:00 |
|
Zach Fox
|
9020607ccf
|
First pass
|
2017-07-25 17:54:46 -07:00 |
|
utkarshgautamnyu
|
24f4468fd5
|
added additional collision types to asset browser in tablet mode
|
2017-07-25 17:12:13 -07:00 |
|
utkarshgautamnyu
|
65192aa620
|
added additional collision types to asset browser and new model dialog
|
2017-07-25 17:12:13 -07:00 |
|
Anthony J. Thibault
|
572213daaf
|
Added shoulder config to Controller Settings UI
All offset values in Controller Settings UI are now in cm.
|
2017-07-25 17:05:07 -07:00 |
|
Zach Fox
|
7702bfceaa
|
Big cleanup and preparation; Actually fix desktop tablet
|
2017-07-25 16:12:32 -07:00 |
|
1P-Cusack
|
9e25c3b7d8
|
Renaming 'not' route to 'logicalNot'.
Build was failing on non-windows platforms because 'not' is a reserved
word in C++ (which Visual Studio happily ignores).
|
2017-07-25 14:47:34 -04:00 |
|
Zach Fox
|
c71dca5b4b
|
Missed a magic number
|
2017-07-25 11:15:44 -07:00 |
|
Zach Fox
|
256b7efdd2
|
Handle the case when the camera is inside the bounding box of an entity
|
2017-07-25 11:06:54 -07:00 |
|
Zach Fox
|
40038ce54b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays
|
2017-07-25 09:33:07 -07:00 |
|