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

46824 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
8e44096981 Fix last entities properties not scrolling when keyboard raised 2016-09-29 15:59:24 +13:00
David Rowe
e9a398472a Remove duplicate keyboard 
Fixes keyboard raising and lowering when select entity with editor open.
 2016-09-29 12:09:04 +13:00
David Rowe
2933e37a0a Fix field not scrolling into view when raise keyboard in settings 2016-09-29 10:47:15 +13:00
David Rowe
40bfbf4021 Prevent flicker of keyboard area when navigate to a new page in browser 2016-09-29 10:35:18 +13:00
David Rowe
52f2d36096 Move "," and "." to numeric keyboard for ready use with numeric fields 2016-09-29 10:17:31 +13:00
David Rowe
f8572096b1 Merge branch 'master' into 21055 2016-09-28 20:00:04 +13:00
David Rowe
b60f649e0a Scroll HTML window if necessary when raise keyboard 2016-09-28 19:27:16 +13:00
David Rowe
a94d77ee12 Raise and lower keyboard in entities editor 2016-09-28 17:57:53 +13:00
David Rowe
2344d15dbc Raise and lower keyboard for HTML fields in Marketplace window 2016-09-28 16:41:01 +13:00
David Rowe
875566d956 Raise and lower keyboard for HTML fields in Browser window 2016-09-28 16:40:38 +13:00
David Rowe
ec00129988 Don't flood event bridge with raise/lower keyboard messages from HTML 2016-09-28 12:51:00 +13:00
Brad Hefta-Gaub
9363c4dda6 Merge pull request #8666 from sethalves/fix-ac-delete-entity 
fix an AC script's ability to delete entities
 2016-09-26 17:35:24 -07:00
Seth Alves
90adb5f67e fix an AC script's ability to delete entities 2016-09-26 17:14:45 -07:00
Stephen Birarda
43a3a9a7bd Merge pull request #8656 from Atlante45/home-content-update 
Ask if user want to update home content when available
 2016-09-26 13:26:41 -07:00
Zach Pomerantz
84ba3223bb Merge pull request #8650 from zzmp/fix/reload-qml-with-js 
reload qml with scripts
 2016-09-26 11:00:13 -07:00
Brad Davis
197c935d75 Merge pull request #8660 from jherico/stable-merge 
Merge from stable into master.
 2016-09-26 10:51:02 -07:00
Brad Davis
1a1c8af58a Merge from stable 2016-09-26 10:50:26 -07:00
Atlante45
f001cf7570 Make constant for home content URL 2016-09-26 10:44:59 -07:00
David Rowe
bc8c400448 Fix up keyboards in attachments dialogs 2016-09-26 16:39:34 +13:00
David Rowe
302c8ede60 Miscellaneous fixes 2016-09-26 15:34:39 +13:00
David Rowe
7d1d71084d Add keyboard to custom query dialog 2016-09-26 14:32:29 +13:00
David Rowe
023efe05f0 Move keyboard QML files 2016-09-25 09:54:48 +13:00
David Rowe
5b6835fbdb Fix defocusing 2016-09-24 21:23:30 +12:00
David Rowe
0f672c3aa2 Scroll content if necessary when keyboard is displayed 2016-09-24 18:56:35 +12:00
David Rowe
8663455d01 Unfocus field and hide keyboard when click in blank part of dialog 2016-09-24 17:34:02 +12:00
Atlante45
cb4d526dcf Ask if user want to update home content when available 2016-09-23 20:18:41 -07:00
David Rowe
52137cb3c1 Put keyboard at bottom of scrolling dialogs rather than under controls 2016-09-24 11:40:38 +12:00
Howard Stearns
3f31da68fe Merge pull request #8638 from howard-stearns/uniform-story-handling 
Uniform story handling
 2016-09-23 16:11:41 -07:00
Brad Hefta-Gaub
ee6719f94a Merge pull request #8652 from zzmp/fix/audio-injector 
fix injector restart fail on lack of local interface
 2016-09-23 16:07:16 -07:00
Chris Collins
43690be2d8 Merge pull request #8651 from zzmp/fix/audio-stream-logging 
fix audio stream logging
 2016-09-23 15:42:06 -07:00
Zach Pomerantz
912db1c0e1 silence audiostream logging 2016-09-23 15:32:23 -07:00
Chris Collins
5f325f7923 Merge pull request #8629 from sethalves/ice-troubles-1 
domain-server tells metaverse if it has no ice-server
 2016-09-23 15:26:50 -07:00
Chris Collins
5f45e62333 Merge pull request #8649 from ZappoMan/detectTouch 
only activate a touch device if one is connected
 2016-09-23 15:12:52 -07:00
Chris Collins
be33524990 Merge pull request #8636 from zzmp/clean/audio-config 
strip unused audio settings, hide the rest
 2016-09-23 15:08:48 -07:00
Zach Pomerantz
faba165408 fix injector fail on lack of local if 
- consolidate codepaths for new/restarted injections
- allow network injection without local injection
 2016-09-23 15:03:38 -07:00
Chris Collins
fdb4addf53 Merge pull request #8635 from zzmp/fix/local-audio-injection 
fix missing local audition for audio injectors
 2016-09-23 15:01:14 -07:00
Brad Hefta-Gaub
8f96715521 only activate a touch device if one is connected 2016-09-23 14:30:34 -07:00
Zach Pomerantz
aeaae4ccc8 reload qml with scripts 2016-09-23 14:27:47 -07:00
howard-stearns
a5fb0c9bd5 Merge branch 'master' of https://github.com/highfidelity/hifi into uniform-story-handling 2016-09-23 13:16:36 -07:00
Seth Alves
8cadd299a2 Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles-1 2016-09-23 13:16:26 -07:00
Chris Collins
89288b3ed5 Merge pull request #8618 from jherico/oculus 
Update Oculus SDK
 2016-09-23 13:16:22 -07:00
Zach Pomerantz
d0f4a29031 Merge branch 'master' of github.com:highfidelity/hifi into fix/local-audio-injection 2016-09-23 13:12:39 -07:00
Zach Pomerantz
a9318d052b Merge branch 'master' of github.com:highfidelity/hifi into clean/audio-config 2016-09-23 13:11:52 -07:00
Brad Hefta-Gaub
d7cfa2bc8c Merge pull request #8594 from jherico/texture_derez 
Dynamic texture resolution
 2016-09-23 12:30:04 -07:00
Brad Davis
2dd93e0586 Disable debug command list 2016-09-23 12:05:14 -07:00
Brad Davis
5a91116c06 Fix debug build, fix typo in available texture memory calculation 2016-09-23 12:05:13 -07:00
Brad Davis
e6f23d6ffd Disable sparse textures on non-Windows systems 2016-09-23 12:05:12 -07:00
Brad Davis
ba3abc7b51 Fix warnings 2016-09-23 12:05:12 -07:00
Brad Davis
ab8a67e84d Code review comments 2016-09-23 12:05:11 -07:00
Brad Davis
74a3d7fcb9 Flush executed commands on the transfer thread 2016-09-23 12:05:10 -07:00