Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 00:00:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
25398 commits 76 branches 59 tags 1.2 GiB
Commit graph

25398 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Cake
07fe43e175 moving forward with the void* hack for gpu::Texture 2015-05-15 15:26:40 -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
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
Philip Rosedale
1e01aeb9ed first version, air hockey game 2015-05-13 23:11:24 -07:00
Seth Alves
baf4157da0 Merge pull request #4859 from ZappoMan/typeSafePropertyCleanup 
Clean up Entity Properties and Macros to be more type-safe friendly and consistent
 2015-05-13 20:52:03 -07:00
Brad Hefta-Gaub
99cd3989c6 Merge pull request #4865 from sethalves/fix-ray-intersection 
sam's mesh code
 2015-05-13 20:46:05 -07:00
Brad Hefta-Gaub
b799b89dbc Merge pull request #4861 from thoys/20540 
CR for Job #20540 - Additions to Planky
 2015-05-13 20:40:58 -07:00
Brad Hefta-Gaub
77019eafa7 Merge pull request #4831 from jherico/plugins_pt2 
Display plugins part 2
 2015-05-13 20:40:33 -07:00
ZappoMan
0dcb89fce7 Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItemProperties.cpp
 2015-05-13 20:33:10 -07:00
Brad Hefta-Gaub
5da0a8d7a3 Merge pull request #4860 from howard-stearns/entity-sound 
Entity sound.
 2015-05-13 20:07:44 -07:00
Philip Rosedale
4811697de3 Merge pull request #4866 from sethalves/fix-grab.js-entity-picking 
have grab.js do *accurate* picking!
 2015-05-13 19:52:09 -07:00