Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-06 04:10:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
14091 commits 21 branches 0 tags 1.2 GiB
Commit graph

14091 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
d892a9c00f fixed warning about possible uninitialized variable. 2014-06-23 14:07:31 -07:00
Andrew Meadows
df740dd82a Fix bad static const inside class. 2014-06-23 14:07:09 -07:00
Andrew Meadows
e2204ab78e friend foo --> friend class foo 2014-06-23 13:59:44 -07:00
Andrew Meadows
415dfd98aa remove one line of cuft 2014-06-23 13:40:50 -07:00
Stephen Birarda
ed5c05a61b fix rounding of credit balance in application title 2014-06-23 13:25:32 -07:00
Andrew Meadows
b5aca45ab6 smaller timescale for slaving shapes to skeleton 2014-06-23 12:59:38 -07:00
Brad Hefta-Gaub
18cd794542 Merge pull request #3055 from wangyix/master 
Audio jitter buffer resizes depending on max inter-frame time gaps of incoming audio packets
 2014-06-23 12:45:04 -07:00
Andrew Meadows
7f4ffb363b merge upstream/master into andrew/ragdoll 2014-06-23 12:33:21 -07:00
Andrew Meadows
3e0673418f more complete physics iteration for stability 2014-06-23 12:32:23 -07:00
Andrew Meadows
add556719c fixed perf stats on phys simulation 2014-06-23 12:31:36 -07:00
Andrew Meadows
9713e3d513 remove some unused var warnings in Release build 2014-06-23 12:30:53 -07:00
wangyix
fbdca59d37 fixed spacing issue 2014-06-23 11:56:14 -07:00
Brad Hefta-Gaub
29a8307825 Merge pull request #3050 from ctrlaltdavid/fix_fullscreen_shortcut 
Fix fullscreen toggle shortcut
 2014-06-23 11:42:20 -07:00
wangyix
ffc20b8876 changed InterframeTimeGapHistory to InterframeTimeGapStats 2014-06-23 11:22:04 -07:00
Andrew Meadows
8ad2a679c4 move code to SkeletonModel::stepRagdollForward() 2014-06-23 11:16:18 -07:00
Andrew Meadows
9a2197a23c draw skeleton shapes at at correct positions 2014-06-23 10:55:34 -07:00
wangyix
e5d7d471e3 removed debug code 2014-06-23 10:55:30 -07:00
Andrew Meadows
5e4d757e4e merge upstream/master into andrew/ragdoll 2014-06-23 10:43:40 -07:00
Andrew Meadows
b50bf09c93 findPlaneCollisions() works in theory, not used 2014-06-23 10:39:50 -07:00
Andrew Meadows
8986be5f1c remove old collideAgaintsOurself() code 2014-06-23 10:36:31 -07:00
wangyix
7196814ec3 added debug prints to look at injected ring buffers 2014-06-23 10:22:16 -07:00
Andrew Meadows
eba03ddb8a re-enable some basic avatar collisions 2014-06-23 10:05:51 -07:00
Andrew Meadows
8b24e9cd67 Update SkeletonModel::_boundingShape position 2014-06-23 09:39:14 -07:00
Andrew Meadows
c1c2df5933 remove debug include 2014-06-23 08:53:58 -07:00
Andrew Meadows
b2ea8c0bf9 Compute more correct masses for ragdoll parts 
also pin root ragdoll shape at the local-frame origin
for stability
 2014-06-23 08:37:11 -07:00
Andrew Meadows
ea83a97b75 Add getVolume() method to Shape 2014-06-23 08:36:45 -07:00
Clément Brisset
1992f624ad Merge pull request #3054 from huffman/19723 
Code Review for Job #19723
 2014-06-22 16:37:02 -07:00
Clément Brisset
5b95eafa9b Merge pull request #3053 from ey6es/metavoxels 
Added basic tests for metavoxel streaming.
 2014-06-22 16:35:49 -07:00
Andrzej Kapolka
626bd42b7b Use randomColorValue, since we have it. 2014-06-20 18:22:36 -07:00
Andrzej Kapolka
811815e61f Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-20 18:12:29 -07:00
Andrzej Kapolka
49f1d427ec Removed incremental streaming stubs. 2014-06-20 18:12:08 -07:00
Andrzej Kapolka
de0c45a919 Spanner mutation in test. 2014-06-20 18:09:51 -07:00
wangyix
6b72b161d3 fixed typo with frames/samples confusion. 2014-06-20 17:52:46 -07:00
wangyix
124fba35db fixed minor comment typo 2014-06-20 17:39:05 -07:00
wangyix
cb6681f6f8 completed code for dynamicly resizing jitter buffer 2014-06-20 17:13:42 -07:00
Andrew Meadows
dcd9d8871d re-enabling some temporary debug stuff 2014-06-20 16:36:44 -07:00
Andrew Meadows
c17b8fdb60 collisions update shapes 
VerletShapes keep pointers to VerletPoints (rather than to glm::vec3's)
VerletShapes compute lagrangian coefficients
VerletShapes send their movement accumulations to their VerletPoints
 2014-06-20 16:31:39 -07:00
Ryan Huffman
0e6abe3359 Update inactive chat window opacity to 0.8 2014-06-20 16:31:22 -07:00
wangyix
a5457eb86b fixed bug in Audio.cpp where numSilentSamples was written to wrong place in packet 
added more debug stuff, other minor changes and fixes
 2014-06-20 14:43:18 -07:00
Andrzej Kapolka
ce778f47b1 More work on stream testing, fixed bug with differently-ordered edits. 2014-06-20 14:08:39 -07:00
David Rowe
633746ab16 Different fullscreen shortcuts for Mac and Windows 
Revert to the original Mac OSX key combination and provide alternative for Windows.
 2014-06-20 13:30:04 -07:00
Andrew Meadows
c7ad3da47d stubbery for processing collisions 
PhysicsSimulation tells CollisionInfos to apply() themselves
CollisionInfo knows how to apply() itself to affected shapes
Shape gets _mass and some stubbed methods for accumulating movement
VerletPoint gets movement accumulator
 2014-06-20 10:55:57 -07:00
Ryan Huffman
0c87f0aabc Update chat window behavior 
Lower opacity when inactive
Move focus to main window when pressing escape, instead of hiding
 2014-06-19 19:45:43 -07:00
Brad Hefta-Gaub
4ab30aae2b Merge pull request #3052 from Atlante45/misc_fixes 
Misc fixes
 2014-06-19 18:19:45 -07:00
Andrzej Kapolka
24f535e02d Working on metavoxel streaming tests. 2014-06-19 18:15:17 -07:00
Atlante45
4561a6e326 Fixed voxel being deleted even though voxel tool is not selected 2014-06-19 18:10:06 -07:00
Atlante45
266dc6be3e fixed tooltip not disapearing when deleting model 2014-06-19 18:09:17 -07:00
wangyix
435b5094a0 moved time gap history to PositionalAudioRingBuffer, untested 
removed hard-coded jitter buffer length.
 2014-06-19 17:58:38 -07:00
Andrew Meadows
4a0ce7a9ae support disabling collisions btw adjacent joints 2014-06-19 17:39:50 -07:00
wangyix
100bc022ec fixed a for loop that erased elements while iterating 2014-06-19 16:42:51 -07:00