Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 09:36:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
62616 commits 76 branches 59 tags 1.2 GiB
Commit graph

196 commits

Author SHA1 Message Date
vladest
2770650b65 Merge branch 'master' into move_to_qqc2 2017-12-12 18:48:41 +01:00
vladest
b52163cb24 Intitial SpinBox port 2017-12-04 20:54:35 +01:00
Alexander Ivash
d60f082796 9706 Editing Attachments Results In Attachments Window Scrolling To Top 2017-12-03 23:24:34 +03:00
vladest
19f9af0576 Port avatar preferences 2017-11-18 23:03:52 +01:00
vladest
68b08f429c Port Attachments to QQC2 2017-11-18 22:49:16 +01:00
vladest
41f338e6ad Port ScrollingWindow and TabletDebugWindow 2017-11-18 20:18:17 +01:00
vladest
0e53afc346 Merge branch 'master' into move_to_qqc2 2017-11-15 20:53:14 +01:00
vladest
0c13c2b6e2 Remove unused QQC1 imports 2017-11-13 16:37:28 +01:00
beholder
d1969d649a fix not collapsing keyboard 2017-11-10 21:20:00 +03:00
luiscuenca
f0eab58ebd Bug 6719 fixed 2017-10-26 09:41:24 -07:00
Ryan Huffman
f0c9badbd6 Fix misspelling in lost-connection-to-atp error 2017-10-05 09:10:46 -07:00
Atlante45
af69222fdb Fix icon name change 2017-09-28 18:34:42 -07:00
Atlante45
eb06c33187 Naming coding standard fix 2017-09-27 15:32:53 -07:00
Atlante45
73483eef94 Update information sentence 2017-09-26 19:19:34 -07:00
Atlante45
bf984e8d1a Fix tablet asset browser 2017-09-26 19:05:36 -07:00
Atlante45
03bd887f9a Re-sync files 2017-09-26 18:42:50 -07:00
Atlante45
dda715e171 Update TabletAssetServer 2017-09-26 18:25:20 -07:00
Ryan Huffman
883bdc6003 Merge pull request #11425 from Atlante45/feat/auto-bake 
Asset Browser auto-refresh
 2017-09-22 13:17:04 -07:00
Atlante45
6cdbf0c44a Fix RunningScripts in tablet mode 2017-09-21 15:53:27 -07:00
Atlante45
1a571d0991 Add Asset Server auto refresh 2017-09-21 14:41:59 -07:00
Atlante45
a37642ba44 Pull Auto-Baking changes to TabletAssetServer.qml 2017-09-15 14:43:15 -07:00
Atlante45
c4d018504b Pull Auto-Baking changes to TabletAssetServer.qml 2017-09-15 13:28:51 -07:00
Atlante45
8711823a9b Sync up AssetServer.qml and TabletAssetServer.qml 2017-09-15 11:44:08 -07:00
Atlante45
ae14f1f88e Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-09-14 15:34:20 -07:00
vladest
7233c47257 use selection model of TreeView 2017-09-14 15:36:12 +02:00
Atlante45
2e84f48539 Fix QML errors 2017-09-13 09:54:55 -07:00
Atlante45
8a291f16ff Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-08-25 15:26:38 -07:00
Atlante45
9e6502fe92 More UI work 2017-08-25 10:54:34 -07:00
SamGondelman
1c27335193 a couple logging fixes 2017-08-14 17:34:32 -07:00
Seth Alves
d812c293e8 Merge pull request #11120 from mukulHF/bug-lock-default-scripts 
Disable the ability for a user to edit default scripts if developer settings is not enabled - adjusting values
 2017-08-10 12:29:23 -07:00
druiz17
005c5a9278 Update TabletRunningScripts.qml 2017-08-10 12:26:57 -07:00
mukulHF
780644fa38 Update TabletRunningScripts.qml 2017-08-07 11:37:27 -07:00
mukulHF
fadc19d8bb Update RunningScripts.qml 2017-08-07 11:36:37 -07:00
vladest
3a013bf86e Remove snap to item. Add caching for scrolling speedup 2017-08-05 13:28:08 +02:00
Dante Ruiz
9be60ee658 made more requested changes 2017-08-04 17:57:53 +01:00
Dante Ruiz
1e1ddf2941 making requested changes 2017-08-02 22:22:55 +01:00
Dante Ruiz
51652482a4 Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts 2017-08-01 20:51:56 +01:00
utkarshgautamnyu
f407bf6f5a Merge pull request #11064 from highfidelity/bug/6513 
Enabled multiple selection and deletion in Asset Browser
 2017-07-28 09:46:34 -07:00
utkarshgautamnyu
1beec26003 Update TabletAssetServer.qml 2017-07-27 15:55:55 -07:00
utkarshgautamnyu
4680911264 Enabled multiple selection and multiple deletion in asset browser 2017-07-27 14:47:30 -07:00
utkarshgautamnyu
71ddf1e7c1 Removed Compound Collision type 2017-07-26 10:20:17 -07:00
utkarshgautamnyu
24f4468fd5 added additional collision types to asset browser in tablet mode 2017-07-25 17:12:13 -07:00
Andrew Meadows
9d1fba3a3b Merge pull request #10821 from ctrlaltdavid/21418 
Don't execute body of controllers' plugin update methods if not enabled
 2017-07-25 08:51:17 -07:00
Dante Ruiz
95299244cf fixed running scripts popup 2017-07-22 00:24:24 +01:00
Dante Ruiz
7bf3f45e39 finished the locked default scripts 2017-07-21 23:32:25 +01:00
Dante Ruiz
625b7e535a Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts 2017-07-21 17:20:03 +01:00
Dante Ruiz
3c862c34b2 disable reload default scripts by default 2017-07-20 21:15:00 +01:00
utkarshgautamnyu
ce5ff23e70 made changes to size of content to dosplay 'choose file' button 2017-07-19 16:15:34 -07:00
David Rowe
07697c5083 Merge branch 'master' into 21418 
# Conflicts:
#	interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml
#	interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml

Removed stray "Vive Controller Picks" configuration item which no longer exists.
 2017-07-01 11:19:00 +12:00
David Rowe
be0e1a75a4 User-friendly SDL2 controller name 2017-06-29 10:03:58 +12:00