amantley
|
22f2583556
|
removed debug print statement in AvatarData.cpp
|
2018-06-07 16:17:33 -07:00 |
|
howard-stearns
|
2761688d39
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-07 16:14:57 -07:00 |
|
howard-stearns
|
8b08505116
|
using filter/sort endpoint parameters
|
2018-06-07 16:14:18 -07:00 |
|
Zach Fox
|
c1b971a269
|
Fix MS15673: Ensure offscreenUI exists before updating SecurityImageProvider
|
2018-06-07 16:10:44 -07:00 |
|
amantley
|
67fc7b90b5
|
fixed get and set semi nibble to deal with 16 bits
|
2018-06-07 15:43:21 -07:00 |
|
Anthony J. Thibault
|
608575cf17
|
Large avatars should instantly shrink when entering small height domains
Also reduce the fudge factor for safeLanding from an additional 50% of avatar's height to 25%.
|
2018-06-07 15:31:40 -07:00 |
|
David Back
|
9a7e199528
|
Merge pull request #13270 from dback2/cloneables
Use version from JSON on domain restore
|
2018-06-07 15:15:43 -07:00 |
|
amantley
|
836c3da858
|
cleaned up white space and removed extra declaration of hadAudioEnabledFaceMovement
|
2018-06-07 15:11:57 -07:00 |
|
Zach Fox
|
f9b6e3e2ac
|
Merge pull request #13300 from zfox23/MS15582_PurchasesButtonClicks
Fix MS15582: In My Purchases, invisible buttons shouldn't be clickable
|
2018-06-07 15:10:00 -07:00 |
|
Zach Fox
|
f7de3cf218
|
Try a value of 1.8
|
2018-06-07 14:45:33 -07:00 |
|
John Conklin II
|
954a86e534
|
Merge pull request #13327 from sethalves/FB14390
terminate thread if it didn't complete during MAX_SCRIPT_QUITTING_TIME
|
2018-06-07 14:27:51 -07:00 |
|
Zach Fox
|
7d8e02e714
|
Fix MS15663/15664: Don't set Wallet Status to 'ready' too early
|
2018-06-07 14:01:52 -07:00 |
|
Zach Fox
|
448a522b70
|
MS15673: Do some experiments on bubble size
|
2018-06-07 13:29:33 -07:00 |
|
howard-stearns
|
df0ecb44a8
|
fix crash setting model texture
(cherry picked from commit b152bf02af4eb17cf5c169ca9c577154c83901f7)
|
2018-06-07 13:21:45 -07:00 |
|
Alexander Ivash
|
da92ff993f
|
terminate thread if it didn't complete during MAX_SCRIPT_QUITTING_TIME
|
2018-06-07 13:12:35 -07:00 |
|
SamGondelman
|
c18602d22e
|
fix models starting as green boxes
|
2018-06-07 13:03:56 -07:00 |
|
amantley
|
97831e61f0
|
removed stray comments
|
2018-06-07 12:54:46 -07:00 |
|
Zach Fox
|
93eba5fe5e
|
Merge pull request #13293 from zfox23/MS7224_cubeSnapshots
Fix MS7224: Add dimensions to printed Snapshot entity
|
2018-06-07 12:52:20 -07:00 |
|
Zach Fox
|
d33875e142
|
Merge pull request #13295 from zfox23/MS15574_WalletMemoryLeak
Fix MS15574: Tiny memory leak in Wallet.h
|
2018-06-07 12:42:24 -07:00 |
|
John Conklin II
|
287fd67e67
|
Merge pull request #13313 from dback2/gamepadEnabled
Enable gamepad by default
|
2018-06-07 12:42:04 -07:00 |
|
Cristian Duarte
|
664884c9a8
|
Use third person camera mode when switching to My View from Radar mode.
This makes it consistent with the default third person camera in My View.
|
2018-06-07 16:41:41 -03:00 |
|
howard-stearns
|
890c97e7cb
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-07 12:24:27 -07:00 |
|
Sam Gateau
|
c53a15ec78
|
Merge pull request #13314 from jherico/feature/oculus_update
Update Oculus integration
|
2018-06-07 11:45:31 -07:00 |
|
luiscuenca
|
df32fe60e4
|
using RayPick API
|
2018-06-07 11:44:59 -07:00 |
|
luiscuenca
|
5403db6d51
|
Merge branch 'master' into handTouchToDefault
|
2018-06-07 11:42:26 -07:00 |
|
John Conklin II
|
1646f543cd
|
Merge pull request #13273 from danteruiz/fix-show-overlays-menu
fixing show overlays menu item on start up
|
2018-06-07 11:34:30 -07:00 |
|
John Conklin II
|
66b66d5248
|
Merge pull request #13311 from ElderOrb/FB14390
terminate thread if it didn't complete during MAX_SCRIPT_QUITTING_TIME
|
2018-06-07 11:22:57 -07:00 |
|
John Conklin II
|
067fa46355
|
Merge pull request #13265 from wayne-chen/toggleSpaceMode
Re-adding toggleSpaceMode function
|
2018-06-07 11:21:28 -07:00 |
|
John Conklin II
|
be9938013f
|
Merge pull request #13271 from Cristo86/android_joystick_jumps_fix
Fix joystick and view control bug that makes it bounce
|
2018-06-07 11:18:26 -07:00 |
|
John Conklin II
|
3b413d0f72
|
Merge pull request #13272 from zfox23/MS14615_memoryUsageMinimized
MS14615: Prevent memory overuse when minimized
|
2018-06-07 11:16:56 -07:00 |
|
John Conklin II
|
8d173e0a9b
|
Merge pull request #13316 from ElderOrb/FB15569_RC68
FB15569 - Debug default scripts no longer on developer menu (for RC68)
|
2018-06-07 09:43:26 -07:00 |
|
John Conklin II
|
389bddb0f4
|
Merge pull request #13255 from ctrlaltdavid/21884
Fix properties not populating particle explorer tab
|
2018-06-07 09:42:45 -07:00 |
|
John Conklin II
|
d39eb250e1
|
Merge pull request #13310 from ElderOrb/FB15569
FB15569 - Debug default scripts no longer on developer menu
|
2018-06-07 09:41:59 -07:00 |
|
John Conklin II
|
277758cd03
|
Merge pull request #13275 from luiscuenca/fixNoAvatarMaterials
Check for null material pointer in CauterizedModel
|
2018-06-07 09:41:03 -07:00 |
|
David Back
|
ae5d056ca0
|
Merge pull request #13292 from dback2/fileChooser
File Dialog Fixes
|
2018-06-07 09:38:56 -07:00 |
|
John Conklin II
|
66e2bebcbf
|
Merge pull request #13279 from thoys/fix/create-camera
Fix MS13500: create-app camera orbit to not jump around on secondary monitor
|
2018-06-07 09:38:10 -07:00 |
|
Sam Gateau
|
146732a20f
|
Merge pull request #13317 from jherico/feature/mac_resources
Use binary resources on OSX
|
2018-06-07 09:38:00 -07:00 |
|
John Conklin II
|
2b6fdb6b69
|
Merge pull request #13217 from Atlante45/fix/ds-memory
Fix uploaded content archives taking too much memory
|
2018-06-07 09:37:41 -07:00 |
|
Zach Fox
|
7f04506020
|
Merge pull request #13318 from zfox23/MS14925_doubleCallingDisplayChanged
Fix MS14925: Don't double-emit signal for display plugin change
|
2018-06-07 09:32:50 -07:00 |
|
David Back
|
8f5de7b16a
|
use messageGrabEntity flag instead
|
2018-06-06 18:05:26 -07:00 |
|
amantley
|
6a11ddc349
|
removed print statements and removed the setting of procedural head variables in avatarData.cpp
|
2018-06-06 17:50:50 -07:00 |
|
David Back
|
0ee55a09b6
|
fix tabs
|
2018-06-06 17:35:25 -07:00 |
|
David Back
|
048872c79a
|
use messageEquip flag to fix Hifi-Hand-Grab
|
2018-06-06 17:32:52 -07:00 |
|
Bradley Austin Davis
|
e38059797d
|
Update Oculus integration
|
2018-06-06 17:27:30 -07:00 |
|
David Rowe
|
32c21a1397
|
Fix particle property value reverting to old value when switch tabs
|
2018-06-07 12:22:56 +12:00 |
|
amantley
|
dca93ca61f
|
fixed setatone16 function to return the correct result for additional flags
|
2018-06-06 16:44:12 -07:00 |
|
David Back
|
a246c9f0d1
|
fix fbx and textures
|
2018-06-06 15:47:29 -07:00 |
|
David Rowe
|
3e100fb141
|
Merge branch 'master' into 21884
|
2018-06-07 10:46:53 +12:00 |
|
Cristian Luis Duarte
|
293388ebc2
|
Android - Allow search among protocol compatible user stories and not only tagged ones
|
2018-06-06 19:26:13 -03:00 |
|
howard-stearns
|
8185d1b5f5
|
cleanup and consistently don't getNextPage at beginning
|
2018-06-06 15:24:54 -07:00 |
|