Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 18:16:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
14820 commits 71 branches 56 tags 1.2 GiB
Commit graph

14820 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
9939c00a40 more guards to prevent crashing in bad particle edit packets 2014-07-11 16:57:08 -07:00
Atlante45
75573a4c06 Added exception checking to unit tests 2014-07-11 16:23:50 -07:00
Atlante45
b9fe5b2ef1 Added JS exceptions + fixed up floating precision mess up 2014-07-11 16:23:19 -07:00
Andrew Meadows
9b7fc9de95 merge upstream/master into andrew/bispinor 2014-07-11 16:09:22 -07:00
Andrew Meadows
d832f5bec8 fix menu config of visible stats 2014-07-11 16:08:37 -07:00
wangyix
82e9aa8bb7 made stats easier to read; reverted injected stream deletion conditions 2014-07-11 16:08:15 -07:00
Andrzej Kapolka
5e34bcc423 Some additional comments. 2014-07-11 15:51:36 -07:00
Andrzej Kapolka
ff28b9c871 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-11 15:38:48 -07:00
Andrzej Kapolka
38623e108a Delete persister when its thread finishes, copy metavoxel nodes on subdivision 
so that we'll know that they changed.
 2014-07-11 15:37:59 -07:00
Clément Brisset
a7b6879bea Merge pull request #3159 from ey6es/metavoxels 
Basic placeholder metavoxel save/load, added some stats on server and client, tie metavoxel LOD to avatars', spanner streaming fix.
 2014-07-11 15:22:04 -07:00
wangyix
90c931ea45 removed Audio.cpp initialization list warning; updated Injector removal conditions 2014-07-11 15:07:50 -07:00
wangyix
3a98ea0d56 Merge remote-tracking branch 'upstream/master' into quick_audio_PR 2014-07-11 13:26:14 -07:00
wangyix
d369435240 added dirty fix for NaN _nextOutputTrailingLoudness 2014-07-11 13:25:47 -07:00
Atlante45
d456adff1d Merge branch 'master' of https://github.com/highfidelity/hifi into typed_arrays 2014-07-11 12:44:53 -07:00
Andrzej Kapolka
21a1f4772c Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-11 12:42:25 -07:00
Clément Brisset
a5222c7bbd Merge pull request #3161 from ZappoMan/fixeParticleServerCrash 
fix crash in particle and model server from attempting to edit items that dont exist in the server
 2014-07-11 11:51:53 -07:00
Brad Hefta-Gaub
56a6cb9184 Merge pull request #3160 from Atlante45/sitting_improvments 
Sitting improvments
 2014-07-11 11:48:42 -07:00
Brad Hefta-Gaub
a94e077a75 Merge pull request #3153 from wangyix/quick_audio_PR 
Added more stats to AudioStreamStats; Added template classes RingBufferHistory and MovingMinMaxAvg
 2014-07-11 11:42:55 -07:00
samcake
f4ebb175c6 Fix bad casting syntax 
- Reverse the casting that i added to stop warning, works on windows
but not on mac :(
 2014-07-11 11:35:42 -07:00
Atlante45
7ad90ac7bb When visible is false, don't render billboards/models overlays 2014-07-11 11:29:58 -07:00
ZappoMan
4c3a1d192e fix crash in particle and model server from attempting to edit items that dont exist in the server 2014-07-11 11:29:32 -07:00
Andrzej Kapolka
7af4e4e261 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-11 11:25:15 -07:00
Andrzej Kapolka
222869bf53 Merge pull request #3157 from wdings23/master 
2 local lights as default
 2014-07-11 11:24:48 -07:00
Atlante45
e067a013a0 Made sitting point more consistant 2014-07-11 11:22:38 -07:00
AndrewMeadows
f108f99cc4 Merge pull request #3156 from Barnold1953/OculusSDK 
Oculus UI 2.0
 2014-07-11 11:22:23 -07:00
Atlante45
22bcb7d7e7 Billboard overlays disply grey square while image is loading 2014-07-11 11:22:06 -07:00
samcake
4adbb19258 Update MotionTracker.h 
- FIx the bad parenthesis
 2014-07-11 11:10:18 -07:00
Atlante45
a9ceec4627 Switched sit.js spheres to billboards 2014-07-11 10:50:46 -07:00
Atlante45
bd7b17a787 Added subimage to Billboards overlays 2014-07-11 10:50:11 -07:00
Atlante45
2347bd7eed Sitting position persists between sessions 2014-07-11 10:47:48 -07:00
wangyix
c5e0da0477 Merge remote-tracking branch 'upstream/master' into quick_audio_PR 2014-07-11 10:18:49 -07:00
Brad Hefta-Gaub
dbca97c71b Merge pull request #3158 from wangyix/master 
worklist 19807: Fixed bug in OctreeEditPacketSender where there was one outgoing seq number for all nodes.
 2014-07-10 18:48:11 -07:00
Atlante45
02c951fba5 Added bunch of Typed arrays unit tests 2014-07-10 18:34:17 -07:00
Atlante45
3070ac457f Typed arrays bug fixing 2014-07-10 18:33:57 -07:00
Atlante45
ff378b60ac Added functionnalities to JS UnitTests 2014-07-10 18:33:24 -07:00
Atlante45
0e5af5afea More work on typed arrays 2014-07-10 18:32:55 -07:00
Andrzej Kapolka
af3af15084 Comment, formatting fix. 2014-07-10 18:11:51 -07:00
barnold1953
97165cadcc Removed unneeded variable 2014-07-10 17:34:10 -07:00
barnold1953
1781a2d125 fixed unused variable warning 2014-07-10 17:30:43 -07:00
Andrzej Kapolka
d121c8e07a Fix for starting with empty spanners (due to LOD), then adding. 2014-07-10 17:21:05 -07:00
wangyix
69005242b9 forgot to multiply rates by 100% for domain stats page 2014-07-10 17:18:54 -07:00
TonyPeng
df7f3073dc 2 local lights as default 2014-07-10 17:18:49 -07:00
wangyix
ae1d91b21d improved domain page stats string a bit 2014-07-10 17:11:15 -07:00
wangyix
6c85caaa54 updated Stats for new AudioStreamStats format 2014-07-10 17:03:53 -07:00
barnold1953
4bf74c1b65 Fixed more ubuntu compiler warnings 2014-07-10 16:59:57 -07:00
barnold1953
e658ce8fb9 Fixed ubuntu compiler warning 2014-07-10 16:57:46 -07:00
barnold1953
71634b4c8d Fixed windows compiler warning 2014-07-10 16:56:04 -07:00
wangyix
a7ef7647ed application stats tracking and packing updated; 2014-07-10 16:54:26 -07:00
samcake
c66560c1c0 Fix C++11 usage 
- replace all the auto keyword by the proper type
kept the auto line in todo for reference :)

- silent a few warnings
 2014-07-10 16:45:12 -07:00
barnold1953
18c5ebce9e Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK 2014-07-10 16:42:36 -07:00