Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-05 18:38:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
15507 commits 25 branches 0 tags 1.1 GiB
Commit graph

15507 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
18256a657e Removed unused uniform. 2014-08-08 14:25:02 -07:00
Andrzej Kapolka
b7910cfe74 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-08 14:20:38 -07:00
Andrzej Kapolka
468a3d4d67 Bump up the packet version. 2014-08-08 14:18:32 -07:00
Andrzej Kapolka
768410ca0b A couple comments, let right mouse button decrease height. 2014-08-08 14:14:35 -07:00
Andrzej Kapolka
e24ff0130f Basic color/height painting. 2014-08-08 14:10:44 -07:00
Andrzej Kapolka
b7b1b018ee No need to use a texture for the cursor; we can just use a fragment shader. 2014-08-08 11:24:57 -07:00
Brad Hefta-Gaub
e882e08579 Merge pull request #3265 from AndrewMeadows/ragdoll 
fix for extraneous joints in avatar ragdoll
 2014-08-08 09:00:35 -07:00
Andrew Meadows
2fe22a4c1a merge upstream/master into andrew/ragdoll 2014-08-08 08:43:02 -07:00
Andrew Meadows
05318acc7f don't make shapes for joints with zero radius 2014-08-08 08:37:28 -07:00
Brad Hefta-Gaub
0f5ee4eac1 Merge pull request #3264 from AndrewMeadows/ragdoll 
fix for bad models and some crashes
 2014-08-08 08:36:10 -07:00
Andrew Meadows
bcb0cb2c3c fix bug: variable should be float rather than int 2014-08-08 08:26:25 -07:00
Andrew Meadows
5de762361a remove cleanup of Model::_jointStates tree 
the cleanup causes crashes and broken models
 2014-08-08 08:20:42 -07:00
Philip Rosedale
96a795eea4 Merge pull request #3263 from AndrewMeadows/ragdoll 
Ragdoll Part 9:
 2014-08-07 22:12:31 -07:00
Andrzej Kapolka
6930174a9e Hide the cursor when the mouse pointer is hidden. 2014-08-07 18:30:33 -07:00
Andrzej Kapolka
0fc34a47aa Show heightfield cursor. 2014-08-07 18:19:58 -07:00
Andrew Meadows
9a55252587 remove extraneous roots from Model::_jointStates 2014-08-07 17:02:28 -07:00
Leonardo Murillo
03985a3bd4 Merge pull request #3262 from ZappoMan/master 
remove animation server
 2014-08-07 16:14:30 -06:00
ZappoMan
84f3ede32f small change to force rebuild 2014-08-07 15:09:24 -07:00
Andrzej Kapolka
4e1886dfcb Divided when I should have multiplied. 2014-08-07 15:04:55 -07:00
ZappoMan
64699a213a remove animation server 2014-08-07 14:48:51 -07:00
ZappoMan
8c2dad1476 remove animation server 2014-08-07 14:40:06 -07:00
Andrzej Kapolka
8de2dd9485 Working on ray intersection testing. 2014-08-07 14:38:47 -07:00
Andrew Meadows
bb33266635 merge upstream/master into andrew/ragdoll 2014-08-07 14:37:10 -07:00
Andrew Meadows
94da63006c VerletPoint::_mass is now private 
We set the mass of other avatars artificially high
so they are less movable.
 2014-08-07 14:35:32 -07:00
Andrew Meadows
0f784a9cc5 add other ragdolls to simulation 2014-08-07 13:09:05 -07:00
Andrew Meadows
87350ad2d0 ragdoll simulation now in model-relative frame 
(same rotation as world-frame, but translated to MyAvatar origin)
 2014-08-07 11:45:06 -07:00
Andrzej Kapolka
5a1456712f Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-07 11:35:41 -07:00
Andrew Meadows
db1d6c8b49 MyAvatar's ragdoll is the main simulation ragdoll 2014-08-07 09:23:05 -07:00
Andrew Meadows
27b876e84c namechange _frame --> _frameCount 2014-08-07 09:02:31 -07:00
Leonardo Murillo
8cca925679 Merge pull request #3260 from murillodigital/master 
Fixing bug with visage find_library
 2014-08-07 09:59:37 -06:00
Leonardo Murillo
6191db3a7f Fixing bug with visage find_library 2014-08-07 09:59:07 -06:00
Andrzej Kapolka
acb973d245 Working on ray intersection testing. 2014-08-06 19:41:25 -07:00
Andrzej Kapolka
62e6493456 Started on heightfield brush tool, added simple query for heightfield height 
(accessible from scripts).
 2014-08-06 17:09:22 -07:00
AndrewMeadows
2653b33b67 Merge pull request #3257 from Atlante45/referentials 
Referentials
 2014-08-06 14:12:18 -07:00
Philip Rosedale
dc4f57b30f Merge pull request #3259 from Atlante45/fix_avatar_not_fading_out 
Fix avatar not fading out
 2014-08-06 13:39:59 -07:00
Atlante45
de8c7fb204 Fix avatar not fading out 2014-08-06 12:14:36 -07:00
Andrzej Kapolka
c384abedcc Merge pull request #3258 from Atlante45/fix_voxel_bug 
fix voxel bug
 2014-08-06 11:46:38 -07:00
Atlante45
a8999d7db7 fix voxel bug 2014-08-06 11:23:48 -07:00
Andrew Meadows
cb8c0792b2 make main ragdoll and entity special 
also addded some logic (unused) to add ragdolls of other avatars
 2014-08-06 10:43:56 -07:00
Atlante45
fe8839b4b8 CR 2014-08-06 10:40:55 -07:00
Atlante45
110b034bcb Changed updates locations 2014-08-05 18:41:48 -07:00
Philip Rosedale
6976d0f51e Merge pull request #3256 from ey6es/metavoxels 
Allow configurable block sizes, use back face culling for heightfields, custom expansion for spanner attributes, compute normals in vertex shader.
 2014-08-05 18:32:05 -07:00
Atlante45
293c2e94ad Correct member initialisation 2014-08-05 18:17:49 -07:00
Atlante45
2e7d34a886 typing error 2014-08-05 17:08:23 -07:00
Atlante45
b360b6c55d PR cleanup + JS API 2014-08-05 17:07:03 -07:00
Andrzej Kapolka
0dbad7d0dd Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-05 16:49:22 -07:00
Andrzej Kapolka
4696832ec6 Compute heightfield normals from adjacent values in vertex shader. 2014-08-05 15:13:50 -07:00
Andrzej Kapolka
96302ca271 Provide for custom expansion according to attribute, tweak spanner attribute. 2014-08-05 14:10:39 -07:00
Brad Hefta-Gaub
b940d082f3 Merge pull request #3254 from wangyix/pull_mode_audio_output 
Audio output switched to pull mode
 2014-08-05 13:04:40 -07:00
wangyix
212316aed6 moved connect to Audio constructor 2014-08-05 12:14:10 -07:00