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

19523 commits

Author SHA1 Message Date
Faye Li
b6bf58d5be rearrange layout of main tablet go to screen 2017-03-20 15:28:30 -07:00
Seth Alves
2e29ff3114 Merge pull request #9934 from fayeli/edit-import-entities 
Adding Import Entities button on the Create tab of Edit
 2017-03-20 09:13:08 -08:00
Seth Alves
424af2255b Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-19 21:17:30 -08:00
Chris Collins
ed27c550af Merge pull request #9939 from ctrlaltdavid/21237 
Disable Developer > Assets > ATP Asset Migration menu item
 2017-03-20 06:29:33 -07:00
Chris Collins
2e6291f470 Merge pull request #9929 from ctrlaltdavid/21235 
Replace Developer > Network > Disk cache editor with menu action
 2017-03-20 06:26:36 -07:00
Seth Alves
f48557b06b Merge pull request #9943 from vladest/tablet-ui-login-logout 
Tablet ui login logout
 2017-03-18 09:37:11 -08:00
Vladyslav Stelmakhovskyi
5335bf8862 Menu items in Tablet UI now wrapped 2017-03-18 15:58:16 +01: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
ab7d82edb6 Use #ifdef instead of comment 2017-03-18 12:56:34 +13:00
David Rowe
38bb48e72c Disable Developer > Assets > ATP Asset Migration menu item 2017-03-18 12:13:13 +13:00
David Rowe
e3b9d588ec Merge branch 'master' into 21235 
# Conflicts:
#	interface/src/Menu.cpp
#	interface/src/ui/DialogsManager.h
 2017-03-18 09:42:36 +13:00
Brad Hefta-Gaub
a75acd139b Merge pull request #9885 from sethalves/model-scripting 
Model scripting
 2017-03-17 13:13:17 -07:00
Faye Li
33a7ff825e indicate expecting json file on button text 2017-03-17 11:37:38 -07:00
Faye Li
6531efffbc hook up qml button to edit.js 2017-03-17 11:22:07 -07:00
Andrew Meadows
60e0eb0cf9 Merge pull request #9917 from Atlante45/fix/sit 
Cancel Avatar velocity when sitting down.
 2017-03-17 10:04:25 -07:00
Seth Alves
df84ff27e9 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-03-17 07:52:22 -07:00
Atlante45
698791295a Expose DriveKeys enum to JS 2017-03-16 20:03:27 -07:00
David Rowe
939b4f1612 Remove Developer > Network > Disk Cache Editor menu item and dialog 2017-03-17 13:49:09 +13:00
Atlante45
5a1ce4bb05 CR 2017-03-16 17:46:47 -07:00
Atlante45
9155cc6334 Fix windows warnings 2017-03-16 17:44:56 -07:00
David Rowe
e21d7d9edf Add Developer > Network > Clear Disk Cache menu action 2017-03-17 13:34:11 +13:00
David Rowe
dc71f502f0 Delete Developer > Network > RAM Caches Size menu item and dialog 2017-03-17 13:09:06 +13:00
Seth Alves
a5d19439f9 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-16 16:32:07 -07:00
Atlante45
42316e713d CR drive keys 2017-03-16 16:24:52 -07:00
Atlante45
3e9474e878 CR 2017-03-16 16:24:36 -07:00
Atlante45
7517f224a8 Add MyAvatar drive keys capture capability 2017-03-16 15:44:17 -07:00
David Rowe
07e4b0ce41 Fix title menu icon getting stuck on white 2017-03-17 11:28:14 +13:00
David Rowe
069e66b875 Fix stack functions 2017-03-17 11:19:50 +13:00
David Rowe
f1947769d6 Fix tablet settings dialogs' titles and make QML consistent 2017-03-17 11:15:56 +13:00
Andrew Meadows
6f4d9bfba3 Merge pull request #9858 from kunalgosar/logBolding 
Change to Log Font and Formatting
 2017-03-16 13:09:37 -07:00
kunalgosar
0cee9ee172 font change 2017-03-16 11:57:46 -07:00
Seth Alves
eba2417f41 Merge pull request #9912 from AndrewMeadows/model-cleanup-4 
minor cleanup of render pipeline for models and avatars
 2017-03-16 10:39:43 -08:00
kunalgosar
e7a16d4294 code standard fixes 2017-03-16 10:53:35 -07:00
Seth Alves
31e0cfe296 Merge pull request #9825 from thoys/record-fixes 
Avatar Recorder and Playback Fixes
 2017-03-16 07:27:42 -08: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
Andrew Meadows
361e03fc78 remove unused variable 2017-03-15 16:57:31 -07:00
Faye Li
10ebb6efd7 simplify asset server button 2017-03-15 16:55:21 -07:00
Seth Alves
693aee0628 Merge branch 'master' of github.com:highfidelity/hifi into model-scripting 2017-03-15 16:54:40 -07:00
Faye Li
42216b6986 create import entities button on create tab 2017-03-15 16:47:31 -07:00
Andrew Meadows
d3fa28d4bc remove cruft and fix indentation 2017-03-15 16:17:59 -07:00
Andrew Meadows
f250c0d298 simpler bindTransform() for ModelMeshPartPayload 2017-03-15 14:41:13 -07:00
Vladyslav Stelmakhovskyi
a4c0ce4240 Typo fix 2017-03-15 22:13:37 +01:00
Vladyslav Stelmakhovskyi
856e15060d Implemented Domain Connection statistics for Tablet UI 2017-03-15 21:05:13 +01:00
Seth Alves
b66ff19595 prefer-avatar-finger-over-stylus setting now defaults to true 2017-03-15 09:51:30 -08:00