Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 01:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
51263 commits 25 branches 0 tags 1.1 GiB
Commit graph

101 commits

Author SHA1 Message Date
Seth Alves
838d7f6f10 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-14 13:58:18 -08:00
David Rowe
625f5efdf8 Merge branch 'master' into 21164 
# Conflicts:
#	scripts/system/audio.js
 2017-02-15 10:00:52 +13:00
Dante Ruiz
968ba1e03d updated file headers 2017-02-14 16:08:25 +00:00
Dante Ruiz
773ade5b61 removing qml errors 2017-02-14 07:46:34 -08:00
Dante Ruiz
8fbcead6d1 removed/renamed some files 2017-02-14 07:46:33 -08:00
Dante Ruiz
948352cdb6 general preferences work on tablet 2017-02-14 07:46:33 -08:00
Dante Ruiz
888d4ff706 basic prefreneces done 2017-02-14 07:46:32 -08:00
Dante Ruiz
46cfa7cf13 saving work 2017-02-14 07:46:31 -08:00
Seth Alves
d40402faae Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-14 06:53:34 -08:00
Anthony J. Thibault
1c783031b1 Removed ColorOverlay from TabletButton, added more icon & text states 
Now uses separate images for each state. Now tabletButtonProxy has 4 state properties, one for icon and images.

  * icon
  * hoverIcon
  * activeIcon
  * activeHoverIcon

  * text
  * hoverText
  * activeText
  * activeHoverText

Updated scripts to set new button states, if necessary.
 2017-02-13 15:09:46 -08:00
David Rowe
77f0fb1491 Change the "Mute" tablet button to "Audio" 2017-02-11 22:40:19 +13:00
David Rowe
a08347936e Make clicking the tablet mic icon or audio bar toggle the mute state 2017-02-11 15:11:27 +13:00
Seth Alves
44aa3e044b make it so near grabbing while edit is active doesn't select a new entity 2017-02-10 16:56:53 -08:00
Seth Alves
fead52f626 put new-entity buttons in a tab of the edit app 2017-02-10 15:18:01 -08:00
David Rowe
acaf8c69c6 Better tablet mic muted and unmuted iconography 2017-02-11 11:07:31 +13:00
Seth Alves
0b358a2ac7 finish hooking up new-model dialog 2017-02-10 13:29:06 -08:00
David Rowe
b5b92c1508 Make the tablet's mic icon reflect the current mute state 2017-02-11 09:53:02 +13:00
Seth Alves
e851ece343 merge from upstream 2017-02-10 12:09:00 -08:00
Seth Alves
3171ce1602 hook up more of new-model dialog 2017-02-10 12:03:26 -08:00
Seth Alves
7a63b07462 attempting to handle new-model dialog 2017-02-09 17:14:10 -08:00
Seth Alves
d0d13cdde1 fix tab titles 2017-02-09 15:52:15 -08:00
Seth Alves
e12c77e576 move the edit tabs into tablet 2017-02-09 14:43:44 -08:00
Seth Alves
c4ac719d2c merge from upstream + cleanups 2017-02-09 14:26:29 -08:00
Seth Alves
4c3a6842a5 start on moving edit.js to tablet 2017-02-09 14:03:01 -08:00
Dante Ruiz
6bc685b02a saving work 2017-02-09 07:13:29 -08:00
Dante Ruiz
5c5ace7c7b goto in tablet 2017-02-09 07:13:29 -08:00
Anthony J. Thibault
a209d0372a First cut of pal on tablet. 2017-02-08 17:34:03 -08:00
Seth Alves
90fa8bf572 Merge pull request #9612 from druiz17/users 
some tweaks to users and menus got tablet
 2017-02-07 15:38:43 -08:00
Dante Ruiz
dd8f095bd8 minimize diff 2017-02-04 00:36:41 +00:00
Dante Ruiz
0c28776ea2 some tweaks to users and menus got tablet 2017-02-04 00:13:39 +00:00
Anthony J. Thibault
85e01e3922 tablet-ui: Added sortOrder property to buttons 
By default user created buttons will appear after system buttons.
 2017-02-02 17:18:22 -08:00
Dante Ruiz
2cc1ee008d added clicking sounds to tablet menus 2017-02-02 17:46:42 +00:00
Anthony J. Thibault
de55a5dfe6 tablet-ui: reduced volume of button click 2017-02-01 18:47:50 -08:00
Anthony J. Thibault
8f362861eb tablet-ui: button icon images now work with http urls. 2017-01-31 16:53:25 -08:00
Seth Alves
f382b541c7 merge from upstream 2017-01-25 15:42:33 -08:00
Seth Alves
ff8d13ecc7 get button-states for toolbar buttons working again 2017-01-25 15:38:54 -08:00
Dante Ruiz
6671d7f9e6 removed some unnessary menu item 2017-01-25 21:23:04 +00:00
Dante Ruiz
0d7f15e41b removed more qml errors 2017-01-25 18:22:28 +00:00
Seth Alves
7d370fb791 Merge pull request #9507 from cozza13/tablet-ui 
Changes to tablet formatting
 2017-01-25 09:29:16 -08:00
Dante Ruiz
096b2e876f removing qml null print error 2017-01-25 08:00:40 -08:00
Chris Collins
df9bfa6eff Changes to tablet formating 
Changes to QML and .js formating to match style of mockup.
 2017-01-25 07:41:04 -08:00
Anthony J. Thibault
bff0eeef75 Added username to tablet header 2017-01-24 14:31:57 -08:00
Anthony J. Thibault
d2f024e84d Fix for "ReferenceError: globalPosition is not defined" warning 2017-01-24 11:40:20 -08:00
Anthony J. Thibault
584a9a3c98 UI navigation work with game pads 
The tablet UI can be long lived, unlike the previous VRMenu.
So instead of using a dynamic mapping that was only enabled when the VRMenu was shown, standard_navigation.json.
standard_navigation is always active.  Also, standard_navigation.json has been changed.
Left and Right click and stick events never become UINav events. Only Dpad A, B, X, Y, LB and RB are mapped to UINav events.
 2017-01-23 15:22:49 -08:00
Seth Alves
dfa949f2d8 switch to new click sound 2017-01-20 13:35:41 -08:00
Dante Ruiz
342a6c67fb menu checkable button fix 2017-01-19 08:12:49 -08:00
Dante Ruiz
0f3ac2831e fix tablet menu selection issue 2017-01-18 17:20:42 +00:00
Dante Ruiz
1c13f538f7 removed debug output 2017-01-18 17:08:13 +00:00
Dante Ruiz
fa3bea52cd fixed bug with menu 2017-01-18 16:45:27 +00:00
Dante Ruiz
baff07b0f9 controller with menus finally work 2017-01-18 07:41:25 -08:00