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
David Rowe
ed441d5570
Merge branch 'master' into M17901
2018-08-31 14:30:11 +12: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
Dante Ruiz
68b18def22
fix copy delete cut paste commands and menus
2018-05-25 15:49:19 -07:00
Dante Ruiz
9a25a74834
fix copy delete cut paste commands and menus
2018-05-25 15:34:17 -07:00
Dante Ruiz
c2ceb48a28
fixing key conflicts
2018-05-23 14:16:05 -07:00
Dante Ruiz
5fb08d0d9c
fix speech api not showing up
2018-05-21 14:21:21 -07:00
druiz17
bd3a9865bf
moving control speech to developer menu
2018-05-19 18:27:28 -07:00
Dante Ruiz
3b59af3ed7
Merge branch 'master' of github.com:highfidelity/hifi into menu-updates
2018-05-18 16:42:31 -07:00
Dante Ruiz
ea771c2325
make final changes
2018-05-18 09:21:41 -07:00
Clement
da08d747dc
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
2018-05-17 12:10:08 -07:00
vladest
eb25601856
Return back LOD tools
2018-05-17 20:41:50 +02:00
samcake
ade1d6c056
use the correct call to toggle the debugFXAA on the AaConfig
2018-05-16 15:37:13 -07:00
Dante Ruiz
f8e9afb115
fixing damn build issues
2018-05-16 15:08:09 -07:00
Dante Ruiz
3be4b01d2c
move overlays menu back
2018-05-16 14:36:55 -07:00
Dante Ruiz
237b0d7483
Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates
2018-05-16 13:49:02 -07:00
Dante Ruiz
fbc3d97af3
adding back overlay menu and avatar size
2018-05-16 13:48:29 -07:00
samcake
21e069c90c
Adding a toggle button to the developer/Render menu to be able to disable taa and fall back to Fxaa
2018-05-16 13:09:55 -07:00
vladest
8c146521cf
remove double crash options
2018-05-16 21:10:51 +02:00
Dante Ruiz
e676348c4f
fixing some menu reog bugs
2018-05-16 10:40:28 -07:00
Dante Ruiz
71633105de
adding back some menus
2018-05-15 11:31:58 -07:00
Dante Ruiz
82422edb59
fixinig the controller settings page and have menu option on by default
2018-05-14 18:51:39 -07:00
vladest
2a3004079e
About UI
2018-05-14 23:22:06 +02:00
vladest
f8ebe7e669
remoed no more used LOD dialogs. Fixed Slider properties min and max settings
2018-05-12 16:01:43 +02:00
vladest
399e18dfc1
Disable non implemented sound notifications until further notice
2018-05-10 10:28:48 +02:00
amantley
3a10cacec0
1.added the swing twist code to update the follow rotation in MyAvatar.cpp
...
2.added step.js and cg_lean.js to the developer folder
3.added menu item for toggling the hips following between head and hips
4.added new function to return true if the root of MyAvatar is translating
to be under the head. Used to smooth the path of the hips
5.added computeCounterBalance to MyAvatar.h and cpp
6.added the menu item under developer/avatar to enable debug draw of the base of support in menu.h menu.cpp MyAvatar.h MyAvatar.cpp
7.added head yaw into the calculation of the hip rotation for the center
of gravity. This is already was happening in the deriveBodyFromHMD code
that is default
8.Changed Constants in Avatar constants for the base of support
9.fixed the over rotation of the shoulders
10.fixed scaling problem in cg computation
11.added room for going up on the toes without stretching
2018-05-07 17:41:35 -07:00
vladest
afe04f3a4f
cleanup
2018-05-06 14:24:54 +02:00
vladest
1794113f37
Check global switch as well
2018-05-06 12:51:59 +02:00