Thijs Wenker
|
a1ef1b4447
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
|
2018-12-24 16:48:40 +01:00 |
|
Ryan Huffman
|
8c56e35f69
|
Add granular status to avatar upload
|
2018-12-23 00:13:01 -08:00 |
|
Ryan Huffman
|
b717188ed0
|
Update avatar project styling
|
2018-12-22 21:57:09 -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 |
|
Ryan Huffman
|
556f516be6
|
Update uploader screen
|
2018-12-20 16:30:08 -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 |
|
luiscuenca
|
52bfaafd91
|
Fix crash on glTF import when the file contains embedded buffers
|
2018-12-20 13:25:19 -07: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Thijs Wenker
|
cb74313de8
|
create projects / style changes
|
2018-12-19 19:23:24 +01:00 |
|
Zach Fox
|
7fee0fc1e4
|
Fix MS20253: Only emit screenChanged once screen has changed
|
2018-12-19 09:50:52 -08:00 |
|
Zach Fox
|
116edcc224
|
I have no idea how this happened
|
2018-12-19 09:36:05 -08:00 |
|
Jeff Clinton
|
a7e7a2426e
|
Merge pull request #14538 from ElderOrb/FB19355
FB19355 - When I have avatar entities as children of my avatar, the A…
|
2018-12-19 09:09:54 -08:00 |
|
Jeff Clinton
|
c80b3dea52
|
Merge pull request #14611 from wayne-chen/fixScriptsNotBeingSaved-78
MS20356: Running Scripts list doesn't persist between Interface restarts
|
2018-12-19 08:52:40 -08:00 |
|
Jeff Clinton
|
16c7619aa7
|
Merge pull request #14608 from SamGondelman/zone
Case 19080: Fix zone with invalid script not loading
|
2018-12-19 08:49:33 -08:00 |
|
Jeff Clinton
|
16e3914cd7
|
Merge pull request #14598 from amantley/ripOutCruft
Fix for Camera-perspective-is-off-in-first-person-view, master branch
|
2018-12-18 17:15:58 -08:00 |
|
Zach Fox
|
f407042f3e
|
Quick polish fix to prevent UI flashing
|
2018-12-18 17:11:10 -08:00 |
|
Jeff Clinton
|
f51bdead20
|
Merge pull request #14606 from wayne-chen/fixFileLoginMenuButton
MS#20355: HMD persisting extra login windows
|
2018-12-18 17:04:46 -08:00 |
|
Wayne Chen
|
017eb9d1a3
|
adding fix for scripts not being saved
|
2018-12-18 16:32:44 -08:00 |
|
Antonina Savinova
|
1977180ecf
|
Merge pull request #14604 from zfox23/MS20089_interruptRecording
Implement MS20089: ACs playing avatar recordings now correctly handle playAvatarSound
|
2018-12-18 15:14:53 -08:00 |
|
Zach Fox
|
f31d685323
|
Fix spacing
|
2018-12-18 14:33:41 -08:00 |
|
Antonina Savinova
|
cceacd3d1d
|
Merge pull request #14593 from SimonWalton-HiFi/remove-backups-on-startup
Remove out-of-date backups on startup
|
2018-12-18 14:16:01 -08:00 |
|
Ryan Huffman
|
720cd90dc7
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
|
2018-12-18 13:17:28 -08:00 |
|
Ryan Huffman
|
ad471387f7
|
Integrate marketplace upload API
|
2018-12-18 13:08:55 -08:00 |
|
SamGondelman
|
7231116e43
|
fix zone with invalid script not loading
|
2018-12-18 13:04:56 -08:00 |
|
Wayne Chen
|
b82ba8c085
|
do nothing with file>login in login state
|
2018-12-18 12:51:01 -08:00 |
|
Jeff Clinton
|
889f110357
|
Merge pull request #13925 from sethalves/fix-polyvox-texture-and-single-setter
fix a bug that broke Entities.setVoxel(). Fix polyvox textures
|
2018-12-18 12:15:07 -08:00 |
|
Jeff Clinton
|
2ff4905ed3
|
Merge pull request #14599 from wayne-chen/keepMeLoggedInDefault-78
MS20352: Keep me logged in checkbox as on by default
|
2018-12-18 11:57:17 -08:00 |
|