barnold1953
03bc3a9ff8
Added checkable menu option for laser toggle
2014-07-21 12:35:46 -07:00
Philip Rosedale
e8539d0006
Merge pull request #3181 from birarda/master
...
foundation of support for signed transactions from interface
2014-07-17 16:03:28 -07:00
Stephen Birarda
45ae9f614d
add dialog to Menu to insert wallet private key
2014-07-17 11:43:30 -07:00
Andrew Meadows
b22652f441
merge upstream/master into andrew/ragdoll
2014-07-17 10:52:27 -07:00
Atlante45
5dca794322
On/Off for activity logger
2014-07-16 12:22:27 -07:00
Andrew Meadows
922912b784
merge upstream/master into andrew/ragdoll
...
Conflicts:
interface/src/Menu.h
2014-07-16 09:00:36 -07:00
Andrew Meadows
d832f5bec8
fix menu config of visible stats
2014-07-11 16:08:37 -07:00
Andrew Meadows
2046608fa8
enforce alphabetical sort of Menu option strings
2014-07-10 16:16:54 -07:00
Brad Hefta-Gaub
635cb380f2
Merge pull request #3151 from ctrlaltdavid/19860
...
Code Review for Job #19860
2014-07-09 18:35:01 -07:00
David Rowe
f2d49fa6a1
Rename focus indicators menu item and default to off
2014-07-09 15:12:29 -07:00
David Rowe
527f6b2a3f
Fix User Interface menu item string
2014-07-09 11:32:38 -07:00
Clément Brisset
3f24feeb1d
Merge pull request #3143 from PhilipRosedale/master
...
Add Low Velocity Filter for hand movement as menu option
2014-07-08 23:22:46 -07:00
Clément Brisset
2003dc41df
Merge pull request #3138 from ctrlaltdavid/19836
...
Code Review for Job #19836
2014-07-08 23:16:32 -07:00
Philip Rosedale
c50d9ae3e4
Hand low velocity filter as a menu option
2014-07-08 22:22:27 -07:00
David Rowe
305623d8a7
Add option to hide focus indicators
2014-07-08 21:37:08 -07:00
wangyix
6ee52e97c8
added dev menu option to disable _audioOutput overflow check
2014-07-08 12:23:43 -07:00
David Rowe
8b04a9c8b6
Add toggle for user interface display
...
- "/" toggles UI (incl. stats if displayed); menu View > User Interface
- "%" = toggle status; menu View > Stats
- Acts on normal, 3DTV, and Oculus display.
2014-07-03 16:19:05 -07:00
Ryan Huffman
ccc638d8c1
Merge branch 'master' of git://github.com/highfidelity/hifi into 19800
2014-07-01 20:03:54 -07:00
Ryan Huffman
83349e0e53
Rename UserLocationsWindow to UserLocationsDialog
2014-07-01 20:03:05 -07:00
Ryan Huffman
51e42221be
Update menu to toggle User Locations Menu
2014-06-30 22:24:27 -07:00
barnold1953
1cd2066e79
Added option to disable glow effect for 10fps boost for oculus
2014-06-30 17:13:47 -07:00
barnold1953
2727328729
Removed unneeded menu option
2014-06-30 16:46:25 -07:00
Ryan Huffman
33e11be3e0
Add user locations to menu
2014-06-26 16:06:49 -07:00
Clément Brisset
463ac9cc74
Merge pull request #3078 from PhilipRosedale/master
...
Improved toy ball, JS calls for palm position, concertCamera.js
2014-06-26 11:03:48 -07:00
Philip Rosedale
58d460da09
option to turn on/off string hair
2014-06-25 15:14:17 -07:00
Ryan Huffman
5ece424a45
Merge branch 'master' of git://github.com/highfidelity/hifi into 19644
...
Conflicts:
interface/ui/runningScriptsWidget.ui
2014-06-24 20:27:44 -07:00
Ryan Huffman
7a08ac76d2
Merge branch 'master' of git://github.com/highfidelity/hifi into 19644
...
Conflicts:
interface/src/Menu.cpp
interface/ui/preferencesDialog.ui
2014-06-17 20:27:16 -07:00
Andrew Meadows
b9d4545aef
merge upstream/master into andrew/ragdoll
...
Conflicts:
libraries/shared/src/Shape.h
libraries/shared/src/ShapeCollider.h
2014-06-17 17:03:16 -07:00
Andrew Meadows
5bd37acdb8
Changed RagDoll to Ragdoll
2014-06-13 11:55:39 -07:00
barnold1953
e4a0275f57
Exposed sixense and mouse options and oculus UI angle to preferences
2014-06-13 10:53:11 -07:00
Brad Hefta-Gaub
e8ba3c8bb1
Merge pull request #3019 from ctrlaltdavid/19769
...
Code Review for Job #19769
2014-06-12 17:31:53 -07:00
barnold1953
bc293071d6
Removed left handed menu option
2014-06-12 12:25:22 -07:00
barnold1953
84e01e6b25
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-06-11 17:22:30 -07:00
barnold1953
2fec7400e2
Added menu options for sixense mouse input
2014-06-11 17:21:59 -07:00
Stephen Birarda
82bf6002e2
only display the OAuthWebViewHandler when we need to ask user for authorization
2014-06-11 14:57:05 -07:00
Ryan Huffman
355fe01490
Merge branch 'master' of git://github.com/highfidelity/hifi into 19644
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/ui/PreferencesDialog.cpp
interface/src/ui/RunningScriptsWidget.cpp
interface/ui/preferencesDialog.ui
interface/ui/runningScriptsWidget.ui
2014-06-11 13:30:47 -07:00
David Rowe
39e3deb9b9
Add menu item that toggles VR display mode
...
Toggles the display mode if a Rift is found connected at program start.
2014-06-10 15:03:07 -07:00
Brad Hefta-Gaub
f3fb39574f
Merge pull request #3007 from wangyix/master
...
Added Developer menu option to disable nack packets.
2014-06-09 18:11:01 -07:00
wangyix
ffda98fe0b
var name change again
2014-06-09 17:50:29 -07:00
wangyix
4665df4d1f
nackdisable to disablenack
2014-06-09 17:41:20 -07:00
wangyix
de61029f05
Added dev menu option to disable nack packets
2014-06-09 17:30:09 -07:00
Andrzej Kapolka
28490f9bbc
Merge pull request #2994 from AndrewMeadows/ragdoll
...
Ragdoll Part 2: make MyAvatar's skeleton's collision shapes follow ragdoll
2014-06-09 11:55:19 -07:00
Stephen Birarda
7da091d2b4
initial hooks for stereo audio
2014-06-06 10:15:09 -07:00
Andrew Meadows
551029c2f5
slave SkeletonModel's collision shapes to RagDoll
2014-06-06 08:51:22 -07:00
barnold1953
4ed03e996a
Added Oculus Options menu
2014-06-02 16:15:51 -07:00
ZappoMan
22a8f88195
add support for Menu.menuExists() and menu.menuItemExists()
2014-05-31 13:24:07 -07:00
AndrewMeadows
5b74829318
Merge pull request #2955 from ey6es/cascade
...
Basic cascaded shadow maps for increased shadow draw distance.
2014-05-29 18:57:44 -07:00
ZappoMan
ac22cebde1
more performance stats debugging
2014-05-29 17:41:40 -07:00
Andrzej Kapolka
67921c474e
Merge branch 'master' of https://github.com/highfidelity/hifi into cascade
2014-05-29 17:09:09 -07:00
Andrzej Kapolka
09231f01f3
Retain "simple" shadows, supply cascaded as option.
2014-05-29 12:48:41 -07:00
