Alexander Ivash
|
814cfa4587
|
fix TabletAssetServer
|
2018-03-30 00:09:28 +03:00 |
|
Olivier Prat
|
bd0e13463d
|
Fix on unpackDeferredPosition
|
2018-03-29 17:06:23 -04:00 |
|
John Conklin II
|
90dec1d3ef
|
Merge pull request #12733 from birarda/bug/scripts-copy-in-dev-rc66
RC66: fix cmake changes for script copy for dev builds
|
2018-03-29 13:57:45 -07:00 |
|
John Conklin II
|
b1ac2fd191
|
Merge pull request #12728 from SamGondelman/signedChar
Android: Fix octal code signed char issue
|
2018-03-29 13:56:06 -07:00 |
|
David Rowe
|
7027ccb6d8
|
Remove unused code
|
2018-03-30 09:35:25 +13:00 |
|
Alexander Ivash
|
e5da59a62f
|
FB12870 - Tablet UI ->Asset Browser unresponsive when enabling/disabling "use baked version"
|
2018-03-29 23:01:59 +03:00 |
|
Olivier Prat
|
5f8693aae2
|
Merge branch 'master' of http://github.com/highfidelity/hifi into fade
|
2018-03-29 15:52:38 -04:00 |
|
John Conklin II
|
c7f7e2487c
|
Merge pull request #12738 from sethalves/fix-json-drag-and-drop-rc66
fix -- make drag-and-drop of json mean import again
|
2018-03-29 12:46:09 -07:00 |
|
David Rowe
|
3b90078097
|
Remove Entities.currentAvatarEnergy and related from the API
|
2018-03-30 08:36:18 +13:00 |
|
John Conklin II
|
d6b652bdf3
|
Merge pull request #12735 from druiz17/RC66
Fix name conflict with c++ class and qml file(RC66)
|
2018-03-29 12:06:15 -07: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 |
|
Dante Ruiz
|
f7a081c9ec
|
minimize diff
|
2018-03-29 11:24:31 -07:00 |
|
Dante Ruiz
|
420672a769
|
fix-qml-confict
|
2018-03-29 11:24:08 -07:00 |
|
Dante Ruiz
|
e738274e90
|
map flying down back to C key
|
2018-03-29 11:10:39 -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 |
|
Seth Alves
|
dcfebde54a
|
put back the pre serverless-domain behavior for when a json file is dragged-and-dropped into the interface window -- import the json rather than load as a serverless-domain
|
2018-03-29 10:50:43 -07:00 |
|
amantley
|
3f44b88d2d
|
added js documentation for the three trigger recenter functionsthat have been added to MyAvatar class
|
2018-03-29 10:09:51 -07:00 |
|
John Conklin II
|
c4b46d0a5f
|
Merge pull request #12719 from Atlante45/fix/ess-method-call
Fix ESS remote method calls for connect only users
|
2018-03-29 10:07:44 -07:00 |
|
SamGondelman
|
afe39aba46
|
fix octal code char issue
|
2018-03-29 10: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 |
|
Dante Ruiz
|
0bdf26faaf
|
minimize diff
|
2018-03-29 09:29:01 -07:00 |
|
Dante Ruiz
|
8cdb59413d
|
fix-qml-confict
|
2018-03-29 09:26:05 -07:00 |
|
Olivier Prat
|
ef63651b2b
|
Duration and timing controls are disabled when event is not time based
|
2018-03-29 12:07:56 -04:00 |
|
Olivier Prat
|
648e6a6c9b
|
Added description for each event
|
2018-03-29 10:47:18 -04:00 |
|
Olivier Prat
|
07cb1c1f9e
|
Moved gradient invert checkbox
|
2018-03-29 10:19:24 -04:00 |
|
Olivier Prat
|
3c8cd48dfb
|
Merge branch 'master' of http://github.com/highfidelity/hifi into fade
|
2018-03-29 07:21:01 -04: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 |
|
Olivier Prat
|
9a7f88cd78
|
Moved save / load buttons to top
|
2018-03-28 19:23:09 -04: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 |
|
Olivier Prat
|
6639a245df
|
Object picking / edition for transitions are activate / deactivated when transition editor window is shown / hidden
|
2018-03-28 18:20:10 -04:00 |
|
Stephen Birarda
|
35ee1bec09
|
fix cmake changes for script copy for dev builds
|
2018-03-28 14:56:53 -07:00 |
|
Stephen Birarda
|
0172c24cf2
|
fix cmake changes for script copy for dev builds
|
2018-03-28 14:47:09 -07:00 |
|
Anthony J. Thibault
|
ca3fe28b05
|
JavaScript exceptions during Controller system callbacks are now logged
(cherry picked from commit d3aec12e9e76e4aeb8ecbd449cc76afda1a0e35d)
|
2018-03-28 14:01:21 -07:00 |
|
Clement
|
cb07fc47dc
|
Fix ESS remote method calls for connect only users
|
2018-03-28 14:01:03 -07:00 |
|
amantley
|
90d87c5b5d
|
changed get functions to const in MyAvatar.cpp changed bool variables to atomic for thread safety
|
2018-03-28 14:00:36 -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 |
|
Olivier Prat
|
e4416db06f
|
Added save/file dialog for transition configurations in transition editor
|
2018-03-28 16:54:53 -04:00 |
|
vladest
|
70ce1b2bf7
|
Fix invalid scrolling detection
|
2018-03-28 21:48:44 +02: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 |
|
amantley
|
4b1f974561
|
fixed merge conflict for declaring _hmdLeanRecenterEnabled in MyAvatar.h
|
2018-03-28 11:57:48 -07:00 |
|
Zach Fox
|
0175028a88
|
Ensure location is correctly updated when replacing set from Checkout page
|
2018-03-28 11:31:51 -07:00 |
|
vladest
|
001b6d23ff
|
Merge branch 'master' into move_to_qqc2
|
2018-03-28 20:16:26 +02: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 |
|
amantley
|
95f1d0e4fa
|
added get and set functions for the activate recenter variables
|
2018-03-28 10:33:00 -07:00 |
|
Zach Fox
|
ca2fba675d
|
Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation
|
2018-03-28 10:28:32 -07:00 |
|
Brad Hefta-Gaub
|
16df773de4
|
Merge pull request #12721 from highfidelity/RC66
RC66 - Mergeback
|
2018-03-28 09:55:46 -07:00 |
|