Andrew Meadows
7a5cb0d555
fix typo
2019-09-06 17:23:38 -07:00
Andrew Meadows
e97d3df637
bump version number
2019-09-06 17:23:38 -07:00
Andrew Meadows
e546ef23a8
don't bid for sim ownership of kinematic unless grabbed
2019-09-06 17:23:38 -07:00
Andrew Meadows
227b99859d
fix api for checking EntityItem grab status
2019-09-06 17:23:38 -07:00
Andrew Meadows
580b6a3b2c
small optimization: check before lock
2019-09-06 17:23:38 -07:00
Andrew Meadows
0a8c640ab5
give entity-script-server a simulation
2019-09-06 17:23:38 -07:00
Andrew Meadows
6e35c8b804
cleanup
2019-09-06 17:23:38 -07:00
Shannon Romano
e6a2905c35
Merge pull request #16153 from MattHardcastle/revert-url-encode
...
Revert "Percent decode URL from Thunder"
2019-09-06 17:08:57 -07:00
Matt Hardcastle
dba61180be
Revert "Percent decode URL from Thunder"
...
This reverts commit 4e6198d784
2019-09-06 15:11:44 -07:00
Sam Gateau
f909bc4cde
Merge pull request #16149 from samcake/yellow
...
BUGZ-1360: Avoid bad normal values leading to black pixels in Forward
2019-09-06 13:33:19 -07:00
Shannon Romano
42ad7d5efb
Merge pull request #16147 from MattHardcastle/updater-to-resource
...
Support updater in Contents/{MacOS,Resources}
2019-09-06 12:49:31 -07:00
Sam Gateau
9c14838443
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-09-06 12:41:11 -07:00
Zach Fox
adb266e065
Merge pull request #16148 from MiladNazeri/bugz-1395/persistent-emoji-after-shutdown
...
Bugz 1395/persistent emoji after shutdown
2019-09-06 11:42:30 -07:00
milad
bb0b51116a
cr1
2019-09-06 11:29:29 -07:00
Anthony Thibault
2857086861
Merge pull request #16136 from hyperlogic/feature/3x3-blend
...
Directional Blending Support
2019-09-06 11:10:56 -07:00
milad
b352d53083
removed space made on accident
2019-09-06 11:00:14 -07:00
Sam Gateau
bc0f719b71
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-09-06 10:58:35 -07:00
Sam Gateau
85c18f1033
Adding a clamp to 0 to the computed y coordinate while unpacking the normal map
2019-09-06 10:57:54 -07:00
milad
1d8bbc3529
removed startup time var
2019-09-06 10:55:35 -07:00
milad
1576a29916
toggled flag for discconecting from wearable signal
2019-09-06 10:53:17 -07:00
milad
120c678557
added a wearable check for avimojis on startup
2019-09-06 10:51:12 -07:00
Matt Hardcastle
b239ad1ae3
Support updater in Contents/{MacOS,Resources}
...
Codesigning fails when binaries are in the `Resources` directory. This
change moves updater and ensures HQLauncher can handle the updater at
both paths.
2019-09-06 10:37:24 -07:00
Shannon Romano
db0c2da516
Merge pull request #16142 from MattHardcastle/launcher-urldecode
...
Percent decode URL from Thunder
2019-09-06 10:34:52 -07:00
Sam Gateau
acf51ad217
Merge pull request #16137 from jherico/fix/bugz-1398
...
BUGZ-1398: Tablet access to local HTML
2019-09-06 09:59:22 -07:00
Anthony J. Thibault
aa848df227
warning fixes
2019-09-05 17:43:07 -07:00
Shannon Romano
5d316a9fd6
Merge pull request #16140 from jherico/fix/webrtc_debug_build
...
Fix webrtc link errors in debug builds
2019-09-05 16:09:26 -07:00
Matt Hardcastle
4e6198d784
Percent decode URL from Thunder
...
URLs from Thunder's API may be percent encoded.
2019-09-05 16:01:16 -07:00
Anthony J. Thibault
c35640f739
Warning fixes and small bug fix to anim stats
2019-09-05 14:54:19 -07:00
Shannon Romano
19c7502998
Merge pull request #16138 from MattHardcastle/check-zip-size
...
Check macOS Launcher's zip size before unzipping
2019-09-05 14:43:57 -07:00
Shannon Romano
b3c7ca6e8f
Merge pull request #16127 from amerhifi/master
...
case DEV-492: Ensure launcher cannot be pinned
2019-09-05 14:29:38 -07:00
Brad Davis
7c84d897ba
Fix webrtc link errors in debug builds
2019-09-05 14:16:52 -07:00
amerhifi
9e69b79e2a
adding the space back
2019-09-05 13:41:51 -07:00
amerhifi
2a3b99daa6
removing flags
2019-09-05 13:40:29 -07:00
Matt Hardcastle
43237e1409
Check macOS Launcher's zip size before unzipping
...
The Launcher can download an error page rather than the full Launcher.
When this happens, the error page file is passed directly to unzip,
which promptly fails with the following message:
End-of-central-directory signature not found. Either this file is not
a zipfile, or it constitutes one disk of a multi-part archive. In the
latter case the central directory and zipfile comment will be found on
the last disk(s) of this archive.
unzip: cannot find zipfile directory in one of NewHQLauncher.zip or
NewHQLauncher.zip.zip, and cannot find NewHQLauncher.zip.ZIP, period.
This change improves the error message by checking the size of the
Launcher download and failing if the Launcher is smaller than the
smallest Launcher we've released. The smallest Launcher we've had is
308KB, so I picked 250KB as the limit because it's a nice rounder number
below that.
2019-09-05 12:35:24 -07:00
Brad Davis
0511f87bad
BUGZ-1398: Tablet access to local HTML https://youtu.be/7EWQOeQf32U
2019-09-05 11:43:43 -07:00
MiladNazeri
21b8e268c1
Merge pull request #16135 from MiladNazeri/bugz-1395/emoji-stuck-on-start
...
[bugz-1415] :: Emoji App trying to shut down twice
2019-09-05 11:14:11 -07:00
Anthony J. Thibault
29de8a8d9f
remove ajt comment
2019-09-05 11:11:10 -07:00
Anthony J. Thibault
b6f28a6732
Switch additive animation deltas from a pre multiply to a post multiply.
2019-09-05 11:09:03 -07:00
Anthony J. Thibault
92df5cccdc
AnimBlendDirectional node
2019-09-05 11:09:02 -07:00
Anthony J. Thibault
6274ab4aa7
3x3 blend wip
2019-09-05 11:09:00 -07:00
milad
531dceae4d
changed status indicator to be similar to nametag and emoji
2019-09-05 10:29:25 -07:00
Shannon Romano
ef9b81ca0d
Merge pull request #16032 from sethalves/fix-polyvox-state-machine
...
BUGZ-1176: rework polyvox state-machine
2019-09-05 10:04:47 -07:00
Seth Alves
404b42c41e
remove unneeded call to tellNeighborsToRecopyEdges
2019-09-05 08:04:09 -07:00
milad
57a309db53
small formatting changes
2019-09-04 20:58:20 -07:00
Seth Alves
d86944baf4
rework polyvox state-machine
2019-09-04 20:14:11 -07:00
milad
408656f6ec
added line break
2019-09-04 17:06:00 -07:00
milad
c73ea11b37
lowecase object
2019-09-04 17:00:30 -07:00
milad
3f2d2996a0
removed comment region sections
2019-09-04 16:59:14 -07:00
Shannon Romano
96f6793a87
Merge pull request #16118 from hyperlogic/feature/aim-offset-blend
...
Additive animation support
2019-09-04 16:55:50 -07:00
milad
1a8d005220
Merge branch 'master' of github.com:highfidelity/hifi into bugz-1395/emoji-stuck-on-start
2019-09-04 16:49:58 -07:00
