Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-07 21:33:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
74308 commits 67 branches 56 tags 1.2 GiB
Commit graph

74308 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
f7bf51d62c
Merge pull request #13966 from elmanytas/run_interface_ubuntu_18.04 
Added steps to run interface in Ubuntu 18.04 .
 2018-12-10 09:50:43 -08:00
Brad Hefta-Gaub
a005f9e9ab
Merge pull request #14546 from danteruiz/fix-reload-scripts 
fix realod all scripts functionality broken by PR14478
 2018-12-09 17:30:36 -08:00
Brad Hefta-Gaub
26ccfb2533
Merge pull request #14329 from ctrlaltdavid/mini-tablet-tuning 
Mini tablet tuning
 2018-12-09 17:23:59 -08:00
Brad Hefta-Gaub
1e9faa7754
Merge pull request #14276 from ctrlaltdavid/M19345 
Make create apps not grab tablet if editing an entity with hand
 2018-12-09 17:21:10 -08:00
Brad Hefta-Gaub
0425ae1231
Merge pull request #14239 from ElderOrb/FB19219 
FB19219 - Make avatarapp to handle wearables update via drag&drop
 2018-12-09 17:20:13 -08:00
Jamil Akram
4e7a777fda
Merge pull request #14486 from amantley/jointNameMapping 
FST File Joint Name Mapping From FBX Joint Names to Hifi Skeleton Joint Names
 2018-12-07 17:07:37 -08:00
John Conklin II
69876bdec2
Merge pull request #14548 from SamGondelman/mirrorFix 
Case 19473 (#2): Fix Mirror tonemapping
 2018-12-07 16:11:59 -08:00
John Conklin II
0a80c16686
Merge pull request #14419 from SamGondelman/splash 
Case 19740: Improve startup times by pre-compiling shaders with splash screen
 2018-12-07 16:10:52 -08:00
Clément Brisset
3386e5042f
Merge pull request #14450 from birarda/bug/case-insensitive-paths 
match domain paths match case-insensitively
 2018-12-07 13:59:49 -08:00
John Conklin II
2d52fffa4b
Merge pull request #14460 from huffman/fix/lifetime-slider-alt 
Change lifetime back to a regular input field
 2018-12-07 13:43:08 -08:00
Ryan Huffman
a42a771df5
Merge pull request #14540 from huffman/feat/hide-certified-urls 
Add hiding of certified properties in Create
 2018-12-07 13:42:23 -08:00
Ryan Huffman
6eb0029b9a
Merge pull request #14480 from thoys/fix/create/missingStartMiddleFinishTooltips 
MS20000: [CreateApp/Tooltips] Add missing start/middle/finish tooltips
 2018-12-07 12:10:54 -08:00
Jamil Akram
bc5166d1d8
Merge pull request #14531 from hyperlogic/feature/drop-after-delay-out-of-range-tracking 
Added DropAfterDelay strategy to Vive Tracker Calibration Dialog
 2018-12-07 12:09:44 -08:00
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
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
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
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
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
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
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
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
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
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