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

33507 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
f275d2678d ping the AssetClient from the agent 2015-10-26 16:06:12 -07:00
Stephen Birarda
6080654d7e zero out the pre-mix samples for each stream 2015-10-26 15:48:05 -07:00
Stephen Birarda
47e8a1bdf7 connect to correct signal for sound ready 2015-10-26 12:15:08 -07:00
Stephen Birarda
a4ddb7a1e4 change downloaded to ready to avoid collision 2015-10-26 12:14:12 -07:00
Stephen Birarda
61ad91aba6 hook Sound downloaded to start playback 2015-10-26 12:09:48 -07:00
Stephen Birarda
ca60ce59f1 put Agent AssetClient on sep thread, cleanup 2015-10-26 12:06:28 -07:00
Stephen Birarda
e8c6acfeb6 update baseball crowd to loop better 2015-10-26 11:58:49 -07:00
Stephen Birarda
45b110cd7e Merge branch 'baseball' of https://github.com/Atlante45/hifi into baseball 2015-10-23 16:44:25 -07:00
Atlante45
667eec2f46 change collision hull 2015-10-23 16:43:59 -07:00
Stephen Birarda
8f5add3a17 resolve conflicts on merge with clement/baseball 2015-10-23 16:43:06 -07:00
Atlante45
7487c7bd0a Move baseball.js 2015-10-23 16:32:27 -07:00
Atlante45
c1cd7dd50a Work on robot animation and bat hull 2015-10-23 16:31:38 -07:00
Atlante45
8c08ad38d7 Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-10-23 10:43:18 -07:00
Stephen Birarda
9e5e886761 try to move the bat directly to robot 2015-10-22 16:47:43 -07:00
Atlante45
70c32e4b13 Remove empty script 2015-10-22 16:45:57 -07:00
Atlante45
05b794259e Script cleanup and particles on ground collisions 2015-10-22 16:43:37 -07:00
Atlante45
5f166044ec Make handler generators more readable 2015-10-22 16:43:12 -07:00
Stephen Birarda
1d5d655814 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-10-22 16:29:44 -07:00
Stephen Birarda
4f6da68a1f add getJointPosition and getJointRotation for entities 2015-10-22 16:25:28 -07:00
Stephen Birarda
06872a6c04 Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-10-22 14:45:20 -07:00
Stephen Birarda
cfa47d2fc6 use triggers to swing with robot 2015-10-22 14:45:08 -07:00
James B. Pollack
cd2559f1cc Merge pull request #6153 from ZappoMan/addKeyholeRadiusToEntityViewer 
Add Ability to set keyhole radius on EntityViewer
 2015-10-22 14:06:07 -07:00
Brad Hefta-Gaub
ea917f85f4 added ability to set keyhole radius on EntityViewer 2015-10-22 12:56:45 -07:00
Brad Hefta-Gaub
4a7f5751f4 Merge pull request #6151 from samcake/color 
Fix the dark diffuse color for material without texture
 2015-10-22 12:23:41 -07:00
samcake
b2461a8e4e Merge branch 'master' of https://github.com/highfidelity/hifi into color 2015-10-22 12:06:20 -07:00
Brad Davis
0755ba8ba4 Merge pull request #6150 from birarda/qt-5.5 
final fixes required for successful Qt 5.5.1 build
 2015-10-22 11:51:15 -07:00
samcake
a44ac4cbfd Fiing the dark colors for surfaces without texture 2015-10-22 11:40:56 -07:00
Stephen Birarda
a8d591166e Merge branch 'master' of https://github.com/highfidelity/hifi into qt-5.5 2015-10-22 11:13:28 -07:00
Stephen Birarda
695f0a75b0 fixes for builds with qt 5.5 2015-10-22 11:12:51 -07:00
Stephen Birarda
a9bad8de66 add a script for ambient crowd noise 2015-10-22 11:12:02 -07:00
Atlante45
d8e997d91f Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-10-21 17:52:30 -07:00
Ryan Huffman
934575a78a Refactor pitching.js 2015-10-21 16:46:07 -07:00
samcake
613b509ba1 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-10-21 16:40:18 -07:00
Andrew Meadows
27c6624f0c Merge pull request #6142 from ZappoMan/fixEntityItemDependency 
fix EntityItemID dependency
 2015-10-21 14:57:07 -07:00
Brad Hefta-Gaub
856af8c764 fix EntityItemID dependency 2015-10-21 14:33:12 -07:00
Ryan Huffman
8f83870e52 Update pitching.js to add audio 2015-10-21 14:19:21 -07:00
James B. Pollack
03d740914d Merge pull request #6136 from imgntn/cleanup_toybox 
[Scripts] Toybox Cleanup & Organization
 2015-10-21 13:59:13 -07:00
Brad Hefta-Gaub
8f90cdf98c Merge pull request #6137 from sethalves/fix-kinematic-grab 
Fix kinematic hold-action transmission
 2015-10-21 12:44:05 -07:00
Seth Alves
47d48d8cd1 Merge branch 'master' of github.com:highfidelity/hifi into fix-kinematic-grab 2015-10-21 12:29:35 -07:00
Seth Alves
c0eccca6d3 relay 'kinematic' mode of a hold to other interfaces 2015-10-21 12:29:26 -07:00
James B. Pollack
b302244a08 Merge pull request #6134 from ZappoMan/improveFindEntities 
implement improvement in sphere test
 2015-10-21 12:11:20 -07:00
Stephen Birarda
1d94691d23 Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-10-21 11:54:06 -07:00
Stephen Birarda
1e39c9359f don't force parenting of AssetRequest/AssetUpload 2015-10-21 11:53:38 -07:00
James B. Pollack
384a6a8154 rename /toys to /toybox, remove non toybox scripts, update master refs 2015-10-21 11:36:49 -07:00
Eric Levin
970d189262 Merge pull request #6125 from imgntn/toybox_ac 
[Scripts] Add Toybox AC Scripts, cleanup their headers, organize
 2015-10-21 11:24:59 -07:00
James B. Pollack
f3181054c9 Merge pull request #6133 from ericrius1/grabFixes 
Added wantsTrigger to userData for a couple toys to avoid breakage …
 2015-10-21 11:16:35 -07:00
Stephen Birarda
e28cc12dd8 Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-10-21 10:56:03 -07:00
James B. Pollack
0b06cf1dfb cleanup 2015-10-21 10:53:32 -07:00
James B. Pollack
68d43dc576 reduce number of toybox sound scripts 2015-10-21 10:50:37 -07:00
Brad Hefta-Gaub
246e46b69a implement improvement in sphere test 2015-10-21 10:46:50 -07:00