Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-14 17:36:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
75108 commits 25 branches 0 tags 1.1 GiB
Commit graph

75108 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
howard-stearns
af65e59ba3 Recognize data: URLs in Web entities. 2018-12-27 14:34:59 -05: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
Roxanne Skelly
da70271acf Checkpoint #2 Case20377 - Add Ack for BulkAvatarTraits 2018-12-26 13:46:08 -08:00
NissimHadar
70a2412a71 Windows version now deletes entities before starting tests. 2018-12-26 12:23:26 -08:00
unknown
65cc683f80 fix case-sensitivity on fbx 2018-12-26 12:16:51 -08:00
NissimHadar
577b3cbc90 Implemented online help. 2018-12-26 09:06:25 -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
Roxanne Skelly
3a282045ff Checkpoint trait-level flow control 2018-12-21 15:48:58 -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