Seth Alves
|
a2399ea1f6
|
keep small masses from introducing NaN into bullet's calculations
|
2018-06-08 16:07:01 -07:00 |
|
David Rowe
|
dc46c2077d
|
Fix function name
|
2018-06-09 11:01:18 +12:00 |
|
howard-stearns
|
f0d486a6a5
|
remove the unused client-side stuff from model
|
2018-06-08 15:48:39 -07:00 |
|
howard-stearns
|
d9daa3495a
|
remove comments / dead code
|
2018-06-08 15:36:10 -07:00 |
|
howard-stearns
|
ce322a4794
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-08 15:33:07 -07:00 |
|
John Conklin II
|
bc3edbc7fc
|
Merge pull request #13333 from zfox23/MS15681_securityImageProviderCrash
Fix MS15673: Ensure offscreenUI exists before updating SecurityImageProvider
|
2018-06-08 15:14:32 -07:00 |
|
howard-stearns
|
210cb23de6
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-08 14:54:15 -07:00 |
|
Stephen Birarda
|
112abc9d7e
|
Merge pull request #13148 from birarda/feat/new-version-numbers
add SHA to PR/master version, add build_type (stable/master/pr/dev)
|
2018-06-08 14:44:22 -07:00 |
|
howard-stearns
|
36a0adf553
|
strip snapshot stacking code - we'll do it on server or not at all
|
2018-06-08 14:24:24 -07:00 |
|
Zach Fox
|
95faad23e2
|
Merge pull request #13329 from zfox23/MS15664_15663_fixWalletAuthStep
Fix MS15663/15664: Don't set Wallet Status to 'ready' too early
|
2018-06-08 14:20:21 -07:00 |
|
Zach Fox
|
812c28ef48
|
Fix MS13761: Change the move conditions under which overlays hide
|
2018-06-08 14:15:42 -07:00 |
|
SamGondelman
|
310e2ee063
|
attempt to fix first time model overlay loading
|
2018-06-08 13:56:21 -07:00 |
|
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 |
|
Ryan Huffman
|
3e65e0b0cd
|
Update processImage to not compress by default
|
2018-06-08 13:21:47 -07:00 |
|
howard-stearns
|
3ade31bdf6
|
always show edition
|
2018-06-08 12:57:40 -07:00 |
|
Ryan Huffman
|
24182d3451
|
Remove compression variables & functions in image.cpp
|
2018-06-08 12:14:52 -07:00 |
|
howard-stearns
|
dd0f3c64ec
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-08 12:12:21 -07:00 |
|
Stephen Birarda
|
e82edb8b66
|
add domain packet dissector, improve entity dissector
|
2018-06-08 11:58:09 -07:00 |
|
Ryan Huffman
|
faafd26d2a
|
Add uncompressed KTX files to baked texture output
|
2018-06-08 11:39:47 -07:00 |
|
Zach Fox
|
9f0864944c
|
Fix Friending in Connections tab - READ FIXME
|
2018-06-08 11:37:02 -07:00 |
|
Sam Gondelman
|
4e649d2498
|
Merge pull request #13276 from SamGondelman/resource
Protect against null resource
|
2018-06-08 11:35:04 -07:00 |
|
SamGondelman
|
a7d75b121f
|
fix avatarHash crash
|
2018-06-08 11:20:41 -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 |
|
Zach Fox
|
d4a19e7bc9
|
Fix MS15721: Delete app.json if installed script isn't running
|
2018-06-08 10:52:14 -07:00 |
|
Zach Fox
|
76b5dae721
|
Let's try 20%
|
2018-06-08 10:19:55 -07:00 |
|
amantley
|
dabcd4c234
|
fixed bracket spacing in HeadData.h
|
2018-06-08 10:19: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 |
|
howard-stearns
|
21ed081eae
|
proper name for updated type filter of inventory endpoint
|
2018-06-08 09:52:11 -07:00 |
|
John Conklin II
|
0cadb95d62
|
Merge pull request #13336 from Atlante45/fix/ual-default-rc68
Set UAL default value earlier to be caught by crashpad - RC68
|
2018-06-08 08:15:49 -07:00 |
|
amantley
|
b1c578ecaa
|
fixed white space in head.cpp
|
2018-06-07 22:13:53 -07:00 |
|
howard-stearns
|
64e466ee7d
|
snapshot stacks
|
2018-06-07 21:10:40 -07:00 |
|
David Rowe
|
8e1e93abb0
|
Don't save user location if not connected to domain
|
2018-06-08 15:04:01 +12:00 |
|
Atlante45
|
83e1db14cf
|
Set UAL default value earlier to be caught by crashpad
|
2018-06-07 19:40:30 -07:00 |
|
howard-stearns
|
595a0d8733
|
restore lost code
|
2018-06-07 19:24:05 -07:00 |
|
amantley
|
3f58202667
|
updated the AvatarMixerPacketVersion to ProceduralFaceMovementFlagsAndBlendshapes in PacketHeaders.cpp
|
2018-06-07 17:41:12 -07:00 |
|
howard-stearns
|
348d5fc359
|
inventory text filter
|
2018-06-07 17:01:48 -07:00 |
|
SamGondelman
|
c7007c089f
|
fix tablet not disappearing
|
2018-06-07 16:35:22 -07:00 |
|
amantley
|
913d78841d
|
Merge remote-tracking branch 'upstream/master' into scriptedBlendshapes
synching with upstream master
|
2018-06-07 16:20:11 -07:00 |
|
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 |
|