Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 10:38:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
37170 commits 25 branches 0 tags 1.1 GiB
Commit graph

4951 commits

Author SHA1 Message Date
Howard Stearns
38b0fd2747 Merge pull request #6806 from PhilipRosedale/energybar 
Energybar example script and test script for scaling
 2016-01-12 09:36:14 -08:00
Philip Rosedale
3fdfa1b624 simpler loop 2016-01-11 17:49:46 -08:00
Philip Rosedale
40aecf3bf4 I was told there would be no math 2016-01-11 17:36:12 -08:00
Brad Hefta-Gaub
ddd9b0826b Merge pull request #6798 from ericrius1/menuTweaks 
separating out marketplace icon from edit toolbar and making directory icon from directory.js movable and persistent
 2016-01-11 12:20:12 -08:00
Philip Rosedale
b8565358ff Added basic energy bar example 2016-01-11 09:16:33 -08:00
ericrius1
8182372e02 Made drag selection area bigger for marketplace and directory icons. Added marketplace.js to default scripts 2016-01-11 08:39:34 -08:00
Philip Rosedale
e4855b7595 Script that drops different kinds of entities near you 2016-01-10 15:34:46 -08:00
ericrius1
a66bc791a3 directory.js - icon is now movable and persistent 2016-01-08 16:33:51 -08:00
ericrius1
7e7424ec2b Removed marketplace icon from edit menu 2016-01-08 16:22:10 -08:00
ericrius1
b3f19ef4d6 separating out marketplace 2016-01-08 16:08:43 -08:00
Brad Hefta-Gaub
b9068d0738 fix selectAudioDevice.js to honor new menu spec 2016-01-08 11:22:21 -08:00
Brad Hefta-Gaub
fb484584e4 fix edit.js to honor new menu spec 2016-01-08 11:21:55 -08:00
Anthony J. Thibault
5d19de76ab Added avatarAttachmentTest.js script 2016-01-07 16:15:24 -08:00
Brad Hefta-Gaub
a78d5274e7 Merge pull request #6780 from jherico/z_order 
Address some z-ordering issues in overlay windows
 2016-01-06 20:08:52 -08:00
Seth Alves
01c9de4f9d Merge pull request #6771 from ericrius1/directDistanceGrab 
Squeezing bumper while distance grabbing now brings object to your hand in all cases
 2016-01-06 15:30:23 -08:00
ericrius1
1f6e45d135 Fix for close grab jumping 2016-01-06 15:10:53 -08:00
ericrius1
67f4c250fd Search sphere goes away on far to near grab 2016-01-06 14:59:31 -08:00
ericrius1
cb03eda6d1 Instant far to near grabbing now works by using the bumper, or equip, button 2016-01-06 13:37:26 -08:00
Brad Hefta-Gaub
6ac8d081dc include debug log in collision example 2016-01-06 13:02:07 -08:00
Brad Hefta-Gaub
d4e039ea7a include debug log in collision example 2016-01-06 13:00:50 -08:00
Brad Hefta-Gaub
a5f618ef33 include debug log in collision example 2016-01-06 12:54:14 -08:00
Brad Davis
1b82200ecb Address some z-ordering issues in overlay windows 2016-01-06 10:58:56 -08:00
Seth Alves
8800a74186 Merge pull request #6778 from imgntn/mousegrabfix 
Only grab/release mouse grab with left button
 2016-01-06 10:36:36 -08:00
Anthony Thibault
95f821d61a Merge pull request #6732 from sethalves/set-model-entity-joints 
hook up a way for scripts to set model-entity joint state
 2016-01-05 17:31:18 -08:00
James B. Pollack
8c7c436ef2 fix 2016-01-05 16:54:18 -08:00
Clément Brisset
a2135dfdd2 Merge pull request #6720 from ctrlaltdavid/20760 
Fix particle radius and rgba start, middle, finish interpolation
 2016-01-05 16:48:13 -08:00
ericrius1
eb44e54d87 fixed merge conflicts 2016-01-05 16:28:22 -08:00
ericrius1
882ec9fe80 Using offset from intersection point to center of object for insta-grab 2016-01-05 16:24:15 -08:00
Seth Alves
086ea66c04 Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2016-01-05 16:24:10 -08:00
James B. Pollack
7c18359fba cleanup 2016-01-05 16:17:11 -08:00
James B. Pollack
68e03a08c0 targets fix 2016-01-05 15:43:49 -08:00
Seth Alves
b59934573a Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2016-01-05 13:50:12 -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
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
Seth Alves
212d2d9e8f merge from upstream 2016-01-05 10:27:45 -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
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
Eric Levin
f569d08ca8 Merge pull request #6761 from imgntn/grab_add_beam 
Add Beam Visualization When Grab Doesn't Intersect
 2016-01-04 15:36:05 -08:00
Seth Alves
9304477233 split out calls for rotation and translation 2016-01-04 15:29:06 -08:00
Seth Alves
9a979f4abf update doppelganger script 2016-01-04 14:18:24 -08:00
Seth Alves
e18298c974 Merge branch 'doppelganger' of github.com:imgntn/hifi into set-model-entity-joints 2016-01-04 14:16:30 -08:00
David Rowe
f04222b5ac Merge branch 'master' into 20760 2016-01-05 10:29:04 +13:00
James B. Pollack
29612f2246 Merge pull request #6760 from ericrius1/muzzleFix 
Fix to pistol.js so muzzle flash particle system doesn't stick around…
 2016-01-04 12:53:38 -08:00
James B. Pollack
4bb03f8c2d add beam visualization if sphere doesnt actually hit anything 2016-01-04 12:34:08 -08:00
James B. Pollack
0be5725f71 Merge pull request #6744 from ericrius1/raveGlow 
Added glow effect to ravestick
 2016-01-04 11:49:54 -08:00
ericrius1
4360595ed6 Fix to pistol.js so muzzle flash particle system doesn't stick around forever 2016-01-04 11:29:57 -08:00
Brad Hefta-Gaub
ec8a2ae093 Merge pull request #6739 from jherico/qml_window 
Support QML and Web content in overlay windows
 2016-01-03 10:18:26 -10:00