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

52376 commits

This branch
This branch
All branches
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
8988110c3b Merge pull request #9953 from fayeli/edit-export-entities 
Adding Export Entities Functionality in Tablet Edit
 2017-03-20 11:35:18 -08:00
Faye Li
f57905fbb3 remove code for jump to selection 2017-03-20 10:23:55 -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
acdcb366b4 Merge pull request #9951 from sethalves/tablet-ui 
Tablet ui -- merge from upstream
 2017-03-20 08:23:15 -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
Chris Collins
308c134119 Merge pull request #9686 from humbletim/21114-part3 
CR 21114 -- Implement modules/require support into hifi
 2017-03-20 06:22:35 -07:00
Ken Cooke
1723549850 Merge pull request #9950 from samcake/red 
Fix the typo in the assert for isWireframe
 2017-03-19 18:30:23 -07:00
Sam Cake
3a08611c26 Fix the typo in the assert for isWireframe 2017-03-19 17:33:28 -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
Seth Alves
e945a290cd Merge pull request #9944 from vladest/tablet-ui-wrap-menu 
Menu items in Tablet UI now wrapped
 2017-03-18 09:35:46 -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
samcake
e1a0984fed Merge pull request #9906 from samcake/red 
Expose rendering in wireframe mode
 2017-03-17 17:09:44 -07:00
David Rowe
ab7d82edb6 Use #ifdef instead of comment 2017-03-18 12:56:34 +13:00
Faye Li
197a06c423 changes in TWO entityList.js to register the export event 2017-03-17 16:17:21 -07:00
David Rowe
38bb48e72c Disable Developer > Assets > ATP Asset Migration menu item 2017-03-18 12:13:13 +13:00
Faye Li
1a46f18aa3 adding export button + hiding jump to selection 2017-03-17 15:56:55 -07: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
Ken Cooke
652c80057e Merge pull request #9924 from zzmp/fix/noise-delay 
Use single frame buffer for local audio injectors
 2017-03-17 11:24:02 -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
Chris Collins
303a11a3e4 Merge pull request #9928 from ctrlaltdavid/21234 
Delete Developer > Network > RAM Caches Size menu item and dialog
 2017-03-17 09:13:25 -07:00
Seth Alves
d45266f28b Merge pull request #9931 from sethalves/tablet-ui 
Tablet ui -- merge from upstream
 2017-03-17 06:54:10 -08:00
Seth Alves
df84ff27e9 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-03-17 07:52:22 -07:00
Seth Alves
9292cabe10 Merge pull request #9904 from druiz17/tablet-notifcation 
Added tablet notifications.
 2017-03-17 06:50:24 -08:00
Seth Alves
5aacc13429 Merge pull request #9925 from ctrlaltdavid/21230 
Fix tablet settings dialogs' titles
 2017-03-17 06:44:23 -08: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
Seth Alves
9ae5c24d1b Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-03-16 16:31:33 -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
35dd45ddf9 Capture drive keys while avatar is seated 2017-03-16 15:44:18 -07:00
Atlante45
7517f224a8 Add MyAvatar drive keys capture capability 2017-03-16 15:44:17 -07:00
Clément Brisset
21c5e7b0b2 Merge pull request #9880 from Atlante45/feat/sit 
Fix avatars stuck in the sitting position after a domain disconnect
 2017-03-16 15:42:29 -07:00
David Rowe
07e4b0ce41 Fix title menu icon getting stuck on white 2017-03-17 11:28:14 +13:00
Seth Alves
0e8d62c11e delete dead code 2017-03-16 15:24:39 -07: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
Zach Pomerantz
db956f4cc3 use single frame buffer for local audio 2017-03-16 18:06:18 -04:00