Commit graph

68347 commits

Author SHA1 Message Date
Sam Gondelman
c7f05d96b4
Merge pull request #13309 from Cristo86/android_crashes_domains
Android - Double Click crash and dev-mobile crash with Pixel XL
2018-06-08 13:36:53 -07:00
Sam Gondelman
4e649d2498
Merge pull request #13276 from SamGondelman/resource
Protect against null resource
2018-06-08 11:35:04 -07:00
Sam Gondelman
87e6df3cba
Merge pull request #13319 from Cristo86/android_search_untagged
Android - Allow search among protocol compatible user stories and not only tagged ones
2018-06-08 10:59:33 -07:00
Sam Gateau
7f8af47075
Merge pull request #13326 from SamGondelman/green
Fix models starting as green boxes
2018-06-08 10:09:53 -07:00
David Back
e8aece4c11
Merge pull request #13315 from dback2/avatarFeet
Fix default avatar feet
2018-06-08 10:00:43 -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
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
SamGondelman
c18602d22e fix models starting as green boxes 2018-06-07 13:03:56 -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
Sam Gateau
c53a15ec78
Merge pull request #13314 from jherico/feature/oculus_update
Update Oculus integration
2018-06-07 11:45:31 -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
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
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
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
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
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
John Conklin II
07927767c9
Merge pull request #13302 from zfox23/MS15500_missingUserNamePAL
Fix MS15500: Ensure Connection usernames show up in PAL
2018-06-05 15:04:46 -07:00
Cristian Luis Duarte
b38eae3731 Only add RenderShadowTask if isDeferred 2018-06-05 18:54:48 -03:00
David Back
c1dceda4ac enable gamepad by default 2018-06-05 12:01:06 -07:00
Zach Fox
2932ce177d Fix MS15500: Ensure Connection usernames show up in PAL 2018-06-05 10:57:25 -07:00
SamGondelman
968758a022 CR 2018-06-05 09:35:17 -07:00
Ken Cooke
aa19794a94
Merge pull request #13243 from danteruiz/fix-copy-paste-cut-delete
fix copy delete cut paste commands and menus
2018-06-05 09:17:34 -07:00
Ken Cooke
83dda420ba
Merge pull request #13256 from danteruiz/remove-dead-code
remove dead code in Application::keyPressEvent
2018-06-05 09:16:28 -07:00
Zach Fox
c5ef5cfccb Fix MS15582: In My Purchases, invisible buttons shouldn't be clickable 2018-06-04 16:13:18 -07:00