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 |
|
Bradley Austin Davis
|
fa51c15849
|
Use binary resources on OSX
|
2018-06-06 15:10:52 -07:00 |
|
Zach Fox
|
6869718025
|
Fix MS14925: Don't double-call signal for display plugin change
|
2018-06-06 14:41:33 -07:00 |
|
Seth Alves
|
b70ffa5bae
|
Merge pull request #13297 from ctrlaltdavid/21835
Remove some deprecated functions from the Controller API
|
2018-06-06 14:06:34 -07:00 |
|
Sam Gondelman
|
b4afabee68
|
Merge pull request #13294 from SamGondelman/overlays
Add isGroupCulled property to ModelOverlays
|
2018-06-06 13:52:33 -07:00 |
|
Alexander Ivash
|
9b91f7bb5a
|
FB15569 - Debug default scripts no longer on developer menu
|
2018-06-06 23:32:41 +03:00 |
|
David Back
|
c294dd4ac7
|
fix path and name
|
2018-06-06 12:32:47 -07:00 |
|
David Back
|
afd4b5a8ab
|
update default avatar to fix non-flat feet
|
2018-06-06 11:48:04 -07:00 |
|
Sam Gateau
|
a1899e80c0
|
Merge pull request #13290 from AndrewMeadows/update-queryAACube
update server-side bounding box more correctly for grabbed things
|
2018-06-06 11:46:09 -07:00 |
|
Sam Gateau
|
c145c0c1b8
|
Merge pull request #13186 from SamGondelman/etc2comp
Android: Local texture compression using Etc2Comp
|
2018-06-06 11:13:50 -07:00 |
|
Seth Alves
|
6c8e514367
|
Merge pull request #13224 from danteruiz/fix-key-conflicts
Allow using the key 1,2,3 to swicth views and also to enter text in web entity or overlay
|
2018-06-06 11:08:04 -07:00 |
|
MiladNazeri
|
082c1fce52
|
Merge pull request #13251 from ctrlaltdavid/21880
JSDoc updates
|
2018-06-05 19:04:54 -07:00 |
|
Alexander Ivash
|
5897c9948d
|
terminate thread if it didn't complete during MAX_SCRIPT_QUITTING_TIME
|
2018-06-06 03:52:22 +03:00 |
|
Alexander Ivash
|
b954ac6759
|
FB15569 - Debug default scripts no longer on developer menu
|
2018-06-06 03:43:27 +03:00 |
|
amantley
|
0c879d85b5
|
added print statements and removed summed coeff from avatarData.cpp
|
2018-06-05 17:33:32 -07:00 |
|
howard-stearns
|
335aeaeb38
|
purchases cleanup, wearables, and edition numbers when multiples seen.
|
2018-06-05 17:06:08 -07:00 |
|
howard-stearns
|
6aa551b35c
|
Don't getNextPage when at beginning (even if that is also the end).
|
2018-06-05 17:04:29 -07:00 |
|
amantley
|
f21431ca88
|
added check for the actual face tracker in MyHead.cpp to prevent crash
|
2018-06-05 16:33:28 -07:00 |
|
Anthony J. Thibault
|
b5a3b25adc
|
Tuned hip smoothing times.
|
2018-06-05 16:07:54 -07:00 |
|
Anthony J. Thibault
|
993d035d37
|
Smooth out fly to idle transition, to prevent hip thrusting and pops.
|
2018-06-05 15:45:19 -07:00 |
|