Thijs Wenker
|
cb91a4bc6d
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
|
2019-01-03 00:10:22 +01:00 |
|
Antonina Savinova
|
4838a9107a
|
Merge pull request #14624 from davidkelly/dk/17207
ACs don't need to call into flagtimeForConnecitonStep
|
2019-01-02 13:41:30 -08:00 |
|
Ryan Huffman
|
f3d2d7c95b
|
Merge pull request #14638 from huffman/fix/entity-list-text-mb
Fix texture MB column not sorting correctly in entity list
|
2019-01-02 13:32:05 -08:00 |
|
Jeff Clinton
|
d5ef7ba175
|
Merge pull request #14610 from roxanneskelly/Case20106
Case 20106-AC agents spawned with -n don't come back
|
2019-01-02 11:07:40 -08:00 |
|
Jeff Clinton
|
7143689ddf
|
Merge pull request #14620 from amantley/hmdSmoothFix
VIVE can now auto-detect hmd and desktop modes
|
2019-01-02 09:15:32 -08:00 |
|
Jeff Clinton
|
bb27acf934
|
Merge pull request #14530 from SamGondelman/NOverlays4
Case 20134: Grid Entities
|
2019-01-02 09:12:34 -08:00 |
|
Jeff Clinton
|
032178673a
|
Merge pull request #14634 from SamGondelman/NOverlays5
Case 20200: Update EntityScriptingInterface to not find local entities (#2)
|
2019-01-02 09:00:56 -08:00 |
|
Thijs Wenker
|
20c169bd39
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
|
2019-01-02 14:03:13 +01:00 |
|
Thijs Wenker
|
cb33a91a34
|
- rename functionality
- avatar packager works in tablet now
|
2018-12-29 03:31:56 +01:00 |
|
Adam Smith
|
833ad936c0
|
Merge pull request #14630 from jherico/fix/20284_master
Fix for Oculus reset view issue
|
2018-12-28 16:24:40 -08:00 |
|
Adam Smith
|
52980559b8
|
Merge pull request #14491 from SamGondelman/v3
Case 20080: v3 + v4 procedurals and misc shader fixes
|
2018-12-28 15:17:50 -08:00 |
|
Ryan Huffman
|
e7f7f295b0
|
Merge pull request #14583 from dback2/unityAvatarExporter2
Avatar Exporter - joint rotation offsets and file workflow changes
|
2018-12-28 15:14:55 -08:00 |
|
John Conklin II
|
4f3dd390b5
|
Merge pull request #14625 from SamGondelman/deprecateDashed
Case 20392: Deprecated 3D Overlay dashed/isDashed
|
2018-12-28 10:16:27 -08:00 |
|
Thijs Wenker
|
1ec8aa8fa5
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
|
2018-12-28 17:13:05 +01:00 |
|
Ryan Huffman
|
24aaeee5fd
|
Disable back button on avatar upload page
|
2018-12-27 22:55:54 -08:00 |
|
Ryan Huffman
|
8f70865cf7
|
Fix marketplace upload finishing before inventory item is valid
|
2018-12-27 21:02:56 -08:00 |
|
Ryan Huffman
|
83a60a541b
|
Fix styling and flow issues in avatar uploader
|
2018-12-27 18:53:07 -08:00 |
|
Ryan Huffman
|
c21d037800
|
Fix marketplace uploader not working with projects larger than 128MB
|
2018-12-27 17:51:27 -08:00 |
|
Adam Smith
|
0d27cb65ca
|
Merge pull request #14576 from sabrina-shanman/hfm_prep_graphics
(case 20297) Move graphics preparation from Serializers to runtime preparation step
|
2018-12-27 15:46:21 -08:00 |
|
Brad Hefta-Gaub
|
440f517b88
|
Merge pull request #14602 from samcake/punk
Case 20303 : Cleaning up the render view tasks and jobs for better 2ndary camera
|
2018-12-27 15:43:17 -08:00 |
|
Ryan Huffman
|
9c60b09c6b
|
Fix texture MB column not sorting correctly in entity list
|
2018-12-27 14:50:12 -08:00 |
|
Ryan Huffman
|
9e7f89e2b0
|
Update link text for avatar project files
|
2018-12-27 14:38:46 -08:00 |
|
Ryan Huffman
|
89b03a3cdc
|
Add info popup box for avatar project files
|
2018-12-27 14:30:44 -08:00 |
|
unknown
|
b0ae323d52
|
better extension check
|
2018-12-27 13:07:33 -08:00 |
|
unknown
|
87026a85f1
|
CR changes
|
2018-12-27 12:56:44 -08:00 |
|
Thijs Wenker
|
656d96c725
|
Merge branch 'feat/avatarTools/avatarPackager' of github.com:huffman/hifi into feat/avatarTools/avatarPackager
# Conflicts:
# interface/resources/qml/hifi/avatarPackager/AvatarProjectCard.qml
|
2018-12-27 21:52:57 +01:00 |
|
Thijs Wenker
|
1a38abe230
|
- add jointIndexes to new
- attempt to fix OSX / linux build
- ability to actually load a recent project (previously was only able to load the top recent project)
|
2018-12-27 21:47:10 +01:00 |
|
Ryan Huffman
|
882975f01c
|
Update icons in avatar packager
|
2018-12-27 12:43:43 -08:00 |
|
Thijs Wenker
|
2f32458f72
|
recent projects
|
2018-12-27 19:52:56 +01:00 |
|
Thijs Wenker
|
b6359a6cb4
|
Merge branch 'feat/avatarTools/avatarPackager' of github.com:huffman/hifi into feat/avatarTools/avatarPackager
|
2018-12-27 14:25:13 +01:00 |
|
Ryan Huffman
|
1da179dc04
|
Update avatar packager styling
|
2018-12-27 00:13:45 -08:00 |
|
unknown
|
65cc683f80
|
fix case-sensitivity on fbx
|
2018-12-26 12:16:51 -08:00 |
|
SamGondelman
|
87947a7165
|
try to fix grid color issue
|
2018-12-25 02:17:37 -05:00 |
|
SamGondelman
|
a25c9395b3
|
glsl initializer lists are 4.2
|
2018-12-25 00:46:42 -05:00 |
|
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 |
|
SamGondelman
|
8dae2502ee
|
fix overlay picking
|
2018-12-22 02:21:29 -05:00 |
|
SamGondelman
|
64b461274b
|
remove new API
(cherry picked from commit 5eccaad135)
|
2018-12-22 01:45:56 -05:00 |
|
SamGondelman
|
43bc184254
|
different entity flags for domain/avatar
(cherry picked from commit 7054188f21)
|
2018-12-22 00:55:27 -05:00 |
|
SamGondelman
|
b5a2642b6a
|
updated entityscriptinginterface API and related functions
(cherry picked from commit 6aac596698)
|
2018-12-22 00:55:10 -05:00 |
|
David Back
|
a3206c84f2
|
remove unneeded logs
|
2018-12-21 18:00:59 -08:00 |
|
David Back
|
1b98944caa
|
missing newlines
|
2018-12-21 18:00:59 -08:00 |
|
David Back
|
c16f58bdc7
|
UX feedback changes
|
2018-12-21 18:00:58 -08:00 |
|
David Back
|
71cd0976d6
|
newline
|
2018-12-21 18:00:57 -08:00 |
|
David Back
|
b139e52fb6
|
update package
|
2018-12-21 18:00:56 -08:00 |
|
David Back
|
d63609bedd
|
more file workflow changes including export project popup window, add readme
|
2018-12-21 18:00:55 -08:00 |
|
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 |
|