motofckr9k
|
3d05cdd61e
|
Merge remote-tracking branch 'refs/remotes/kasen/master'
Conflicts:
BUILD_WIN.md
CODING_STANDARD.md
LICENSE
cmake/installer/installer-header.bmp
cmake/installer/installer.ico
cmake/installer/uninstaller-header.bmp
interface/resources/images/about-vircadia.png
interface/resources/images/vircadia-logo.svg
interface/resources/qml/LoginDialog.qml
interface/resources/qml/dialogs/TabletLoginDialog.qml
interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
interface/src/Application.cpp
pkg-scripts/athena-server.spec
scripts/system/more/app-more.js
scripts/system/more/css/styles.css
scripts/system/more/more.html
|
2020-06-10 02:49:13 +02:00 |
|
motofckr9k
|
d406b81b47
|
Big rebrand
|
2020-05-22 20:35:27 +02:00 |
|
Kasen IO
|
115c40bd54
|
Lots of renamings, more to come.
|
2020-04-07 04:56:02 -04:00 |
|
David Rowe
|
1d9aec6fec
|
Improve order of dialog contents
|
2020-01-05 18:24:56 +13:00 |
|
David Rowe
|
977d498004
|
Add an "Open Project Folder" button
|
2020-01-05 17:53:36 +13:00 |
|
David Rowe
|
30c63fc305
|
Remove "Upload" button and associated items
|
2020-01-05 17:11:23 +13:00 |
|
David Rowe
|
cd6669ec8b
|
Comment out the "Video" button
|
2020-01-05 17:00:40 +13:00 |
|
David Rowe
|
d79c87b2d4
|
Change Avatar Package docs links
|
2020-01-05 16:59:51 +13:00 |
|
Thijs Wenker
|
0173c87695
|
Fix clashing hyperlinks in AvatarPackager project page
|
2019-03-25 22:48:30 +01:00 |
|
Thijs Wenker
|
714115adef
|
- Video, and new Docs url in QML
|
2019-03-16 02:09:01 +01:00 |
|
Thijs Wenker
|
a84a43320c
|
added spacing between lines
|
2019-03-06 19:15:01 +01:00 |
|
Thijs Wenker
|
59200103af
|
Not for sale explanation
|
2019-03-06 07:06:48 +01:00 |
|
Thijs Wenker
|
79d0a0a0a8
|
avatar doctor project status
|
2019-02-25 19:28:38 +01:00 |
|
Thijs Wenker
|
e900d3784b
|
fixes
|
2019-02-15 23:58:42 +01:00 |
|
Thijs Wenker
|
556a55ff16
|
Better scale and texture checks
|
2019-02-15 20:55:27 +01:00 |
|
Thijs Wenker
|
3026fd625a
|
Avatar Doctor
|
2019-02-14 18:52:50 +01:00 |
|
Thijs Wenker
|
5d40e1e480
|
- CR/style fixes
- Moved the old Avatar Packager tool to Developer -> Avatar -> ..
|
2019-01-04 23:39:04 +01:00 |
|
Ryan Huffman
|
6d5b9a88e4
|
Remove dead code in AvatarUploadStatusItem
|
2019-01-04 11:29:07 -08:00 |
|
Ryan Huffman
|
c2ceeb3d76
|
Apply AvatarPackager code review cleanup
|
2019-01-04 09:41:31 -08:00 |
|
Ryan Huffman
|
f27ee1767c
|
Fix rename not working correctly in AvatarPackager
|
2019-01-04 08:43:43 -08:00 |
|
Ryan Huffman
|
93f53cf43d
|
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
|
2019-01-03 14:18:40 -08:00 |
|
Ryan Huffman
|
847496048f
|
Fix waiting-for-inventory sticking around on avatar uploader
|
2019-01-03 13:51:45 -08:00 |
|
Thijs Wenker
|
68521e11a7
|
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
# Conflicts:
# interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml
# interface/resources/qml/hifi/avatarPackager/InfoBox.qml
|
2019-01-03 22:13:04 +01:00 |
|
Thijs Wenker
|
ecc578c2dd
|
- error messages
- style changes
|
2019-01-03 22:00:22 +01:00 |
|
Ryan Huffman
|
7953507cb8
|
Update avatar project rename to have audio and highlighting
|
2019-01-03 11:59:16 -08:00 |
|
Ryan Huffman
|
c13badcbc8
|
Fix project rename focus and create project not initializing
|
2019-01-03 10:20:13 -08:00 |
|
Ryan Huffman
|
9c96f7bd01
|
Add RalewayButton
|
2019-01-03 08:21:52 -08:00 |
|
Ryan Huffman
|
61ac9d0050
|
Update various styling in Avatar Packager
|
2019-01-02 16:47:09 -08:00 |
|
Thijs Wenker
|
cb33a91a34
|
- rename functionality
- avatar packager works in tablet now
|
2018-12-29 03:31:56 +01:00 |
|
Ryan Huffman
|
24aaeee5fd
|
Disable back button on avatar upload page
|
2018-12-27 22:55:54 -08:00 |
|
Ryan Huffman
|
83a60a541b
|
Fix styling and flow issues in avatar uploader
|
2018-12-27 18:53:07 -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 |
|
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 |
|
Ryan Huffman
|
1da179dc04
|
Update avatar packager styling
|
2018-12-27 00:13:45 -08: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 |
|
Ryan Huffman
|
7602da6f92
|
Add AvatarProjectUpload.qml
|
2018-12-21 08:16:18 -08:00 |
|
Ryan Huffman
|
556f516be6
|
Update uploader screen
|
2018-12-20 16:30: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 |
|
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 |
|
Ryan Huffman
|
ad471387f7
|
Integrate marketplace upload API
|
2018-12-18 13:08:55 -08:00 |
|
Ryan Huffman
|
2269447741
|
Fix AvatarPackager QML size
|
2018-12-13 15:27:10 -08:00 |
|