Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-01 06:17:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
12737 commits 73 branches 59 tags 1.2 GiB
Commit graph

3691 commits

Author SHA1 Message Date
ZappoMan
106c8bffd8 first cut at animations in models 2014-05-09 16:08:06 -07:00
Philip Rosedale
6762d4d63c Merge pull request #2816 from birarda/stop-sound 
add interface to Audio to stop injector and see if playing
 2014-05-07 20:59:58 -07:00
Philip Rosedale
538e785208 Merge pull request #2815 from ZappoMan/modelserver 
More Model Improvements & some other tweaks
 2014-05-07 20:59:04 -07:00
Stephen Birarda
f78c81e073 add interface to Audio to stop injector and see if playing 2014-05-07 17:48:01 -07:00
ZappoMan
128e4a13de place models in proper containing voxel 2014-05-07 17:32:51 -07:00
Philip Rosedale
c6fa903d6f Merge pull request #2813 from birarda/stop-sound 
return an injector from playSound and allow call to stop it
 2014-05-07 16:59:00 -07:00
Philip Rosedale
c6b4b7c250 Merge pull request #2811 from AndrewMeadows/inertia 
prevent avatar from getting trapped in voxel collisions
 2014-05-07 16:54:28 -07:00
Stephen Birarda
99ee6ae8af return an injector from playSound and allow user to stop it 2014-05-07 16:26:32 -07:00
Philip Rosedale
4e1eaf8337 Merge pull request #2809 from Atlante45/mute_env 
Mute environment
 2014-05-07 16:18:23 -07:00
Philip Rosedale
a66e49715c Merge pull request #2812 from birarda/audio-audability 
tweak audio constants to be less aggresive on cutoff
 2014-05-07 16:17:44 -07:00
Stephen Birarda
5e9036b3fe tweak audio constants to be less agressive on cutoff 2014-05-07 15:37:41 -07:00
Atlante45
fd1f6befff CR 2014-05-07 15:19:32 -07:00
Andrzej Kapolka
03faff359f Fix for certain models with textures not parented to materials. 2014-05-07 14:48:25 -07:00
Atlante45
9d2df69bab Merge branch 'master' of https://github.com/highfidelity/hifi into mute_env 2014-05-07 12:57:51 -07:00
Atlante45
40ed72989c mute environment packet 2014-05-07 12:57:11 -07:00
Andrew Meadows
8ec493e85b fix bad penetration depth for interior of cube 2014-05-07 12:39:20 -07:00
ZappoMan
37ca6efc7c correctly handle SHADOW_RENDER_MODE in a bunch of places that were drawing shadows when they shouldn't 2014-05-07 11:48:32 -07:00
Andrew Meadows
9fc1c765d3 overhaul of CollisionInfo 
store Cube info for sphereAACube collisions
 2014-05-07 11:40:00 -07:00
Andrew Meadows
6c289b682d move #include <StreamUtils.h> to cpp file 2014-05-07 11:18:50 -07:00
Andrzej Kapolka
d0537e7ead Specular map support. 2014-05-06 17:32:10 -07:00
Clément Brisset
72e6ff3649 Merge pull request #2803 from ZappoMan/modelserver 
Model Server Bug Fixes/Bandwidth improvements
 2014-05-06 17:18:25 -07:00
ZappoMan
c3f6cc0ccb code cleanup for style guide 2014-05-06 15:50:54 -07:00
ZappoMan
91e4a89573 cleanup old references to node which are really elements 2014-05-06 15:47:18 -07:00
Andrzej Kapolka
c38ab1acde Merge pull request #2802 from ey6es/master 
Fix for exports from Sketchup.
 2014-05-06 15:32:29 -07:00
ZappoMan
cde583452a make model server not oversend data 2014-05-06 15:31:45 -07:00
Andrzej Kapolka
353b9879b8 Fix for exports from Sketchup. 2014-05-06 15:15:42 -07:00
ZappoMan
cb302563df Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-06 14:12:17 -07:00
Atlante45
abebb078b0 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-06 13:08:00 -07:00
Atlante45
61c2dd0468 Fixed orientation and offset issues 2014-05-06 13:07:31 -07:00
ZappoMan
f3b8d04c06 fixed packet sequence number rollover 2014-05-06 09:39:14 -07:00
Philip Rosedale
e0c898bba0 Merge branch 'master' of https://github.com/worklist/hifi 2014-05-05 18:03:33 -07:00
Andrzej Kapolka
2a32700a30 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-05 17:03:31 -07:00
Andrzej Kapolka
0021c77789 Missed a spot for decoding avatar identity data. 2014-05-05 16:29:11 -07:00
Philip Rosedale
da0b36ed5c merge fix 2014-05-05 16:21:52 -07:00
Philip Rosedale
691b1d6069 Added lookAt rendering bubble 2014-05-05 16:19:09 -07:00
Brad Hefta-Gaub
e59c4a9aa2 Merge pull request #2783 from AndrewMeadows/inertia 
improved avatar walking on voxels
 2014-05-05 15:49:44 -07:00
AndrewMeadows
1c9cc03693 Merge pull request #2784 from ZappoMan/modelserver 
LOD support to Models & Particles, and some other tweaks
 2014-05-05 15:13:18 -07:00
ZappoMan
b10d9e3903 add LOD support for model and particle rendering 2014-05-05 14:26:51 -07:00
Stephen Birarda
befe75a04c fix broken audio-mixer stats 2014-05-05 14:03:14 -07:00
Andrew Meadows
5ffd307926 Merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.h
 2014-05-05 13:54:25 -07:00
Andrzej Kapolka
65e34f9697 More work on attachment interface. 2014-05-05 13:41:50 -07:00
Andrew Meadows
ddc9408a55 commit implementation of deleteLastCollision() 2014-05-05 12:32:23 -07:00
Andrew Meadows
f6b2b43376 forget collision for this failure case 2014-05-05 12:31:36 -07:00
Andrew Meadows
d2f858100e add CollisionList::deleteLastCollision() 2014-05-05 12:30:38 -07:00
Andrew Meadows
0cecef6441 fix "nearly but not quite" edge/corner collisions 2014-05-05 10:01:31 -07:00
Andrew Meadows
b097eed1aa fix sphere-cube collisions at edges (really) 2014-05-05 08:47:02 -07:00
Andrzej Kapolka
53a2760905 More attachment bits. 2014-05-04 16:24:23 -07:00
Andrzej Kapolka
e0400dbd9c Working on allowing attachment models to be uploaded. 2014-05-04 15:23:31 -07:00
Andrew Meadows
0e3d66caf6 fix incorrect rescale of vec3 2014-05-02 22:27:52 -07:00
Andrew Meadows
c8e56a97cc fix sphere-cube collisions, with tests 2014-05-02 21:47:27 -07:00