luiscuenca
1f458d195e
Refactorting, up/down attenuation and comments
2019-09-06 17:50:06 -07:00
sabrina-shanman
0a97f2535b
Fix missing return on handling TextureBaker error
2019-09-06 17:46:59 -07:00
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
dooglifeSF
932093bead
Merge branch 'master' into Sitting_emote_variants
2019-09-06 15:06:52 -07:00
luiscuenca
3b8d3f987d
Add animation
2019-09-06 14:31:53 -07:00
luiscuenca
0e4e09acb5
Add blending
2019-09-06 14:30:10 -07:00
luiscuenca
189ddf39e2
Merge branch 'master' into addLookAtThirdCamera
2019-09-06 14:29:51 -07:00
Matt Hardcastle
d8fec15842
Error bad status while downloading launcher
2019-09-06 14:25:51 -07:00
dooglifeSF
422ad52a87
Add one more sitting emote: clap03, touch up two of the standing clap anims, adjust frame ranges
2019-09-06 13:57:33 -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
dante ruiz
768ac08d11
Add entitlements for Launcher and Interface
2019-09-06 11:20:16 -07:00
dante ruiz
c2e0e6a976
Change Launcher config.json location
...
Launcher `config.json` can not be inside Interface's app bundle, as it
will break signing.
2019-09-06 11:20:06 -07:00
dante ruiz
f80fb39447
Lowercase interface
...
Launcher expects a lower-cased "Interface". This ensures that it's
created lower-cased on case sensitive filesystems.
2019-09-06 11:19:54 -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
luiscuenca
78eee5961c
Fix key mapping for new camera
2019-09-05 18:05:46 -07:00
Anthony J. Thibault
aa848df227
warning fixes
2019-09-05 17:43:07 -07:00
luiscuenca
ddbd30fac9
Fix magic numbers and refactor some code
2019-09-05 17:14:35 -07:00
luiscuenca
ff8f2c5c16
Add new LookAt camera
2019-09-05 17:04:39 -07:00
dooglifeSF
b5d2675a05
Merge branch 'master' into Sitting_emote_variants
2019-09-05 16:45:24 -07:00
dooglifeSF
5061aca487
Update sitting_emote_raisehand03_all.fbx
2019-09-05 16:44:13 -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
dooglifeSF
9cfa4753d9
sitting emote acknowledge and dismiss added, also went through emote_agree set and pushed them per Josh feedback. Fixed point glitch stand/sit
2019-09-05 15:31:07 -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
ingerjm0
2322a9ea7f
Making sure ctrlaltdavid's changes made it into my repository
2019-09-05 13:58:59 -07:00
ingerjm0
55bdc7d2a6
Made sure ctrlaltdavid's changes made it into my repo
2019-09-05 13:54:55 -07:00
