Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 04:30:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
37394 commits 76 branches 59 tags 1.2 GiB
Commit graph

37394 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
b222c12857 unmangle merge 2016-01-05 12:21:50 -08:00
Howard Stearns
95e74318df Merge pull request #6757 from sethalves/improve-grab-action-reliability 
be more careful about grab action -- if it somehow expires, reinstate it
 2016-01-05 12:21:09 -08:00
Seth Alves
719c4562d1 Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2016-01-05 11:59:14 -08:00
Philip Rosedale
f30af27ac8 Merge pull request #6770 from birarda/zlib-external 
use an s3 link for zlib dependency
 2016-01-05 11:57:46 -08:00
Seth Alves
cd82383d33 Merge branch 'master' of github.com:highfidelity/hifi into improve-grab-action-reliability 2016-01-05 11:13:38 -08:00
Seth Alves
942e77166e merge from upstream 2016-01-05 11:11:19 -08:00
Anthony J. Thibault
a21b604746 Simplified implementation of ThreadSafeValueCache 2016-01-05 11:08:08 -08:00
Andrew Meadows
0473891e86 Merge pull request #6671 from sethalves/near-grab-via-parenting 
queryAACube plumbing
 2016-01-05 11:01:28 -08:00
ericrius1
a80e77ff80 Squeezing bumper while distance grabbing now brings object to your hand 2016-01-05 11:01:00 -08:00
Andrew Meadows
62688d5c07 Merge pull request #6768 from jherico/vr_keys 
Tweaks for supporting the new QML UI
 2016-01-05 10:31:57 -08:00
Stephen Birarda
5832884b58 handle beta icon usage while packaging console 2016-01-05 10:27:46 -08:00
Seth Alves
212d2d9e8f merge from upstream 2016-01-05 10:27:45 -08:00
Howard Stearns
5f85e0a4c0 Merge pull request #6769 from hyperlogic/tony/marketplace-avatar-attachment-support 
Interface support for avatar attachments from Marketplace
 2016-01-05 10:17:33 -08:00
Brad Hefta-Gaub
927fe97359 migrate callers of QMessageBox::warning() to OffscreenUi::warning() 2016-01-05 10:17:16 -08:00
Andrew Meadows
43d8c14c16 Merge pull request #6767 from howard-stearns/pid-render-limits 
render limits fixes
 2016-01-05 10:17:04 -08:00
Anthony J. Thibault
9ea6079c64 Merge branch 'master' into tony/get-palm-thread-safe 2016-01-05 10:16:52 -08:00
Stephen Birarda
3f3ded09df cleanup packager, add beta icons 2016-01-05 10:16:35 -08:00
Andrew Meadows
f888cc93f6 Merge pull request #6752 from imgntn/particle_grab_cleanup 
Add Dynamic Lifetimes to Grab Beam Particle Systems
 2016-01-05 10:12:21 -08:00
Stephen Birarda
139abf704d use an s3 link for dependencies 2016-01-05 09:58:59 -08:00
Stephen Birarda
ddb8b67267 Merge branch 'master' of https://github.com/highfidelity/hifi 2016-01-05 09:56:05 -08:00
Brad Hefta-Gaub
d98c2d1413 migrate callers of QMessageBox::question() to OffscreenUi::question() 2016-01-05 09:39:39 -08:00
Brad Davis
900a0f7f08 Trigger selection is too twitchy 2016-01-05 09:16:44 -08:00
Seth Alves
96f506a98d code review 2016-01-05 07:27:27 -08:00
Brad Davis
4b6f58dcab Restoring code commented out for debugging 2016-01-04 20:51:52 -08:00
Brad Davis
8485c89a0e More work on exposing tools to QML overlay windows 2016-01-04 20:51:52 -08:00
Brad Davis
56ee48a084 Working on focus problems 2016-01-04 20:51:51 -08:00
Brad Davis
e6b59cb0a1 Make it easier for QML dialogs to access the global menu, manipulate the overlay desktop 2016-01-04 20:51:50 -08:00
Brad Davis
41dcc3d52b QML dialogs should not consume key events when disabled 2016-01-04 20:51:49 -08:00
Seth Alves
ce1b8ae6f0 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2016-01-04 19:35:36 -08:00
Seth Alves
afc1757adf Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2016-01-04 19:17:45 -08:00
Stephen Birarda
a103839396 show fail on Go Home if interface not present 2016-01-04 18:49:13 -08:00
Stephen Birarda
f7ced05876 show error if binaries are missing 2016-01-04 18:26:33 -08:00
David Rowe
16d4234d55 Get rid of a couple of multiplies 2016-01-05 15:23:25 +13:00
Seth Alves
3db68e3151 add model joints to debugging 2016-01-04 18:16:20 -08:00
Seth Alves
2d246a840f better packing for qvector of bools 2016-01-04 18:14:29 -08:00
David Rowe
a265ffb631 Get rid of a couple of if statements and duplicate calls 
Courtesy of Clement
 2016-01-05 15:13:22 +13:00
