Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-30 10:42:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
57544 commits 71 branches 56 tags 1.2 GiB
Commit graph

231 commits

Author SHA1 Message Date
Cain Kilgore
280a7a7e42 Fixing Styling, added Preference to Tablet, Moved Location to Avatar Tuning 2017-07-25 01:48:55 +01:00
Cain Kilgore
9c152ddc6f Ticking left will keep it on left, not right 2017-07-24 22:30:43 +01:00
Cain Kilgore
e6fd85f45a Some code cleanup 2017-07-24 19:02:40 +01:00
Cain Kilgore
42742ba1f9 Changed the Return to a String "left/right" instead. 2017-07-24 18:31:16 +01:00
Cain Kilgore
a4cf27402d Tabs and Cleanup of Code 2017-07-24 06:27:14 +01:00
Cain Kilgore
630922dd95 Dominant Hands Branch Initial Commit 
Adds a new option in the Avatar Basics section of the Avatar Settings.

API Accessible Functions:
MyAvatar.getUseAlternativeHand()
MyAvatar.setUseAlternativeHand()

Defaults to false (Right Hand). Will return True if set to Left Hand.
 2017-07-24 06:18:24 +01:00
Cain Kilgore
c60c8c7b13 Missed two tabs.. 2017-07-14 00:59:25 +01:00
Cain Kilgore
4f8d958831 Some code cleaning, added comment for reasoning of specifying min and max in the qml 2017-07-14 00:56:42 +01:00
Cain Kilgore
d74c834f12 Fixed colour scheming and changed to a reload icon 2017-07-13 22:40:37 +01:00
Cain Kilgore
60300f5d7b changed to icon (hopefully) 2017-07-13 22:06:44 +01:00
Cain Kilgore
f91a8c0f53 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler 2017-07-13 21:25:39 +01:00
Cain Kilgore
092725ad1a a thing 2017-07-13 19:24:30 +01:00
Cain Kilgore
5329c1ce42 Fixed Indentation, removed old debug code 2017-07-13 19:23:28 +01:00
Cain Kilgore
521babb6bd Avatar Scaler - should be PR Ready. 2017-07-13 19:18:51 +01:00
Cain Kilgore
43782a29c7 Avatar Scaler - WIP 2017-07-12 22:04:58 +01:00
Vladyslav Stelmakhovskyi
51b44d9021 Implement same for HMD mode 2017-06-28 16:36:25 +02:00
Vladyslav Stelmakhovskyi
d3282a4ed0 Cleanup 2017-06-28 15:56:35 +02:00
Vladyslav Stelmakhovskyi
241231c00c file lists works, but not initial yet 2017-06-27 22:14:58 +02:00
Bradley Austin Davis
1968ecbc8f Simplify eventBridge mechanism exposing functionality to web pages 2017-06-12 14:46:37 -07:00
David Rowe
2108300272 Merge branch 'master' into 21249 2017-04-20 08:43:00 +12:00
David Rowe
9088d1ef9c Tablet version of recordings browser dialog 2017-04-19 16:15:22 +12:00
David Rowe
00b6b2a2c0 Implement desktop recordings browser dialog 2017-04-19 12:34:59 +12:00
Zach Fox
7505b82189 Merge pull request #10046 from Triplelexx/21224 
21224 - Allow people to save avatar bookmarks
 2017-04-18 11:10:50 -07:00
David Rowe
dae6d6fb69 Stub desktop dialog to select recording to play from ATP assets 2017-04-18 11:43:42 +12:00
Dante Ruiz
d823093ddb fixed merge conflict 2017-04-11 16:58:25 +01:00
Dante Ruiz
4e94aaa9e8 finished allowing to go back to previous app 2017-04-10 20:58:10 +01:00
Vladyslav Stelmakhovskyi
7628916db6 Check if dialog was opened from StackView and then pop or just go to home menu 2017-04-09 20:09:15 +02:00
Dante Ruiz
86c67a3017 tablet pages 2017-04-08 02:01:21 +01:00
Lexx
af95741a7e Merge branch 'master' into 21224 2017-04-04 18:24:49 +01:00
Triplelexx
aa9a2532a9 fix for displaying "Bookmark Avatar" dialog in tablet ui 2017-03-30 13:54:33 +01:00
Triplelexx
50e35a220b Merge remote-tracking branch 'upstream/master' into 21224 2017-03-30 01:25:27 +01:00
Vladyslav Stelmakhovskyi
209de29b2a Intial commit. Basically works. Need some testing 2017-03-29 17:36:05 +02:00
Triplelexx
07e6b766b5 rename FILENAME constants 2017-03-26 23:10:50 +01:00
Triplelexx
8f507942cf change storage location 
still unsure what is best. this is consistent and doesn't require login
 2017-03-25 19:10:12 +00:00
humbletim
5d5d947ddb updates per discussion with triplelexx 2017-03-25 04:01:02 -04:00
humbletim
630afb716f consolidate QML->C++ triggering workaround to help compartmentalize the problem for later fixin' 2017-03-25 03:01:35 -04:00
humbletim
96f905362b alternative way to connect the button? 2017-03-25 01:17:27 -04:00
Triplelexx
bda1d54209 create AvatarBookmarks 
derive AvatarBookMarks and LocationBookmarks from Bookmarks, first pass
at integration, QML issues noted
 2017-03-24 22:58:36 +00:00
Vladyslav Stelmakhovskyi
696825580e Merge branch 'tablet-ui' into tablet-ui-login-logout 2017-03-18 14:42:11 +01:00
Vladyslav Stelmakhovskyi
5e162a6447 Implemented login facility for tablet UI 2017-03-18 14:38:49 +01:00
David Rowe
1080e21afd Tidying 2017-03-16 19:28:28 +13:00
David Rowe
89eb073855 Fix dialog height changing as drop-down value is changed 2017-03-16 19:28:12 +13:00
David Rowe
74db9dc573 Fix drop-down hiding behind buttons 2017-03-16 19:27:47 +13:00
David Rowe
3c1506237a Fix not all warning text displaying 2017-03-16 19:27:27 +13:00
David Rowe
7efda8bead Make clicking on dialog background defocus current control 2017-03-16 19:27:06 +13:00
David Rowe
9e458fd180 Fix keyboard in tablet custom query dialog 2017-03-16 19:26:41 +13:00
Seth Alves
f8a6a82371 Merge pull request #9881 from ctrlaltdavid/21197 
Browse for avatar in Marketplace from tablet avatar settings dialog
 2017-03-14 05:33:11 -08:00
David Rowe
d141d5b683 Add keyboard 2017-03-14 21:36:57 +13:00
David Rowe
f3a99a2437 Implement avatar browser for tablet avatar settings 2017-03-14 15:36:51 +13:00
David Rowe
05e4c2a1bb MyAvatar is available in tablet now 2017-03-12 09:59:52 +13:00