Wayne Chen
b8d8710604
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-19 09:02:16 -08:00
humbletim
21030fbe5b
Merge remote-tracking branch 'upstream/master' into fb18302-deprecated-package-model
2018-11-14 23:40:04 -05:00
Wayne Chen
c85b840db0
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-14 14:47:56 -08:00
Seth Alves
969776e476
Merge pull request #14312 from ctrlaltdavid/M18577
...
Add option to start up at home location
2018-11-13 09:29:37 -08:00
Wayne Chen
f66326fc4d
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-08 15:51:24 -08:00
Dante Ruiz
f664421fe0
addressing code review feedback
2018-11-08 09:58:53 -08:00
Dante Ruiz
501746b156
3D Keyboard
2018-11-08 09:58:53 -08:00
Wayne Chen
9beedf9292
changing login overlay size + add keyboard
2018-11-06 12:56:50 -08:00
Zach Fox
d6477993a1
Make it work better with the tablet
2018-11-01 13:08:00 -07:00
Zach Fox
d4e9a70564
Almost there
2018-10-31 16:12:16 -07:00
Zach Fox
41a0d09389
First pass
2018-10-31 15:31:51 -07:00
David Rowe
ae2715af31
Add option to start up at home location
2018-11-01 08:57:12 +13:00
Jeff Clinton
eb383b1d09
Merge pull request #14040 from hyperlogic/feature/acceleration-limit-filter
...
Quality Improvements to Avatars driven by Vive Trackers
2018-10-25 08:51:59 -07:00
Alexia Mandeville
68ab5475fe
Remove duplicate display crash options
2018-10-23 14:13:09 -07:00
Alexia Mandeville
178b8ef37b
Removed duplicate menu items
...
Removed duplicates:
Console...
API Debugger
2018-10-23 12:55:02 -07:00
Alexia Mandeville
3cc78896ac
Removed duplicate speech control menu item
2018-10-22 15:39:23 -07:00
humbletim
f7cfc61494
Package Model... -> Package Avatar...
2018-10-22 15:02:33 -04:00
Anthony Thibault
640ed6a32a
Added "Developer > Avatar > Show Tracked Objects" menu
2018-10-15 12:42:07 -07:00
Alexia Mandeville
d769f83cdd
Merge branch 'master' into menu-updates
2018-10-02 16:43:08 -07:00
Ryan Huffman
09b2565e76
Remove UndoStack API
...
edit.js shares a global undo stack through the UndoStack API. Because
the stack is globally shared, disabling the feature while create is
disabled doesn't make a lot of sense because it might disabling the
ability to undo/redo with another feature. Because UndoStack is only
used by edit.js, UndoStack is being removed in favor of a local undo
stack implemented within edit.js.
2018-09-26 14:43:11 -07:00
Seth Alves
cb33222fea
Merge pull request #13886 from ctrlaltdavid/M17901
...
Improve HMD Menu page navigation
2018-09-10 11:34:21 -07:00
Anthony Thibault
acc7f1f168
Moved AnimStats into its own qml panels.
...
Added state machine tracking as well.
2018-09-06 16:18:58 -07:00
Alexia Mandeville
200d862a08
Merge branch 'menu-updates' of https://github.com/alexiamandeville/hifi into menu-updates
2018-08-31 09:56:15 -07:00
Alexia Mandeville
90e98f1608
Moving Log to root Developer menu
2018-08-31 09:55:46 -07:00
David Rowe
ed441d5570
Merge branch 'master' into M17901
2018-08-31 14:30:11 +12:00
Alexia Mandeville
718c32fb8c
Merge branch 'master' into menu-updates
2018-08-30 23:05:10 +01:00
Alexia Mandeville
1233c2ec0d
Moving root settings into preferred submenus
2018-08-30 14:46:53 -07:00
Alexia Mandeville
9267919d7f
Resorting Developer menu organiztion
2018-08-29 16:49:27 -07:00
SamGondelman
0c8a4cc81e
merge with master
2018-08-28 17:31:51 -07:00
David Rowe
c29c9f98c1
Make Cancel in HMD settings dialogs return to Settings dialog
2018-08-28 11:15:57 +12:00
SamGondelman
70f4d0c634
Merge remote-tracking branch 'upstream/master' into perf
2018-08-24 14:04:37 -07:00
SamGondelman
c474f38860
force coarse picking, sort avatars
2018-08-22 18:07:16 -07:00
John Conklin II
32562511e8
Merge pull request #13782 from ElderOrb/FB17184
...
Add Support for Managing Avatar Entities to the Avatar App
2018-08-22 10:20:04 -07:00
Alexander Ivash
5ba68cbfac
remove attachments menu item / dialogs / related components
2018-08-11 00:50:32 +03:00
SamGondelman
1ba28de5b6
try to fix nodelist not getting destroyed
2018-08-01 17:52:27 -07:00
SamGondelman
8a9c27ed92
Merge remote-tracking branch 'upstream/master' into destroy
2018-08-01 16:07:48 -07:00
Seth Alves
965c35292c
put back old-style avatar-attachments menu-item
2018-07-19 11:32:19 -07:00
Alexander Ivash
929fec731c
remove 'Avatar' top level menu & 'Avatar...' item in settings menu per request from Mukul
2018-07-06 21:00:54 +03:00
SamGondelman
7954865141
trying to fix dependency shutdown
2018-07-05 14:34:37 -07:00
r3tk0n
4426173021
Moved "Show Overlays" menu item to Developer Menu
2018-07-03 11:56:34 -07:00
Dante Ruiz
7f7ca677f0
mac - moving general settings back under settings
2018-06-25 14:23:37 -07:00
Elisa Lupin-Jimenez
b255cf0ba9
Merge pull request #13389 from AndrewMeadows/misc-001
...
crash fixes, removing unnecessary writes, and misc cleanup
2018-06-18 09:19:22 -07:00
John Conklin II
2483c45f40
Merge pull request #13350 from sabrina-shanman/bulletcollisionrenderonly
...
Remove functionality for rendering collision models directly in the Model class
2018-06-15 14:46:40 -07:00
Andrew Meadows
be0899c41d
remove unnecessary writes to appease Xcode's static analyzer
2018-06-15 11:44:22 -07:00
Clement
920263ef49
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
2018-06-12 17:00:25 -07:00
sabrina-shanman
4c39d08358
Remove "Draw Collision Shapes" option from developer physics menu
2018-06-11 11:03:57 -07:00
Anthony Thibault
044d142635
Merge pull request #13133 from amantley/nativeCGCode
...
Center of Gravity Leaning
2018-06-08 17:53:55 -07:00
Seth Alves
6c8e514367
Merge pull request #13224 from danteruiz/fix-key-conflicts
...
Allow using the key 1,2,3 to swicth views and also to enter text in web entity or overlay
2018-06-06 11:08:04 -07:00
Anthony J. Thibault
c3d1daf855
Merge branch 'master' into nativeCGCode
2018-06-04 09:32:38 -07:00
Dante Ruiz
606b6d8947
fix code standard issue
2018-06-04 09:16:39 -07:00
