Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 18:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
74681 commits 71 branches 56 tags 1.2 GiB
Commit graph

74681 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jeff Clinton
998ec20854
Merge pull request #14539 from Atlante45/fix/script-loading 
Fix ESS scripts getting stuck on load
 2018-12-07 12:07:44 -08:00
sabrina-shanman
7cbe3776f5 Simplify serializer registration process 2018-12-07 12:05:27 -08:00
Stephen Birarda
e3e400c86f
Merge pull request #14549 from birarda/bug/no-initial-send 
fix for initial send of non-instanced trait
 2018-12-07 12:02:08 -08:00
Brad Hefta-Gaub
9428f1de33
Merge pull request #14529 from SimonWalton-HiFi/avatar-mixer-downloads-fst 
Don't fetch avatars' .fst files from within the AvatarData class
 2018-12-07 12:01:58 -08:00
Dante Ruiz
177a94b9a9 fix realod all scripts functionality 2018-12-07 11:48:03 -08:00
Zach Fox
4cc5fc755f Fix MS20208: Change an instance of 'ASSETS' to 'INVENTORY' 2018-12-07 11:42:03 -08:00
Thijs Wenker
3a259d8525 Merge branch 'master' of github.com:highfidelity/hifi into fix/create/missingStartMiddleFinishTooltips2 
# Conflicts:
#	scripts/system/html/js/entityProperties.js
 2018-12-07 20:24:21 +01:00
birarda
51fd742722 fix for initial send of non-instanced trait 2018-12-07 11:17:44 -08:00
Wayne Chen
a2572d5710 fix switch display mode crash/keyboard spawn problem 2018-12-07 11:17:06 -08:00
Ryan Huffman
bf844e0472 Add hiding of certified properties in Create 2018-12-07 11:05:52 -08:00
Ryan Huffman
f42c31ca36 Update number property to reuse numberdraggable emit function 2018-12-07 11:02:31 -08:00
Ryan Huffman
c9ab5c23ea Add support for min/max/step/defaultValue on number field 2018-12-07 11:02:31 -08:00
Ryan Huffman
818339823c Add new number type in Create 2018-12-07 11:02:31 -08:00
David Back
e5792aa85f remove scene 2018-12-07 11:01:54 -08:00
John Conklin II
55f59a720f
Merge pull request #14501 from thoys/fix/create/userDataErrorMessagePopupInfiniteLoopFix 
MS19567 [CreateApp]: userData error message continues popup fix
 2018-12-07 10:59:34 -08:00
John Conklin II
d7e3935d57
Merge pull request #14421 from dback2/entityListReorderColumns 
Entity list - reorder columns
 2018-12-07 10:59:02 -08:00
John Conklin II
3a22299503
Merge pull request #14441 from dback2/preventDragDrop 
Prevent dragging and dropping files onto Create windows
 2018-12-07 10:58:42 -08:00
SamGondelman
8431b3b0c1 correct order of mixes 2018-12-07 10:39:10 -08:00
Wayne Chen
4e6f162e01 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-07 10:12:46 -08:00
SamGondelman
92117d602c remove cruft 2018-12-07 09:23:03 -08:00
Alexander Ivash
600d09e533 relax 'isWearable()' condition to match latest changes in 'master' 2018-12-07 11:23:17 +03:00
Alexander Ivash
72a91668a5 FB19219 Make avatarapp to handle wearables update via drag&drop 2018-12-07 11:23:17 +03:00
amantley
f8ae0227c3 added the lean joint back and fixed a name mapping reversal in fbxserializer.cpp 2018-12-06 20:16:03 -08:00
Stephen Birarda
fb3cdabd87
Merge pull request #14527 from birarda/bug/entity-traits-handler-deadlock 
fix for deadlock between setAvatarEntityData and sendChangedTraitsToMixer
 2018-12-06 17:28:45 -08:00
David Back
46017a70d1 remove unneeded files and add unity project files to gitignore 2018-12-06 17:18:55 -08:00
Simon Walton
0d419d4dcf Pass on dropFaceTracking flag in ScriptableAvatar::toByteArrayStateful() 2018-12-06 17:16:15 -08:00
Clément Brisset
ebe7ee834e
Merge pull request #14502 from Atlante45/fix/build-files 
Update build docs and prebuild.py to warn about HIFI_VCPKG_BASE
 2018-12-06 16:53:21 -08:00
John Conklin II
88efaaa4c7
Merge pull request #14544 from huffman/fix/particle-property-layout 
Improve Create properties for particles + materials
 2018-12-06 16:45:44 -08:00
Wayne Chen
2f4805dc04 adding focus disable signal to fix focus 2018-12-06 16:38:10 -08:00
amantley
ca0133a2a6 put the lean joint back in 2018-12-06 16:24:06 -08:00
David Back
1a3708c49d better drag drop fix 2018-12-06 16:14:28 -08:00
Clement
62a06fe383 Update build docs 2018-12-06 16:10:05 -08:00
Stephen Birarda
3374b610a9
Merge pull request #14452 from birarda/bug/lock-domain-ID-for-cloud 
add warning for cloud domain ID changes to domain settings
 2018-12-06 15:27:44 -08:00
Zach Fox
7dcf5da954
Merge pull request #14503 from zfox23/payOut1 
Pay-Out API Frontend, Part One
 2018-12-06 15:25:54 -08:00
David Back
cee34e7770 Merge branch 'master' of https://github.com/highfidelity/hifi into preventDragDrop 2018-12-06 15:18:35 -08:00
Wayne Chen
1a86b8d172 50% opacity/bold shortcut text 2018-12-06 14:58:39 -08:00
Wayne Chen
1ddba8e787 KB following updated login screen/keep login screen active 2018-12-06 14:58:06 -08:00
Thijs Wenker
4f2289b347 CR fixes 2018-12-06 23:42:37 +01:00
Thijs Wenker
2771e2862e add missing material data json error clear on delete 2018-12-06 23:42:36 +01:00
Thijs Wenker
6d40bc9c2f userData error message continues popup fix 2018-12-06 23:42:36 +01:00
John Conklin II
bbc8e4de70
Merge pull request #14534 from SamGondelman/vive 
Case 20138: Fix vive crash
 2018-12-06 14:28:24 -08:00
David Back
6a11766dbf Merge branch 'master' of https://github.com/highfidelity/hifi into preventDragDrop 2018-12-06 14:02:42 -08:00
sabrina-shanman
6ea4769173 Re-name MIMETypeLibrary to MediaTypeLibrary and update related references 2018-12-06 13:39:18 -08:00
David Back
8620a5a4c3 CR changes 2018-12-06 13:07:59 -08:00
David Back
a247e14f3d Merge branch 'entityListReorderColumns' of github.com:dback2/hifi into entityListReorderColumns 2018-12-06 13:06:49 -08:00
David Back
9fab86d972 Merge branch 'master' of https://github.com/highfidelity/hifi into entityListReorderColumns 2018-12-06 13:05:11 -08:00
David Back
e4efc90605 Merge branch 'master' of https://github.com/highfidelity/hifi into entityListReorderColumns 2018-12-06 13:04:53 -08:00
Sam Gondelman
533e0e0326
Merge branch 'master' into NOverlays2 2018-12-06 12:29:38 -08:00
Sam Gondelman
da296cf45e
Merge pull request #14390 from SamGondelman/NOverlays 
Case 19886: Convert "clientOnly" to new hostType property and add local entities
 2018-12-06 12:27:56 -08:00
Luis Cuenca
37854ab05e
Add jsdoc information 2018-12-06 11:58:48 -08:00