Commit graph

33526 commits

Author SHA1 Message Date
Atlante45
c9f49ca992 Remove baseball script 2015-10-27 11:53:46 -07:00
Stephen Birarda
7e8aec9db9 fix double URL scheme 2015-10-27 11:48:52 -07:00
Stephen Birarda
12aadd7cf2 Merge branch 'baseball' of https://github.com/Atlante45/hifi into baseball 2015-10-27 11:06:41 -07:00
Stephen Birarda
3fa4f7138a add more sounds to the crowd, ping AssetServer from Agent 2015-10-27 10:58:31 -07:00
Atlante45
e04d9de4a4 Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-10-27 10:28:10 -07:00
Atlante45
5f8c3a6b4b Fix AssetResourceRequest crash 2015-10-27 10:27:37 -07:00
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
Atlante45
2f50652544 Merge branch 'script-engine' into baseball 2015-10-26 14:17:40 -07:00
Atlante45
c5c74fcc37 Merge branch 'physics-ccd' of github.com:huffman/hifi into baseball 2015-10-26 13:08:53 -07:00
Atlante45
380139364c checkExceptions after testing entity scripts in the sandbox 2015-10-26 12:41:49 -07:00
Atlante45
1c048880ee Lambda conversion fix for windows 2015-10-26 12:27:48 -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
Atlante45
9d6f55ea93 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-10-26 11:59:53 -07:00
Stephen Birarda
e8c6acfeb6 update baseball crowd to loop better 2015-10-26 11:58:49 -07:00
Atlante45
1e4a414f9d Fix scripts syntax errors 2015-10-26 11:33:36 -07:00
Atlante45
8d72fcada5 Some more script checks 2015-10-26 11:33:13 -07:00
Atlante45
9771361840 Typo 2015-10-26 10:49:41 -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
421d967e49 Improve script engine error logging + some cleanup 2015-10-23 15:41:31 -07:00
Atlante45
4e33aa84e8 Make handler generators more readable 2015-10-23 15:41:31 -07:00
Ryan Huffman
001400908d Add automatic CCD activation to the physics engine 2015-10-23 13:37:49 -07:00
Brad Hefta-Gaub
5cf936f132 Merge pull request #6163 from imgntn/move_files
[Scripts] Move scripts no longer in toybox to better locations
2015-10-23 12:26:38 -07:00
Atlante45
8c08ad38d7 Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-10-23 10:43:18 -07:00
James B. Pollack
6392b7080b move scripts no longer in toybox to better locations 2015-10-23 10:36:32 -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