Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-07 12:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
73212 commits 67 branches 56 tags 1.2 GiB
Commit graph

942 commits

Author SHA1 Message Date
Alexander Ivash
82313f9464 update imports for utilities / all other qml files found 2018-11-06 14:21:14 +05:30
Brad Hefta-Gaub
405b1d5725
Revert "Better imports for controls and styles" 2018-10-23 10:58:28 -07:00
John Conklin II
e40a021339
Merge pull request #13401 from ElderOrb/better_imports_for_controls_and_styles 
Better imports for controls and styles
 2018-10-22 11:50:09 -07:00
Alexander Ivash
64f67d5eb7 update imports for utilities / all other qml files found 2018-10-18 22:03:50 +03:00
r3tk0n
90bf723317 Fix unsubscribing from message channel in teardown() 2018-10-18 10:31:39 -07:00
Zach Fox
b5862c0ede
Merge pull request #13583 from zfox23/specCamBumpVersion 
Bump version of Spec Cam QML to 2.3
 2018-07-11 10:38:59 -07:00
Zach Fox
1a554e658d Bump version of Spec Cam QML to 2.3 2018-07-11 09:47:11 -07:00
Zach Fox
b573b16df8 Fix MS16600: Prevent duplicate Spectator Camera models after crash 2018-07-10 14:12:21 -07:00
John Conklin II
a7952c7ff3
Merge pull request #13380 from thoys/21883_remove_limitless 
Remove Limitless API
 2018-06-15 11:08:47 -07:00
Thijs Wenker
05bc32b3ad Merge branch 'master' of github.com:highfidelity/hifi into merge/triplelexx-21883 
# Conflicts:
#	interface/src/Application.cpp
#	interface/src/scripting/LimitlessVoiceRecognitionScriptingInterface.cpp
 2018-06-15 02:34:29 +02:00
Zach Fox
ad456ee282 Whitespace 2018-06-14 15:16:03 -07:00
Zach Fox
e806348eeb MS15916: Fix multiple issues with Spectator Camera 2018-06-14 12:20:57 -07:00
Zach Fox
e49df4a0ab Fix MS15858: Prevent Interface deadlock during 360 Snap capture 2018-06-13 11:42:18 -07:00
SamGondelman
e6741a363e add local-only isVisibleInSecondaryCamera flag to entities 2018-05-23 16:35:21 -07:00
David Rowe
431c95cba9 Move Shapes app from hifi to hifi-content 2018-05-19 10:37:36 +12:00
Sam Gondelman
74840d2130
Merge pull request #12935 from gcalero/android_new_login 
Android new login
 2018-05-17 15:53:25 -07:00
Zach Fox
d904bcd1cd UX improvements 2018-05-15 14:39:07 -07:00
Zach Fox
9632498422 Bugfixes and Settings button 2018-05-15 13:16:42 -07:00
Zach Fox
e607c68bea Thanks Mukul! 2018-05-14 16:48:40 -07:00
Zach Fox
0c76659324 Starting changes per Mukul! 2018-05-14 15:28:53 -07:00
Gabriel Calero
868b58e66d Un-expose Application from javascript. Restore displayplugin deactivation when goes to background 2018-05-04 18:01:01 -03:00
Zach Fox
c3d3cdca3d Add cubemap output format 2018-05-03 12:57:00 -07:00
Zach Fox
249e2a2bac Tons of stability and clarity improvements 2018-05-01 13:00:04 -07:00
Zach Fox
c115f2bd36 Camera should never be dynamic 2018-04-30 17:12:59 -07:00
Zach Fox
502ce8f04f More bugfixes 2018-04-30 16:12:04 -07:00
Zach Fox
47627fd1de Fix edge case 2018-04-30 15:02:20 -07:00
Zach Fox
1f16c5f987 Bugfixes for HMD use 2018-04-30 14:05:44 -07:00
Zach Fox
7957c12bb9 Degree symbol 2018-04-30 13:56:52 -07:00
Zach Fox
eab2feb543 Lots of little improvements and stability fixes 2018-04-30 13:54:10 -07:00
Zach Fox
a2b84c0fbb It's working!! 2018-04-30 12:11:46 -07:00
Zach Fox
1b29946a48 I feel so close; why isn't this variable capturing? 2018-04-27 17:26:05 -07:00
Zach Fox
e0352bbb29 Put SpecCam v2.0 in the source tree 2018-04-27 14:53:06 -07:00
Triplelexx
704499a76d remove Limitless API 2018-04-09 18:22:48 +01:00
Seth Alves
c534e3a6e4
Merge pull request #12356 from ctrlaltdavid/21742 
Handle tablet entities and overlays not being available
 2018-02-22 08:48:13 -08:00
David Rowe
fa1f2267cf Support RC63 2018-02-22 10:06:00 +13:00
David Rowe
adb6f66a05 Handle tablet entities and overlays not being available 2018-02-08 09:51:48 +13:00
David Rowe
75cf22ca7f Remove support for old High Fidelity versions 2018-02-07 09:45:21 +13:00
David Rowe
7f6471fcd1 Fix recording just made not being automatically played back 2018-02-06 13:24:41 +13:00
David Rowe
e3f9cce6e6 Fix Record app dialog not always opening successfully 2018-02-06 12:14:33 +13:00
luiscuenca
27ea74f5bf Fix sortOrder param on tablet buttons 2018-01-19 11:22:37 -07:00
David Rowe
8c2427dd58 Rename Window.protocolVersion() to Window.protocolSignature() 2018-01-19 09:06:16 +13:00
David Rowe
2883e24285 Add Window.protocolVersion() as a replacement for location's 2018-01-17 12:00:35 +13:00
Zach Fox
b2bafed2bb Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-07 11:21:24 -08:00
David Back
1aeadcbc64 prevent spectator cam from updating secondary cam aspect ratio when its in use by mirrors 2017-11-22 11:38:52 -08:00
Elisa Lupin-Jimenez
b6e75d1222 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-11-20 10:07:11 -08:00
Elisa Lupin-Jimenez
88823a169b changed url for blocks app 2017-11-20 10:01:33 -08:00
Alexander Ivash
c5d2f598d7 8244 Rename captionColorOverride to captionColor 2017-11-16 15:46:49 +03:00
Brad Davis
bb2e061d77 Fixing global declarations in JS 2017-11-15 12:00:52 -08:00
Brad Davis
26a745be6f Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet 2017-11-15 11:59:06 -08:00
Brad Davis
1167be4102 Reverting tablet API rename, cleaning up duplicated code 2017-11-15 11:52:55 -08:00