Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-21 06:54:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
50914 commits 69 branches 59 tags 1.2 GiB
Commit graph

2169 commits

Author SHA1 Message Date
Dante Ruiz
5ff91c018b snapshot fix 2017-02-06 19:39:57 +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
Zach Fox
8b1161b0b0 Fix it 2017-02-01 12:32:30 -08:00
Anthony J. Thibault
8f362861eb tablet-ui: button icon images now work with http urls. 2017-01-31 16:53:25 -08:00
Brad Hefta-Gaub
2fc6b4b0af Merge pull request #9544 from humbletim/fix-rightclick-menu 
Hide webview context menus when clicked
 2017-01-31 13:03:50 -08:00
Seth Alves
39d195fce2 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-31 05:02:07 -08:00
Alan Z
6e7260207f Fix label typo in help graphic 
fixes #2748 in Fogbugz
 2017-01-30 16:51:22 -08:00
Seth Alves
ac475300f6 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-30 08:15:29 -08:00
humbletim
8c0d7f9e28 hide context menu on item click 2017-01-28 14:37:49 -05:00
humbletim
8f4586b9b8 hide webview context menu when clicked 2017-01-28 10:46:50 -05:00
Zach Fox
5cba928540 Do it! 2017-01-27 16:30:59 -08:00
Seth Alves
e2b1f4b2ab include tablet fbx with interface distribution rather than get it from s3 2017-01-26 10:20:46 -08:00
Seth Alves
204652514e fix some fallout from toolbar changes 2017-01-25 16:29:36 -08:00
Seth Alves
f382b541c7 merge from upstream 2017-01-25 15:42:33 -08:00
Seth Alves
888d326783 Merge pull request #9509 from druiz17/tabletBug 
removed more qml errors
 2017-01-25 15:41:07 -08:00
Seth Alves
ff8d13ecc7 get button-states for toolbar buttons working again 2017-01-25 15:38:54 -08:00
Faye Li
49a8964c4e reference new users icon art 2017-01-25 14:43:39 -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
0ab956a0c1 A and B buttons on oculus touch no longer trigger UI Nav events 2017-01-23 17:08:25 -08:00
Seth Alves
200105c856 Merge pull request #9484 from hyperlogic/tablet-ui 
UI navigation work with game pads
 2017-01-23 16:01:45 -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
cdb14e7662 put name of button-click file back 2017-01-23 13:55:11 -08:00
Seth Alves
702aba9646 use a softer button-click sound 2017-01-23 10:13:45 -08:00
Seth Alves
be8bc9652b Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-23 09:44:04 -08:00
Seth Alves
e96a3d4bcb try another click sound 2017-01-20 14:50:24 -08:00
Zach Fox
11a57efafb Fix it! 2017-01-20 13:44:29 -08:00
Seth Alves
dfa949f2d8 switch to new click sound 2017-01-20 13:35:41 -08:00
Seth Alves
6641f9bafd Merge pull request #9444 from druiz17/homeButtonFix 
Home button is now an overlay
 2017-01-20 10:32:31 -08:00
Zach Fox
8f3c4794c6 Comments 2017-01-20 10:24:52 -08:00
Zach Fox
9c9206acc0 Prevent logspam 2017-01-20 10:24:51 -08:00
Zach Fox
c83cd4a94a Complex checkpoint 2017-01-20 10:24:51 -08:00
Seth Alves
c492319be2 merge from upstream 2017-01-20 10:14:11 -08:00
Ryan Downe Karpf
03851d4188 Merge pull request #9441 from davidkelly/dk/makeUsSomeAnalytics 
Some initial analytics for PAL usage
 2017-01-20 08:30:46 -08:00
David Kelly
5adc2cc593 Couple improvements 
Only send one message when gain is changed.  Eliminated the bool and
now just sending un-personalMute, etc...
 2017-01-19 17:22:39 -08:00
Dante Ruiz
1e7e4576cc comparing with ID instead of strings 2017-01-19 16:38:55 -08:00
David Kelly
d9fbf832e2 Some initial analytics for PAL usage 2017-01-19 11:35:17 -08:00
Dante Ruiz
342a6c67fb menu checkable button fix 2017-01-19 08:12:49 -08:00
Seth Alves
3517daaad2 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-18 15:49:12 -08:00
Zach Fox
7f57251a0e Remove logs also removed in Master 2017-01-18 13:38:19 -08:00
Zach Fox
f8dd7f5433 Cleanup 2017-01-18 12:55:25 -08:00
Zach Fox
e9d3c36873 Final commit? 2017-01-18 12:55:25 -08:00
Zach Fox
d067ba7dcc Alan's feedback 2017-01-18 12:55:24 -08:00