Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 01:00:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
38619 commits 75 branches 59 tags 1.2 GiB
Commit graph

5147 commits

Author SHA1 Message Date
James B. Pollack
b91e5c27e1 Update createPistol.js 2016-01-20 10:45:40 -08:00
ericrius1
fa9a066f9a model tweaks 2016-01-20 10:44:25 -08:00
James B. Pollack
8d3468265f make pistol collision sound quieter, other adjustments 2016-01-20 10:44:02 -08:00
samcake
320c799379 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-20 10:14:02 -08:00
samcake
379c882834 Debugging the darkness and pointing out bugs 2016-01-20 02:03:09 -08:00
ericrius1
a16b267b24 Merge branch 'master' into droplets 2016-01-19 18:27:40 -08:00
ericrius1
4e052dca61 color cloud adjustment 2016-01-19 18:26:32 -08:00
ericrius1
d2a815176b lightning strikes 2016-01-19 17:09:39 -08:00
ericrius1
713496a8a0 lightning strikes 2016-01-19 16:02:41 -08:00
Brad Hefta-Gaub
55093aafea Merge pull request #6826 from kevinmthomas-carpool/LoadScriptFromEntityFix 
Fixed entity script loading functionality for the jsstreamplayer.
 2016-01-19 13:14:43 -08:00
samcake
c5c3f464cd Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-19 12:13:11 -08:00
samcake
6f93fb3114 Can now process the AO at lower resolution in orer to gsave performances 2016-01-19 12:12:51 -08:00
Andrew Meadows
4a91ed3d66 fix bad conflict resolution 2016-01-19 11:42:29 -08:00
Andrew Meadows
d990482c0a use collidesWith for bow.js workaround 2016-01-19 11:42:29 -08:00
Andrew Meadows
db77f22a61 use "collidesWith" instead of "collisionMask" 
but make "collisionMask" work for those who want it
 2016-01-19 11:41:22 -08:00
Seth Alves
8ba800fda8 Merge pull request #6851 from AndrewMeadows/collisionless2 
namechange "ignoreForCollisions" to "collisionless"
 2016-01-19 11:33:55 -08:00
ericrius1
5245bdc96e tweaks 2016-01-19 11:09:30 -08:00
Brad Hefta-Gaub
e15c7f089e Merge pull request #6850 from sethalves/various-fixes 
Various fixes
 2016-01-19 10:15:46 -08:00
Brad Hefta-Gaub
15899558aa Merge pull request #6842 from AlessandroSigna/vrShop 
Vr shop
 2016-01-19 09:39:28 -08:00
Andrew Meadows
48374ef5bc more ignoreForCollisions to collisionless 2016-01-19 09:06:17 -08:00
Andrew Meadows
7fb145e819 namechange ignoreForCollisions --> collisionless 2016-01-19 09:06:17 -08:00
samcake
df496b065c Merging with master 2016-01-18 16:40:34 -08:00
Seth Alves
9428da61cf fix property name typo 2016-01-18 14:31:55 -08:00
samcake
91dff3195e Remove the setup values used for debuging 2016-01-18 14:28:26 -08:00
samcake
93c7c182b3 Exposing the gpu RangeTimer counter for the AO effect 2016-01-18 14:10:59 -08:00
Seth Alves
823428290d Merge branch 'master' of github.com:highfidelity/hifi into various-fixes 2016-01-18 13:26:45 -08:00
Seth Alves
94bafb4a1e Merge pull request #6832 from AndrewMeadows/no-collisionsWillMove 
namechange collisionsWillMove --> dynamic
 2016-01-18 11:51:59 -08:00
Seth Alves
8b6e89a5c4 fix stopFarTrigger entity method call. re-add code to keep more than one distance grab per object from happening 2016-01-18 11:13:33 -08:00
samcake
10de1ac9b5 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-18 11:03:34 -08:00
Seth Alves
d8dceade2e Merge pull request #6833 from PhilipRosedale/searchChoice 
Choice of hand ray pick or head pick
 2016-01-18 11:03:30 -08:00
