Sam Cake
e9ff06df24
FIx the issue where the view frustum used in the skybox wasn;t in sync with the true camera, except if shadows is on, THe one call missing is now always executed
2015-05-15 17:22:29 -07:00
Sam Cake
c3dfd574b4
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-05-15 15:27:14 -07:00
Sam Cake
07fe43e175
moving forward with the void* hack for gpu::Texture
2015-05-15 15:26:40 -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
bb3d1a6a58
rays never pick a line entity. some fixes to pointer.js
2015-05-15 13:10:16 -07:00
Sam Cake
97b18fcd52
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-05-15 11:29:43 -07:00
Sam Cake
765145b898
Moving the load of the texture and the generation of the cube map irradiance in the same thread
2015-05-15 11:28:59 -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
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
Sam Cake
ad9834283d
Fixing the magic numbers!
2015-05-14 15:54: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
Sam Cake
e3d80088da
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-05-14 15:22:18 -07:00
Sam Cake
40ee78195e
remove magic numbers
2015-05-14 15:21:57 -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
Eric Levin
3393b60aba
added hydraHockeyGrab.js, which constrains moving object to xz plane and disables rotation
2015-05-14 11:39:04 -07:00
Clément Brisset
a3dc7def7b
Merge pull request #4870 from sethalves/quiet-model-log-spam
...
don't allow buildModelMesh to spam logs when it encounters flawed models
2015-05-14 19:36:57 +02:00
Seth Alves
1e2e4001b1
don't allow buildModelMesh to spam logs when it encounters flawed models
2015-05-14 10:24:02 -07:00
Philip Rosedale
e0e026c639
Merge pull request #4862 from birarda/master
...
fixes for other avatar receive stats rendering
2015-05-14 10:19:09 -07:00
Sam Cake
06d353ad30
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-05-14 10:17:42 -07:00
Andrew Meadows
81d06e0dc3
Merge upstream/master into andrew/nova
...
Conflicts:
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityItemProperties.cpp
2015-05-14 10:09:55 -07:00
Seth Alves
5a0f0972da
Merge pull request #4867 from PhilipRosedale/hockeygame
...
first version, air hockey game
2015-05-14 09:18:42 -07:00
Brad Hefta-Gaub
d1f52231be
Merge pull request #4863 from samcake/orange
...
Using the skymap for ambient lighting
2015-05-14 09:12:46 -07:00
Brad Hefta-Gaub
979a6fb682
Merge pull request #4868 from jherico/web
...
Make web entities responsive to mouse
2015-05-14 09:12:12 -07:00
Andrew Meadows
c631f85bf9
cleanup of simulation ownership/update logic
2015-05-14 08:43:54 -07:00
Brad Davis
a77816617d
Make web entities interactive (via the mouse) if they're not locked.
2015-05-14 01:15:20 -07:00
