Atlante45
7ff973b94c
Merge branch 'master' of https://github.com/highfidelity/hifi into primitives_batch
2015-05-16 04:36:05 +02:00
Philip Rosedale
36b396b9ef
Merge pull request #4881 from ctrlaltdavid/fix-binary-eyelid
...
Fix visibility of binary eyelid control menu item
2015-05-15 17:19:15 -07:00
Philip Rosedale
831148e280
Merge pull request #4888 from sethalves/finglonger
...
more pointer.js fixes
2015-05-15 17:18:32 -07:00
Philip Rosedale
1c3873358d
Merge pull request #4896 from huffman/update-web-icon
...
Update web icon
2015-05-15 17:18:11 -07:00
Philip Rosedale
534869a7ad
Merge pull request #4889 from ericrius1/dice
...
changed dice to use collisionSoundURL prop
2015-05-15 17:17:45 -07:00
Philip Rosedale
0d00393eff
Merge pull request #4854 from ctrlaltdavid/fix-facetracker-rotation
...
Fix facetracker rotation
2015-05-15 17:17:30 -07:00
Philip Rosedale
edf963ab8f
Merge pull request #4895 from ericrius1/hockey
...
Hockey
2015-05-15 17:17:07 -07:00
Ryan Huffman
a0369d243a
Update web icon
2015-05-15 15:58:02 -07:00
Eric Levin
9bfca7f54d
'moved icons up so they don't interfere with dice icons and changed spanw icon from dice to puck icon'
...
'
2015-05-15 15:43:23 -07:00
Eric Levin
6e1c5d704c
'modified airHockey script to be able to spawn and delete using buttons, added light flashing on score, and puck now respawns on player's side who just got scored on
2015-05-15 15:24:10 -07:00
Seth Alves
60bd345e57
shorter timeout
2015-05-15 14:20:29 -07:00
Seth Alves
0d3add8596
left mouse button only
2015-05-15 14:16:06 -07:00
Seth Alves
aeb5cead65
more fixes to pointer.js
2015-05-15 14:02:25 -07:00
Eric Levin
9c6be26290
changed dice to use collisionSoundURL prop
2015-05-15 13:55:48 -07:00
Seth Alves
042713d1ec
Merge branch 'master' of github.com:highfidelity/hifi into finglonger
2015-05-15 13:55:28 -07:00
Seth Alves
f535bd2a76
more fixes to pointer.js
2015-05-15 13:54:24 -07:00
Philip Rosedale
650e8a54af
Merge pull request #4879 from jherico/hmd_pick
...
Fix mouse picking in the HMD
2015-05-15 13:50:54 -07:00
Seth Alves
de8d06acf6
Merge pull request #4887 from PhilipRosedale/hockeygame
...
remove line pointers from grab and hockey grab
2015-05-15 13:43:55 -07:00
Philip Rosedale
36031eb308
Merge pull request #4886 from sethalves/finglonger
...
rays never pick a line entity. some fixes to pointer.js
2015-05-15 13:27:13 -07:00
Philip Rosedale
cb0112e14e
remove line pointers from grab and hockey grab
2015-05-15 13:21:58 -07:00
Seth Alves
09f900862b
Merge branch 'master' of github.com:highfidelity/hifi into finglonger
2015-05-15 13:14:06 -07:00
Seth Alves
bb3d1a6a58
rays never pick a line entity. some fixes to pointer.js
2015-05-15 13:10:16 -07:00
Andrew Meadows
80f917a960
Merge pull request #4884 from howard-stearns/collision-sound-robustness
...
Collision sound robustness
2015-05-15 11:20:37 -07:00
Howard Stearns
9f7a56e3e5
Ask audio injector to delete itself.
...
Put in null guards.
Tune parameters (including higher threshold).
2015-05-15 11:00:28 -07:00
Howard Stearns
56bc4dc079
Merge branch 'master' of https://github.com/highfidelity/hifi into collision-sound-tuning
2015-05-15 10:56:36 -07:00
Brad Hefta-Gaub
fc4887a61a
Merge pull request #4882 from birarda/master
...
add error log debug for script load fail
2015-05-15 10:40:10 -07:00
Philip Rosedale
2df3f36420
Merge pull request #4880 from sethalves/finglonger
...
laser-poiner script for mouse
2015-05-15 10:39:20 -07:00
Stephen Birarda
e462617a6b
add error log debug for script fail
2015-05-15 10:29:24 -07:00
Howard Stearns
3600a5def8
Merge branch 'master' of https://github.com/highfidelity/hifi into collision-sound-tuning
2015-05-15 10:25:03 -07:00
Stephen Birarda
6419a148d4
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-05-15 10:20:12 -07:00
David Rowe
d3cb6a9334
Fix visibility of binary eyelid control menu item
2015-05-15 09:40:32 -07:00
Atlante45
e0ae8597bc
Factor zone code in Model::render
2015-05-15 15:45:31 +02:00
Seth Alves
1161f33b45
laser-poiner script for mouse
2015-05-14 20:25:29 -07:00
Brad Davis
6797174b97
Fix picking in the HMD
2015-05-14 19:15:47 -07:00
Seth Alves
3471c0a44f
Merge pull request #4878 from PhilipRosedale/hockeygame
...
new paddle models, low friction on field
2015-05-14 18:23:27 -07:00
Philip Rosedale
7be463388b
new paddle models, low friction on field
2015-05-14 18:22:30 -07:00
Philip Rosedale
252631475f
Merge pull request #4877 from ericrius1/hydra
...
added support for both right and left hydras for hydra scripts, and m…
2015-05-14 17:14:48 -07:00
Eric Levin
7a12a4d58e
added support for both right and left hydras for hydra scripts, and made picking accurate
2015-05-14 17:00:40 -07:00
Philip Rosedale
15d2ce6ecc
Merge pull request #4876 from AndrewMeadows/thermonuclear
...
adjust margin for hulls with small dimensions
2015-05-14 15:53:34 -07:00
Philip Rosedale
1318a3d6e9
Merge pull request #4875 from howard-stearns/collision-sound-tuning
...
collision sound tuning
2015-05-14 15:30:34 -07:00
Howard Stearns
15dd8596ac
Merge branch 'master' of https://github.com/highfidelity/hifi into collision-sound-tuning
2015-05-14 15:17:09 -07:00
Howard Stearns
5accb4d0d2
Remove debug logging.
2015-05-14 15:12:31 -07:00
Philip Rosedale
363f55c0f1
Merge pull request #4872 from ericrius1/hydraHockey
...
added hydraHockeyGrab.js, which constrains moving object to xz plane …
2015-05-14 15:05:44 -07:00
Andrew Meadows
7a47e04b9c
adjust margin for hulls with small dimensions
2015-05-14 14:57:18 -07:00
Howard Stearns
b5a28730ea
Filter out low-penetration continuous contact from all entity collision activity including scripts:
...
We don't want sound for these.
This appears to avoid the Entities.getEntityProperties() deadlock within entity scripts.
Variable names:
energyPercentOfFull => energyFactorOfFull, because the range is 0-1, not 0-100.
COLLISION_SOUND_COMPRESSION => COLLISION_SOUND_COMPRESSION_RANGE (portion of full dynamic range)
Tune constants:
COLLISION_ENERGY_AT_FULL_VOLUME 10 => 1
COLLISION_MINIMUM_VOLUME 0.01 => 0.001
COLLISION_SOUND_COMPRESSION_RANGE 0.5 => 0.95
Refer to SoundCache later, after filtering for collision threshold.
2015-05-14 14:41:32 -07:00
Philip Rosedale
3ee7f30cf5
Merge pull request #4874 from AndrewMeadows/thermonuclear
...
add restitution and friction to entity properties
2015-05-14 14:01:27 -07:00
Andrew Meadows
53e241fb07
merge upstream/master into andrew/thermonuclear
2015-05-14 12:37:41 -07:00
Andrew Meadows
d28c400cea
add restitution and friction Entity properties
2015-05-14 12:36:59 -07:00
Eric Levin
ebb590e58a
added new hydragrab script which works similarly to mouse grab script, and added header to hydraGrabHockey script
2015-05-14 11:46:52 -07:00
Seth Alves
41d77e6146
Merge pull request #4852 from AndrewMeadows/nova
...
improved distributed simulation ownership negotiation
2015-05-14 11:40:49 -07:00
