Alexander Ivash
|
814cfa4587
|
fix TabletAssetServer
|
2018-03-30 00:09:28 +03:00 |
|
Alexander Ivash
|
e5da59a62f
|
FB12870 - Tablet UI ->Asset Browser unresponsive when enabling/disabling "use baked version"
|
2018-03-29 23:01:59 +03:00 |
|
John Conklin II
|
379df87d0c
|
Merge pull request #12697 from misslivirose/feat/disable-add-without-url
Disable Add Button in Model Modal until user has entered text in the model URL
|
2018-03-29 11:39:48 -07:00 |
|
John Conklin II
|
a76b4b1008
|
Merge pull request #12734 from samcake/RC66-fetchMetaItem
RC66: Add an extra sanity check when calling fetchMetaSubItemBounds
|
2018-03-29 11:05:08 -07:00 |
|
John Conklin II
|
97d9c1b735
|
Merge pull request #12726 from jherico/fix/rc66_crashes
Attempt to resolve potential overlay crashes at shutdown
|
2018-03-29 09:37:23 -07:00 |
|
Liv Erickson
|
387ff680d5
|
support deleted scenario
|
2018-03-28 18:12:30 -07:00 |
|
Liv Erickson
|
b78f00342e
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/disable-add-without-url
|
2018-03-28 17:53:42 -07:00 |
|
Sam Gondelman
|
d2a74e5713
|
Merge pull request #12686 from gcalero/android_ui_not_move_camera
Android - Prevent Camera movement with UI (especially Windows and Radar mode)
|
2018-03-28 17:14:42 -07:00 |
|
samcake
|
2ee0af03c8
|
Add an extra sanity check when calling fetchMetaSubItems when the subItems is not allocated yet
|
2018-03-28 16:17:55 -07:00 |
|
Stephen Birarda
|
a697f971bb
|
Merge pull request #12732 from birarda/bug/scripts-copy-in-dev
fix cmake changes for script copy for dev builds
|
2018-03-28 15:55:37 -07:00 |
|
Cristian Luis Duarte
|
fe9481b28d
|
Cleanup code, comment out log, simplify radar is valid touch code (no more flag)
|
2018-03-28 19:50:44 -03:00 |
|
Stephen Birarda
|
0172c24cf2
|
fix cmake changes for script copy for dev builds
|
2018-03-28 14:47:09 -07:00 |
|
John Conklin II
|
790162c88b
|
Merge pull request #12689 from ctrlaltdavid/21808
Reinstate Overlays.getOverlayObject API function
|
2018-03-28 14:00:28 -07:00 |
|
Cristian Luis Duarte
|
f0bcaa47c8
|
Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera
|
2018-03-28 16:47:21 -03:00 |
|
John Conklin II
|
5a7267a844
|
Merge pull request #12671 from Triplelexx/21794_inspect_avatars
WL#21794: Modify inspect.js to work with Avatars as well as entities
|
2018-03-28 10:44:30 -07:00 |
|
Brad Hefta-Gaub
|
16df773de4
|
Merge pull request #12721 from highfidelity/RC66
RC66 - Mergeback
|
2018-03-28 09:55:46 -07:00 |
|
John Conklin II
|
586fb4829c
|
Merge pull request #12637 from druiz17/fix-asset-server-qml
Fix asset server qml sorting
|
2018-03-28 09:35:53 -07:00 |
|
John Conklin II
|
d59a721f16
|
Merge pull request #12724 from sethalves/fix-entity-import
fix entity importing
|
2018-03-28 09:18:20 -07:00 |
|
Brad Davis
|
9be162de95
|
Synchronously shut down QML rendering threads
|
2018-03-28 09:13:46 -07:00 |
|
Brad Davis
|
aacfe92751
|
Don't trigger crashes from timers while waiting for some operation on exit
|
2018-03-28 09:09:56 -07:00 |
|
Seth Alves
|
46fb2033f2
|
Merge pull request #12574 from druiz17/remap-keybaord
changing keyboard mapping
|
2018-03-27 19:00:05 -07:00 |
|
Seth Alves
|
bb101956a6
|
fix entity importing
|
2018-03-27 18:25:43 -07:00 |
|
Dante Ruiz
|
ad9ca0da20
|
fix tablet version
|
2018-03-27 16:03:06 -07:00 |
|
John Conklin II
|
a258a330d3
|
Merge pull request #12676 from druiz17/fix-keyboard
fixing AddressManager keyboard when switching domains
|
2018-03-27 15:34:23 -07:00 |
|
Brad Davis
|
29106fbbbe
|
Prevent potential double delete of QML overlays
|
2018-03-27 14:18:19 -07:00 |
|
Brad Davis
|
eb20181b60
|
Shut down the overlay interface on exit
|
2018-03-27 14:18:01 -07:00 |
|
John Conklin II
|
0862f345fe
|
Merge pull request #12717 from sethalves/workaround-dialog-crash
fix -- work around asset-upload dialog crash
|
2018-03-27 13:35:50 -07:00 |
|
Clément Brisset
|
d8042f78e8
|
Merge pull request #12713 from highfidelity/RC66
RC66 - Merge Back
|
2018-03-27 13:01:14 -07:00 |
|
John Conklin II
|
bcd2de3bf8
|
Merge pull request #12660 from alexiamandeville/awayImage-update
Update away image and image paths
|
2018-03-27 12:46:37 -07:00 |
|
John Conklin II
|
7c505a0b85
|
Merge pull request #12711 from sethalves/serverless-tutorial-rc66
Serverless tutorial rc66
|
2018-03-27 11:17:07 -07:00 |
|
Seth Alves
|
4f7d856a1c
|
don't free dialogs to avoid crash in setKeyboardRaised
|
2018-03-27 09:28:55 -07:00 |
|
John Conklin II
|
3e23ad4900
|
Merge pull request #12709 from zfox23/RC66_commerce_fixCheckoutInfiniteLoad
RC66: Fix infinite loading when authing wallet during Checkout
|
2018-03-26 14:33:57 -07:00 |
|
Seth Alves
|
60ed033667
|
new content md5
|
2018-03-26 14:33:08 -07:00 |
|
Ryan Huffman
|
d01a58517f
|
Fix serverless content not using correct directories
|
2018-03-26 14:32:52 -07:00 |
|
Seth Alves
|
6948de7e24
|
default to serverless tutorial
|
2018-03-26 14:32:40 -07:00 |
|
Stephen Birarda
|
787947b6a8
|
add a default tutorial json for dev interface
|
2018-03-26 14:32:26 -07:00 |
|
Stephen Birarda
|
b52a877d8d
|
optionally grab serverless tutorial, on for installers
|
2018-03-26 14:32:11 -07:00 |
|
Zach Fox
|
a588776b47
|
Fix infinite loading when authing wallet during Checkout
|
2018-03-26 13:19:40 -07:00 |
|
Dante Ruiz
|
1f23e7ab8b
|
fixing more edge cases
|
2018-03-26 10:15:15 -07:00 |
|
Dante Ruiz
|
b8796db1e5
|
Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord
|
2018-03-26 09:13:58 -07:00 |
|
Cristian Luis Duarte
|
6cb5cd7f92
|
Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera
|
2018-03-26 11:19:42 -03:00 |
|
Sam Gondelman
|
11f5e7812b
|
Merge pull request #12702 from SamGondelman/android
Android: Fix tonemapping
|
2018-03-23 17:43:57 -07:00 |
|
Dante Ruiz
|
96707a2568
|
fix mappoing conflicts
|
2018-03-23 16:43:36 -07:00 |
|
Cristian Luis Duarte
|
686af4ff77
|
Clean code that manually checked for windows coordinates to disable radar touch
|
2018-03-23 20:02:51 -03:00 |
|
Cristian Luis Duarte
|
242b009562
|
Android - Use mouse events for interacting with UI. Now LoginDialog UI interation does not move radar camera. Remove repeated tooggle call in audio.js. Adapt button to simulated mouse events.
|
2018-03-23 18:59:55 -03:00 |
|
SamGondelman
|
a19f71e759
|
fix tonemapping on android
|
2018-03-23 14:16:47 -07:00 |
|
Dante Ruiz
|
28e61bcbb1
|
fix typo
|
2018-03-23 11:57:01 -07:00 |
|
Dante Ruiz
|
a14d5c6546
|
make alternate keys work
|
2018-03-23 11:55:16 -07:00 |
|
John Conklin II
|
563ff61325
|
Merge pull request #12661 from SamGondelman/android
Android: Stats, disable IK, reduce impact of InputRecorder
|
2018-03-23 11:08:50 -07:00 |
|
Ryan Huffman
|
e90c051744
|
Merge pull request #11872 from huffman/feat/version-wo
Add asset server baking versioning
|
2018-03-23 08:27:37 -07:00 |
|