Atlante45
d0cd18d6c0
Replace entities pos/rot/dim with transform
...
Removed _position, _rotation, _dimensions
Added Transform _transform
2015-05-15 17:35:24 +02: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
Howard Stearns
5accb4d0d2
Remove debug logging.
2015-05-14 15:12:31 -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
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
Seth Alves
41d77e6146
Merge pull request #4852 from AndrewMeadows/nova
...
improved distributed simulation ownership negotiation
2015-05-14 11:40:49 -07:00
Seth Alves
1e2e4001b1
don't allow buildModelMesh to spam logs when it encounters flawed models
2015-05-14 10:24:02 -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
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
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
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
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
Seth Alves
9935b2ba22
Merge branch 'master' of github.com:highfidelity/hifi into fix-ray-intersection
2015-05-13 18:17:07 -07:00
David Rowe
2032d36b1f
Fix double/float mismatch build warnings
2015-05-13 17:32:40 -07:00
ZappoMan
045c0141e8
Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup
...
Conflicts:
libraries/entities/src/EntityItemProperties.cpp
2015-05-13 17:09:21 -07:00
Brad Hefta-Gaub
3b7acae8a2
Merge pull request #4850 from jherico/web-entity
...
Web entity
2015-05-13 17:02:55 -07:00
Sam Cake
d13106f4c9
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-05-13 16:00:42 -07:00
Sam Cake
238d3751c5
cleaning up the SH generation
2015-05-13 16:00:05 -07:00
Howard Stearns
ef187b390b
Server versioning.
2015-05-13 15:52:05 -07:00
Howard Stearns
dc2e923583
Ordering for packets.
2015-05-13 15:51:11 -07:00
Howard Stearns
6ebeb7a22e
Another constexpr.
2015-05-13 15:47:47 -07:00
Seth Alves
0db5ddc5b7
port code from samcake's model branch
2015-05-13 15:43:16 -07:00
Brad Davis
3b7e8a69b5
Attempting to fix threading issues with web entities
2015-05-13 14:00:41 -07:00
Seth Alves
3f8f5fd82e
Merge branch 'master' of github.com:highfidelity/hifi into smaller-collision-margins
2015-05-13 13:56:29 -07:00
Howard Stearns
76e39fc95b
constexpr => const for Windows compiler.
2015-05-13 13:56:10 -07:00
Seth Alves
711752bff1
rather than call setMargin, clench in all the points of a collision-hull toward the center of the hull by the margin amount
2015-05-13 13:54:24 -07:00
Howard Stearns
1a87ca04da
Entity sound.
2015-05-13 13:18:02 -07:00
ZappoMan
b4f15304ba
standardize COPY_PROPERTY_FROM_QSCRIPTVALUE for vec3, quat, and color
2015-05-13 13:12:47 -07:00
Seth Alves
2ec660bd42
try out smaller collision margins
2015-05-13 13:00:57 -07:00
ZappoMan
4fecd33115
use new macros in Line entity
2015-05-13 12:38:11 -07:00
Bradley Austin Davis
a0097bcff8
Fixing offscreen rendering on retina display, even without a proxy window
2015-05-13 12:26:46 -07:00
ZappoMan
095b7701d8
Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup
2015-05-13 12:12:12 -07:00
Stephen Birarda
ca87d64dc7
fix for audio-mixer shutdown hang, removing spaces
2015-05-13 12:03:21 -07:00
Brad Davis
ad5f1214bf
Fix error when deleting web item
2015-05-13 11:58:18 -07:00
Sam Cake
65e83df214
Generating the SH from the cube map!
2015-05-13 11:08:18 -07:00
Brad Davis
9b6c20d93c
Merge remote-tracking branch 'upstream/master' into web-entity
2015-05-13 09:49:53 -07:00
ZappoMan
f28ca90ac5
clean up COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE to be type safe
2015-05-13 09:38:49 -07:00
Andrew Meadows
fb34a5ba84
renaming and cleanup
2015-05-13 08:44:10 -07:00
Brad Davis
a8d343bbf1
Working on web entities
2015-05-13 00:27:57 -07:00
Sam Cake
04d3f690dc
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-05-12 23:12:37 -07:00
Sam Cake
536fff4502
Trying to create the SH from the skybox cubemap
2015-05-12 23:11:52 -07:00
Andrew Meadows
7e9e223b3e
merge upstream/master into andrew/nova
2015-05-12 21:48:55 -07:00
Andrew Meadows
4872a565c9
bid for simulation ownership
2015-05-12 21:46:52 -07:00
Andrew Meadows
45d4fa91ab
add a TODO comment
2015-05-12 21:46:04 -07:00