AlessandroSigna
737a00a2cb Typo fixed 2016-01-18 16:20:32 +01:00
Philip Rosedale
9b3155188d Squeeze a little to search, a lot to grab 2016-01-17 19:10:40 -08:00
Philip Rosedale
23a8d57ca2 Always show search ray 2016-01-17 14:14:00 -08:00
Philip Rosedale
588719a4c2 merge conflict fix 2016-01-17 13:07:55 -08:00
samcake
86e9c5ac9b Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-16 22:17:08 -08:00
samcake
39f1649cdf refining the settings for the blur pass and splitting the uniforms in 2 buffers, one per frame with transform info and one for the parameters which are rarely changing 2016-01-16 22:16:07 -08:00
James B. Pollack
8c4abd2a2d Merge pull request #6847 from howard-stearns/tribbles 
tribbles
 2016-01-16 18:28:58 -08:00
James B. Pollack
28f1a86527 Merge pull request #6821 from ericrius1/whiteboardFix 
Some fixes to whiteboard to get rid of gaps between lines and jagged …
 2016-01-16 18:19:33 -08:00
James B. Pollack
3631db4e2d Merge pull request #6845 from howard-stearns/render-matrix 
render test script
 2016-01-16 18:16:49 -08:00
Andrew Meadows
c1a1cbf718 fix typo 2016-01-16 15:55:10 -08:00
Howard Stearns
1985aa9d77 Drops a bunch of "tribbles" (small spheres) in front of you. 
They edit change color at 60hz and jump randomly at an average 1hz for 30 seconds, and then dissapear after 60 seconds.
Useful for testing the load of physical objects.
 2016-01-16 13:26:39 -08:00
Howard Stearns
994d13df5a A test script to confirm that the specified edit rate can be achieved for the specified number of objects. 2016-01-16 11:32:19 -08:00
Howard Stearns
63db6d0f72 A script to test rendering load by creating a rectangular matrix of the specified objects, with no physical or entity changes after creation, either in front of you or overhead. 2016-01-16 11:17:13 -08:00
ericrius1
d54c177a5f add weather box 2016-01-15 15:37:52 -08:00
Andrew Meadows
84282d0114 final repairs after rebase 2016-01-15 15:28:26 -08:00
Andrew Meadows
e763c055b3 more namechanges in JS scripts 2016-01-15 15:24:46 -08:00
Andrew Meadows
29a52bf0ba namechange collisionsWillMove --> dynamic 2016-01-15 15:23:52 -08:00
ericrius1
dcb346fffb lillypond 2016-01-15 15:14:11 -08:00
samcake
fef5e3c8da Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-15 14:44:57 -08:00
Philip Rosedale
210b3ba1ec Merge pull request #6819 from sethalves/grab-script-fixes 
grab script fixes
 2016-01-15 09:40:57 -08:00
samcake
3f4f10c38c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-15 09:21:13 -08:00
samcake
ae18bb8ef7 FIxed the stereo rendering 2016-01-14 19:23:29 -08:00
AlessandroSigna
41e6dd48e0 Overlay manager exposing findRayIntersection 2016-01-14 18:27:17 -08:00
AlessandroSigna
e4501e3a8f Added cart, cash, inspect and readme 2016-01-14 18:23:39 -08:00
EdgarPironti
40279c8fc5 Item, Review, Shop and Vendor scripts. 2016-01-14 18:20:40 -08:00
Philip Rosedale
c5556b1c29 Merge pull request #6841 from ericrius1/diceOverlay 
added dice icon back to dice.js script
 2016-01-14 17:49:04 -08:00
ericrius1
d4491a9ec2 added dice icon back to dice.js script 2016-01-14 17:13:07 -08:00
Brad Hefta-Gaub
a70adc8a57 Merge pull request #6823 from jherico/tool_window 
Tool window in QML
 2016-01-14 16:56:27 -08:00
Philip Rosedale
a8d13cb947 Merge pull request #6831 from hyperlogic/tony/squeeze-hands-part-deux 
Simplify grab animation logic
 2016-01-14 15:49:00 -08:00
samcake
577666da6e Merging upstream master 2016-01-14 15:10:54 -08:00
Philip Rosedale
30199106ec Choice of hand ray pick or head pick 2016-01-13 20:47:05 -08:00
samcake
0285d48de3 Exposing many more controls of the AO in order to adjust the effect 2016-01-13 18:57:47 -08:00
Anthony J. Thibault
75b3523c33 Simplify grab animation logic 
Moved all animation control out of the handControllerGrab.js script and back into
squeezeHands.js

Deleted old hydra/squeezeHands.js to avoid confusion.

Added new sqeezeHands.js script to the default scripts.
 2016-01-13 17:57:51 -08:00
U-GAPOS\andrew
3aa1837e07 disable collisions between arrow and bow 
(the bow is currently kinematic while held)
 2016-01-13 16:57:51 -08:00