Seth Alves
0b9f92e50f fix quat (un)packing 2016-01-04 18:01:48 -08:00
Anthony J. Thibault
bac6570655 Interface support for avatar attachments from Marketplace 
Drag and drop support of ava.json files is also supported and
at the moment the only way to test.

To test:

1. Create a cowboyhat.ava.json file on your hard-drive, with the following contents:
    {
        "version": "0.1",
        "name": "Cowboy Hat",
        "modelUrl": "https://s3.amazonaws.com/hifi-public/tony/cowboy-hat.fbx",
        "jointName": "Head",
        "transform": {
            "rotation": {"x": 0, "y": 0, "z": 0, "w": 1},
            "translation": {"x": 0, "y": 0, "z": 0},
            "scale": {"x": 1, "y": 1, "z": 1}
        },
        "isSoft": false
    }
2. Create a leatherjacket.ava.json file, with the following contents:
    {
        "version": "0.1",
        "name": "Leather Jacket",
        "modelUrl": "https://hifi-content.s3.amazonaws.com/ozan/dev/clothes/coat/coat_rig.fbx",
        "isSoft": true
    }
3. Run interface
4. Drag-and-Drop cowboyhat.ava.json onto the main Interface window.
5. You should be prompted wear the 'Cowboy Hat' attachment.
6. If you select 'Yes', the cowboy hat should appear on the avatar.
7. Do the same with leatherjacket.ava.json file.
 2016-01-04 17:50:45 -08:00
Seth Alves
69839b4b16 better packing of qvector of quats 2016-01-04 17:50:25 -08:00
Stephen Birarda
f258defb41 specify to pop the main tray menu on left click 2016-01-04 17:04:48 -08:00
Stephen Birarda
e3a411d9db update deprecated events for tray click 2016-01-04 16:59:01 -08:00
Stephen Birarda
cb83edfb60 open tray with left click, fix logPath define 2016-01-04 16:58:16 -08:00
Stephen Birarda
9c2eebfaeb don't attempt to find nsight multiple times per run 2016-01-04 16:52:39 -08:00
Stephen Birarda
c4fdd86a56 use current source dir for console icon copy 2016-01-04 16:36:30 -08:00
Stephen Birarda
e075ac2814 call set_packaging_parameters before subdirectory calls 2016-01-04 16:34:59 -08:00
Stephen Birarda
7dc8593d64 respect out parameter in packager.js 2016-01-04 16:33:38 -08:00
Stephen Birarda
5e762a4b95 specify console folder to copy per-platform 2016-01-04 16:29:00 -08:00
Stephen Birarda
ecbac3d8c7 add OriginalFilename for server-console 2016-01-04 16:20:02 -08:00
Stephen Birarda
cd331bbb0f use short name for file description 2016-01-04 16:18:53 -08:00
Seth Alves
3026415f03 add some missing property handling boilerplate 2016-01-04 16:17:00 -08:00