Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-17 01:18:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
74657 commits 69 branches 56 tags 1.2 GiB
Commit graph

74657 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Thijs Wenker
d25b5f054b
Merge branch 'master' into fix/create/missingStartMiddleFinishTooltips 2018-12-06 20:48:42 +01:00
Sam Gondelman
b690faeb12
Merge branch 'master' into NOverlays 2018-12-06 11:29:06 -08:00
Wayne Chen
4f0e23ed69 changing link steam flow/height of error message 2018-12-06 11:26:33 -08:00
Jeff Clinton
43f84a9577
Merge pull request #14426 from ElderOrb/FB19400 
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' of null
 2018-12-06 11:18:39 -08:00
Adam Smith
08d6e35d4d
Merge pull request #14372 from SamGondelman/decals 
Case 19798: 3D projected Material Entities and materialRepeat option
 2018-12-06 11:13:46 -08:00
Zach Fox
a2af50a9d0 Show pre-auth'd transactions in Recent Activity before redemption 2018-12-06 11:07:26 -08:00
Wayne Chen
9f894ae977 fixing case with KB pw prop./bolding error msg 2018-12-06 10:52:10 -08:00
David Back
1171821fc9 unity avatar exporter plugin 2018-12-06 10:22:18 -08:00
NissimHadar
4a50baddc2 Reverted debug code. 2018-12-06 09:55:48 -08:00
Wayne Chen
30f1016f1c Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-06 09:55:00 -08:00
NissimHadar
0cca388971 Merge branch 'master' of https://github.com/highfidelity/hifi into 20116_nitpick_v1.2 2018-12-06 09:52:48 -08:00
NissimHadar
a665e728e6 Improved contents of the HTML results. 2018-12-06 09:52:21 -08:00
Ryan Huffman
13c3b410d8
Merge pull request #14495 from dback2/draggableNumberFixes76-master 
Draggable numbers - RC76 fixes to master
 2018-12-06 09:47:38 -08:00
Jeff Clinton
b9156d68e5
Merge pull request #14508 from amantley/restingHandsBug 
removed the code that turns off inactive hands in MyAvatar.cpp
 2018-12-06 09:42:34 -08:00
Jeff Clinton
e65e8d29a1
Merge pull request #14442 from hyperlogic/bug-fix/hand-grasp-during-desktop-handshake 
Ensure that hand is in grasp pose during desktop handshake animation
 2018-12-06 09:41:29 -08:00
Ryan Huffman
3160339551 Improve Create properties for particles + materials 
Sizing of input fields is now flexible.
Material scale field labels are no longer obscured.
Material tooltips are corrected.
 2018-12-06 09:41:10 -08:00
Jeff Clinton
e8c1c4a27b
Merge pull request #14536 from danteruiz/fix-audio-switching 
Respect changed audio settings when switch displays (Master)
 2018-12-06 09:13:47 -08:00
Jeff Clinton
7f242b8c0e
Merge pull request #14522 from thoys/fix/create/ignoreTextareaShortcuts-master 
[RC77] MS20114 [CreateApp] ignore createApp shortcut keys while TEXTAREA elements are in focus
 2018-12-06 09:11:49 -08:00
Wayne Chen
89a216a5ec Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-12-06 09:05:07 -08:00
Wayne Chen
ce65e557bc cleaning up commented code 2018-12-06 09:04:57 -08:00
NissimHadar
8938afd350 Updated for v1.2 2018-12-06 08:42:38 -08:00