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

1470 commits

Author SHA1 Message Date
Seth Alves
95d5c64e83 put a schmitt trigger in place to de-bounce tablet clicks 2017-01-26 15:09:35 -08:00
Seth Alves
c0f169e242 allow tablet-stabbers to more easily click buttons 2017-01-26 14:54:32 -08:00
Seth Alves
e3d4cae515 avoid having the snapshot script be multi-activated by a single button-click 2017-01-26 14:29:49 -08:00
Seth Alves
d85d892057 Merge pull request #9522 from fayeli/PAL-to-PEOPLE 
Tablet Button name from PAL to PEOPLE
 2017-01-26 12:58:16 -08:00
Faye Li
44fc8a5fbf update button name 2017-01-26 11:23:06 -08:00
Seth Alves
0b51b1d566 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 11:00:02 -08:00
Brad Hefta-Gaub
5ada689ab7 Merge pull request #9497 from ctrlaltdavid/fix-clara-download 
Fix intermittent Clara.io download crashes
 2017-01-26 10:58:27 -08:00
Seth Alves
68de5c9757 Users to USERS in button 2017-01-26 10:23:38 -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
9497b2b7c5 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-01-25 17:16:12 -08:00
Seth Alves
129fe6ea49 dammit, emacs 2017-01-25 17:15:54 -08:00
Anthony J. Thibault
2af59630fb Better legibility of tablet in 2D with small window sizes. 2017-01-25 16:43:36 -08:00
Seth Alves
204652514e fix some fallout from toolbar changes 2017-01-25 16:29:36 -08:00
Seth Alves
c317ba8054 merge from upstream 2017-01-25 15:57:53 -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
Faye Li
49a8964c4e reference new users icon art 2017-01-25 14:43:39 -08:00
Seth Alves
98f1664a46 use a setting to decide which UI is enabled 2017-01-25 14:17:45 -08:00
Atlante45
f540c94113 Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr 2017-01-25 13:06:49 -08:00
Seth Alves
f18094f565 make use of tablet or HUD depend on a single variable. avoid some duplicated code 2017-01-25 12:00:34 -08:00
Seth Alves
11d01a0c00 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-HUD-ui 2017-01-25 09:42:59 -08:00
Ryan Huffman
2bb7a7a4a6 Remove entity server script status log spam from edit.js 2017-01-25 09:32:25 -08: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
c811839163 tablet is not selectable in edit mode 2017-01-25 16:46:17 +00:00
Dante Ruiz
bc75cf5bed removed tabs 2017-01-25 16:11:37 +00:00
Dante Ruiz
bda8b65e79 fixing spaceing 2017-01-25 16:06:40 +00:00
Dante Ruiz
a147ce3f5f fixed load script issue 2017-01-25 08:00:41 -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
David Rowe
dcd632013f Better variable name 2017-01-25 16:37:35 +13:00
David Rowe
7e56d0fae6 Fix up Clara.io error handling 2017-01-25 16:36:06 +13:00
Seth Alves
4335bbe4fe provide a way to switch mostly back to HUD-based ui 2017-01-24 18:48:11 -08:00
Seth Alves
ced1b61b70 close rather than attempt to repair the tablet after a domain change 2017-01-24 16:03:22 -08:00
Seth Alves
827ae7ad4d Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-close-tablet-upon-goto 2017-01-24 15:50:12 -08:00
Seth Alves
601a35a9b6 try a different way of repairing tablet after a domain change 2017-01-24 15:49:49 -08:00
Faye Li
71b6096644 toggle menu item 2017-01-24 15:12:46 -08:00
Faye Li
5bed68ac4c button toggle 2017-01-24 14:56:58 -08:00
Faye Li
95a92fc5eb added tablet button 2017-01-24 14:42:28 -08:00
David Rowe
1b05ae8a82 Make handling of Clara.io download-ready state transition more robust 2017-01-25 11:00:07 +13:00
Anthony J. Thibault
432bb27119 The tablet Help button should be active if window is visible 2017-01-23 18:37:08 -08:00
Anthony J. Thibault
e30d77eba1 Tablet goto button now properly tracks address bar shown state 2017-01-23 18:37:07 -08:00
Seth Alves
353b38286a Merge pull request #9490 from hyperlogic/tablet-ui 
For for Tablet Tilt and Oculus Touch A B buttons sending UINav events
 2017-01-23 18:14:53 -08:00
Seth Alves
3496e4cc7a Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-23 16:50:41 -08:00
Anthony J. Thibault
3db8c5b4a7 Fix tilt on tablet for HMD users without hand controllers 2017-01-23 16:36:04 -08:00
Seth Alves
f2ff6fd9e7 allow stylus to work when edit.js is running 2017-01-23 15:52:40 -08:00
Ryan Downe Karpf
3f151cb3d7 Merge pull request #9483 from Atlante45/fix/rescale 
Fix Edit.js rescale for decimal values
 2017-01-23 15:44:10 -08:00
Ryan Downe Karpf
e080746990 Merge pull request #9481 from huffman/fix/edit-collision-names 
Update the name of the collision shapes used in edit.js properties
 2017-01-23 15:10:01 -08:00
Seth Alves
9d77e9937c only make the last cm of the stylus active to avoid accidently closing tablet when grabbing base 2017-01-23 14:38:48 -08:00
Atlante45
a1962e274d Fix rescale for 0.x values 2017-01-23 14:35:16 -08:00
Ryan Huffman
f6d5a59c8a Fix width of edit.js dropdown to accomodate collision options 2017-01-23 14:18:56 -08:00
Ryan Huffman
d108fabd0b Update the name of the collision shapes used in edit.js properties 
Update the names to be consistent with what is shown on the add model
dialog.
 2017-01-23 13:56:48 -08:00