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

14820 commits

This branch
This branch
All branches
Author SHA1 Message Date
AndrewMeadows
afa0f19995 Merge pull request #3152 from AlericInglewood/19854 
Code Review for Job #19854
 2014-07-10 12:57:05 -07:00
Brad Hefta-Gaub
fb357ae04c Merge pull request #3155 from AndrewMeadows/bispinor 
fix bad FPS for crowds of avatars
 2014-07-10 12:06:43 -07:00
barnold1953
45421ffb0e Made palm ball and disk properly use avatar scale 2014-07-10 12:06:36 -07:00
wangyix
35419eb939 Merge remote-tracking branch 'upstream/master' into quick_audio_PR 2014-07-10 11:56:35 -07:00
wangyix
a955a17472 changed RingBufferHistory to use qvector instead of raw array 2014-07-10 11:55:19 -07:00
Andrew Meadows
0be70063c5 only set hasNewJointRotations true for valid rotation 2014-07-10 11:39:49 -07:00
Andrew Meadows
ad6a219a60 fix bug: remove redundant _skeleton.simulate() 2014-07-10 11:08:15 -07:00
Clément Brisset
d9acdd6f6e Merge pull request #3154 from AndrewMeadows/bispinor 
bug fix: bad logic for early exit in AvatarManager::updateOtherAvatars()
 2014-07-10 11:00:48 -07:00
Andrew Meadows
fdd9acb477 bug fix: bad logic for early exit 2014-07-10 10:55:41 -07:00
barnold1953
4d591de762 Applied low velocity filter to palm tip position 2014-07-10 10:52:15 -07:00
wangyix
0b213f9616 streamlined AudioStreamStats packing; added #include <limits> 2014-07-10 10:44:33 -07:00
wangyix
35e4b253c2 added typename keyword in MovingMinMaxAvg.h 2014-07-10 10:35:29 -07:00
barnold1953
baf825789e Made Oculus UI radius not a magic number 2014-07-10 10:28:56 -07:00
Aleric Inglewood
d555017fb4 Coding style fix. 2014-07-10 19:25:00 +02:00
wangyix
763cc26fa9 added operator= to RingBufferHistory<T>::Iterator 2014-07-10 10:21:03 -07:00
Atlante45
b4eb6a2eb7 Some refactoring 2014-07-10 10:09:49 -07:00
wangyix
37b60a63b2 removed spaces 2014-07-10 10:01:32 -07:00
wangyix
3389b6440c undo .gitignore changes 2014-07-10 09:53:37 -07:00
Aleric Inglewood
d1b9611040 Remove debug output lines. 2014-07-10 18:52:38 +02:00
wangyix
0d83b9a6f6 tidied up code 2014-07-10 09:51:01 -07:00
Brad Hefta-Gaub
21e7833938 Merge pull request #3150 from AndrewMeadows/inertia 
rename: ParentFrame --> ConstrainedFrame
 2014-07-09 18:35:25 -07:00
Brad Hefta-Gaub
635cb380f2 Merge pull request #3151 from ctrlaltdavid/19860 
Code Review for Job #19860
 2014-07-09 18:35:01 -07:00
ZappoMan
3c4f5f88d0 checkpoint on virtual entities 2014-07-09 18:24:31 -07:00
wangyix
7fcf149f70 removed if randFloat 2014-07-09 18:14:58 -07:00
wangyix
01f10024ae all stats added, needs testing; created PacketStreamStats struct 2014-07-09 18:13:33 -07:00
Atlante45
b2b1701965 - Bunch of fixes to typed arrays 
- First working prototype for Int8Array
- Base classes for all other typed arrays
 2014-07-09 17:47:09 -07:00
barnold1953
a785ceb3da Restored UI fade animation 2014-07-09 17:33:41 -07:00
Andrzej Kapolka
dbd7ec18b0 Show some stats on the client (node counts under LOD, reliable delta download 
progress).
 2014-07-09 17:15:05 -07:00
barnold1953
004db004a6 Dynamically resize lasers so they always end on UI 2014-07-09 17:03:09 -07:00
Andrew Meadows
8fa7bf4fa0 rename: ParentFrame --> ConstrainedFrame 2014-07-09 16:43:46 -07:00
barnold1953
56ff74dd56 Removed ApplicationOverlay::resize() 2014-07-09 16:39:05 -07:00
barnold1953
6e92beeb1c Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.h
 2014-07-09 16:32:02 -07:00
barnold1953
8147f2cd91 Fixed some magnification window bugs 2014-07-09 16:30:00 -07:00
barnold1953
090f1fd852 Fixed bug with 3rd person UI ray picking 2014-07-09 16:09:06 -07:00
Andrzej Kapolka
e9be9537a4 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-09 16:07:51 -07:00
Andrzej Kapolka
af6704a83c Merge pull request #3134 from wdings23/light_and_haze 
Added local lights to avatar. Added haze to voxel.
 2014-07-09 16:07:20 -07:00
Andrzej Kapolka
3b7945fc14 Gather and print out some stats after loading the data. 2014-07-09 15:52:23 -07:00
Stephen Birarda
33e42ae272 Merge pull request #3149 from birarda/master 
add two new concert cameras to examples
 2014-07-09 15:51:56 -07:00
Stephen Birarda
d412e21008 add two new concert cameras to examples 2014-07-09 15:51:37 -07:00
wangyix
81e168f657 added RingBufferHistory template class, used it in SentPacketHistory and MovingMinMaxAvg 2014-07-09 15:38:03 -07:00
David Rowe
f2d49fa6a1 Rename focus indicators menu item and default to off 2014-07-09 15:12:29 -07:00
Brad Hefta-Gaub
1f00923146 Merge pull request #3148 from AndrewMeadows/inertia 
improved performance stats API
 2014-07-09 15:07:46 -07:00
Andrew Meadows
9ce6844e9d fix accidental broken class definition 2014-07-09 14:39:08 -07:00
Andrew Meadows
63bcee0229 fix whitespace formatting 2014-07-09 14:33:09 -07:00
Andrew Meadows
f463099d16 add "simulate" stat name to Avatar::simulate() 2014-07-09 14:31:47 -07:00
Andrzej Kapolka
f9036dbaec Lock the attribute mapping, since it can be accessed from multiple threads. 2014-07-09 14:22:33 -07:00
Andrzej Kapolka
efe443e2ff Very basic metavoxel save/load. 2014-07-09 14:01:46 -07:00
Andrew Meadows
6ffa09f9e6 modified scope of devices stats 2014-07-09 13:58:54 -07:00
TonyPeng
ef4b95c6e0 Merged from master. Get rid of redundant GL fog states. Moved local light parameters to shader uniform arrays. 2014-07-09 13:27:42 -07:00
Andrew Meadows
3d6752ad90 merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
 2014-07-09 12:52:00 -07:00