Brad Davis
b6272b7824 Migrate tool window to overlay/QML 2016-01-13 15:40:37 -08:00
Kevini M. Thomas
007013254e Fixed entity script loading functionality for the jsstreamplayer. 2016-01-13 14:34:44 -05:00
ericrius1
061cf5021c Don't clean up whiteboard on script shutdown 2016-01-12 19:31:43 -08:00
ericrius1
9dae425bfd Some fixes to whiteboard to get rid of gaps between lines and jagged lines 2016-01-12 19:28:41 -08:00
Seth Alves
699431a9ab testing something with chris 2016-01-12 17:27:36 -08:00
Seth Alves
1128982e65 pull grab script changes over from another branch 2016-01-12 17:16:56 -08:00
samcake
0d8e247626 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-12 16:56:51 -08:00
samcake
6779874da8 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-12 16:06:34 -08:00
Andrew Meadows
c52c543ab8 use strings for JS collisionGroup API 2016-01-12 15:11:27 -08:00
Andrew Meadows
00e5d040a2 use collision masks to prevent grab-bootstrap 2016-01-12 15:10:18 -08:00
Howard Stearns
d1a72e8d63 Merge pull request #6807 from hyperlogic/tony/grab-script-hand-animation 
Move hand animation control into grab script
 2016-01-12 13:02:59 -08:00
samcake
31bea5034c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-12 10:02:15 -08:00
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
samcake
38e9d2281d Merging with master 2016-01-11 15:49:16 -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
Anthony J. Thibault
3d8f8e5618 Set WANT_DEBUG_STATE to false 2016-01-11 10:39:27 -08:00
Anthony J. Thibault
8f78a0624c Merge branch 'master' into tony/grab-script-hand-animation 2016-01-11 10:16:51 -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
samcake
1517d792ae Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-10 09:39:37 -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
Anthony J. Thibault
4c1ad6900d handControllerGrab.js: removed previous animationStateHandler 
Which was conflicting with the new HandAnimationBuddy animationStateHandler
 2016-01-08 11:28:02 -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
samcake
97071288ed Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-08 09:23:55 -04:00
Anthony J. Thibault
cac19b8579 grab animation work 
Hand animations now have 5 states:

* idle
* open
* grasp
* point
* farGrasp

The handControllerGrab.js script now chooses one of these five animations, based on the state of the HandController object.

Also, removed hand trigger AnimVar setting from C++ Rig class.
 2016-01-07 19:36:57 -08:00
Anthony J. Thibault
c2736cb68c Merge branch 'master' into tony/grab-script-hand-animation 2016-01-07 16:58:10 -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
Anthony J. Thibault
1251be1b2b Merge branch 'master' into tony/grab-script-hand-animation 2016-01-06 16:26:56 -08:00
Anthony J. Thibault
b42fe22e03 Fixing bad line ending. 2016-01-06 16:26:16 -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
samcake
7e2cf741c0 Clen up, exposingthe level of obscurance 2016-01-06 13:16:16 -04:00
samcake
12ad08560f Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-06 09:50:58 -04:00
Anthony J. Thibault
3e6ff0eb68 Moved hand animation control into grab script. 2016-01-05 19:56:56 -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
samcake
78ff43bed2 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-04 18:57:13 -04: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
samcake
2486d94b03 A working prototype of ao... 2016-01-04 14:36:46 -04: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
Seth Alves
9145a8a753 back out off-brand change 2016-01-03 07:29:24 -08:00
Seth Alves
9f828448a0 add comment 2016-01-03 07:29:14 -08:00
Seth Alves
e1299ee290 be more careful about grab action -- if it somehow expires, reinstate it 2016-01-03 07:27:14 -08:00
Seth Alves
bfa8cc1969 merge from upstream 2016-01-03 06:47:25 -08:00
samcake
f4b4b62113 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-02 11:28:30 -04:00
samcake
52f3c7e2cb Introducing the sl files and the blurring stages 2016-01-02 11:27:50 -04:00
Philip Rosedale
60bc023d6e Merge pull request #6754 from PhilipRosedale/master 
Show hand-sphere search line and point just with hand direction again
 2015-12-31 13:53:21 -08:00
Philip Rosedale
85a0dfa21a remove debug line 2015-12-31 13:49:24 -08:00
Philip Rosedale
f4389c3b1f Add head-to-hand mixing ratio, default to zero (hands only) 2015-12-31 13:36:24 -08:00