David Back
|
58e1df970f
|
remove need for Asset/Resources folder, fix rotations on root
|
2018-12-21 18:00:55 -08:00 |
|
David Back
|
28b4527632
|
Avatar Exporter - joint rotation offsets and file workflow changes
|
2018-12-21 18:00:55 -08:00 |
|
Ryan Huffman
|
9955de6288
|
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
|
2018-12-21 11:43:49 -08:00 |
|
Ryan Huffman
|
748135eef9
|
Fix login-required size and projectFiles warning
|
2018-12-21 11:43:20 -08:00 |
|
Thijs Wenker
|
ad2d9bc79a
|
- fst read/write should work
- images are being copied into the correct directory
- scripts are added to fst upon project load
- modal overlay fix
|
2018-12-21 19:34:54 +01:00 |
|
Adam Smith
|
a9f59fae71
|
Merge pull request #14631 from highfidelity/revert-14547-NOverlays5
Revert "Case 20200: Update EntityScriptingInterface to not find local entities"
|
2018-12-21 10:32:59 -08:00 |
|
Thijs Wenker
|
1da5b3fae2
|
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
|
2018-12-21 19:20:16 +01:00 |
|
Ryan Huffman
|
7602da6f92
|
Add AvatarProjectUpload.qml
|
2018-12-21 08:16:18 -08:00 |
|
Thijs Wenker
|
ea901aa179
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
|
2018-12-21 14:11:57 +01:00 |
|
Thijs Wenker
|
dab4a621a3
|
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
|
2018-12-21 01:59:11 +01:00 |
|
Adam Smith
|
3c89d51994
|
Merge pull request #14626 from luiscuenca/gltfEmbeddedBinCrashFix
Case 20391: Fix crash when importing a glTF model that contains embedded buffers
|
2018-12-20 16:55:37 -08:00 |
|
Sam Gondelman
|
097d2d9503
|
Revert "Case 20200: Update EntityScriptingInterface to not find local entities"
|
2018-12-20 16:53:33 -08:00 |
|
SamGondelman
|
835615fbbd
|
separate out v3 and v4
|
2018-12-20 16:33:13 -08:00 |
|
Ryan Huffman
|
556f516be6
|
Update uploader screen
|
2018-12-20 16:30:08 -08:00 |
|
Brad Davis
|
c985eb3e80
|
Fix for Oculus reset view issue
|
2018-12-20 16:07:55 -08:00 |
|
SamGondelman
|
9fc7813e24
|
Merge remote-tracking branch 'upstream/master' into v3
|
2018-12-20 16:05:06 -08:00 |
|
SamGondelman
|
bb030660bd
|
Merge remote-tracking branch 'upstream/master' into NOverlays4
|
2018-12-20 13:26:23 -08:00 |
|
sam gateau
|
26c9d7a94e
|
Merge branch 'master' of github.com:highfidelity/hifi into punk
|
2018-12-20 13:22:19 -08:00 |
|
Shannon Romano
|
21ec4e0c53
|
Merge pull request #14524 from SamGondelman/NOverlays3
Case 20132, Case 16928: First class Image Entities
|
2018-12-20 21:20:49 +00:00 |
|
sam gateau
|
49df69e609
|
Merge branch 'master' of github.com:highfidelity/hifi into punk
|
2018-12-20 13:17:02 -08:00 |
|
sam gateau
|
7e1f75e0f3
|
Fixing the debug of shadow frustum for real
|
2018-12-20 13:16:41 -08:00 |
|
luiscuenca
|
52bfaafd91
|
Fix crash on glTF import when the file contains embedded buffers
|
2018-12-20 13:25:19 -07:00 |
|
SamGondelman
|
837c261fd5
|
deprecated dashed/isDashed
|
2018-12-20 11:28:42 -08:00 |
|
Shannon Romano
|
b6d1607acd
|
Merge pull request #14547 from SamGondelman/NOverlays5
Case 20200: Update EntityScriptingInterface to not find local entities
|
2018-12-20 19:10:22 +00:00 |
|
Thijs Wenker
|
79a9c82168
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
|
2018-12-20 18:56:33 +01:00 |
|
sam gateau
|
21577ba311
|
fixing warnings and the debug of shadows
|
2018-12-20 09:27:15 -08:00 |
|
David Kelly
|
2c647462b1
|
ACs don't need to call into flagtimeForConnecitonStep
|
2018-12-20 10:15:44 -07:00 |
|
Jeff Clinton
|
3d4311b7d4
|
Merge pull request #14613 from zfox23/MS20253_eventBridge
MS20253: Only emit screenChanged once screen has changed
|
2018-12-20 08:58:53 -08:00 |
|
Sam Gateau
|
8fba8062c3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-12-19 20:01:48 -08:00 |
|
Sam Gateau
|
80a55e2ae9
|
Compiling
|
2018-12-19 20:01:14 -08:00 |
|
sam gateau
|
253a71a20c
|
updating some code and probably broken in this version
|
2018-12-19 18:22:01 -08:00 |
|
Zach Fox
|
22c2954423
|
Merge pull request #14568 from zfox23/MS20187_itemTrash
Implement MS20187: Add trash can feature to Inventory
|
2018-12-19 18:19:29 -08:00 |
|
SamGondelman
|
bf704c2d0d
|
remove gl_DepthRange
|
2018-12-19 16:21:12 -08:00 |
|
Simon Walton
|
9cb53af023
|
Correct set avatar-scale timestamp when changing in Avatar class
|
2018-12-19 16:13:12 -08:00 |
|
Seth Alves
|
428212d572
|
Merge pull request #14615 from wayne-chen/landInDomainSecondRun-78
MS20366: Restarting interface and skipping login causes user to appear in serverless
|
2018-12-19 16:11:40 -08:00 |
|
Jeff Clinton
|
5ba83bcc04
|
Merge pull request #14618 from wayne-chen/fixInventoryLoginScreen-78
MS20374: Issues with overlays - Part 1: Inventory app Log In button
|
2018-12-19 15:40:42 -08:00 |
|
Zach Fox
|
b0ce3a54d5
|
Merge branch 'MS20187_itemTrash' of github.com:zfox23/hifi into MS20187_itemTrash
|
2018-12-19 15:16:55 -08:00 |
|
Zach Fox
|
d0998174ff
|
Un-wear things when trashing them if worn
|
2018-12-19 15:16:48 -08:00 |
|
Zach Fox
|
46e00cf1b3
|
Merge branch 'master' of github.com:highfidelity/hifi into MS20187_itemTrash
|
2018-12-19 15:03:36 -08:00 |
|
SamGondelman
|
05e0fb464e
|
new improved polylines
|
2018-12-19 15:01:49 -08:00 |
|
amantley
|
bc78ebe05d
|
cleaned up the button event code for the proximity sensor button
|
2018-12-19 14:21:14 -08:00 |
|
amantley
|
d0802b9d62
|
fixed merge conflict in fbxserializer
|
2018-12-19 13:46:02 -08:00 |
|
amantley
|
a7510cbfbe
|
removed debug print statements
|
2018-12-19 13:43:50 -08:00 |
|
Wayne Chen
|
c36b3a4b07
|
fix
|
2018-12-19 12:46:41 -08:00 |
|
Wayne Chen
|
50d57e8b60
|
sending user to previous location on second launch
|
2018-12-19 12:37:08 -08:00 |
|
Ryan Huffman
|
202326dbac
|
Merge branch 'feat/avatarTools/avatarPackager' of https://github.com/thoys/hifi into feat/avatarTools/avatarPackager
|
2018-12-19 12:03:30 -08:00 |
|
amantley
|
b8c0d6d9f9
|
removed print statement in application.cpp and added check of button flag in openvrhelpers.cpp
|
2018-12-19 12:00:40 -08:00 |
|
Sam Gondelman
|
e890fc6980
|
Merge branch 'master' into NOverlays3
|
2018-12-19 11:37:10 -08:00 |
|
Adam Smith
|
828672343a
|
Merge pull request #14523 from SamGondelman/NOverlays2
Case 20131: Cleanup some Entity Properties
|
2018-12-19 11:33:24 -08:00 |
|
Ryan Huffman
|
c2aca64b11
|
Add start of opening uploaded avatar in inventory
|
2018-12-19 11:30:21 -08:00 |
|