Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 10:11:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
14856 commits 75 branches 59 tags 1.2 GiB
Commit graph

14856 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Andrew Meadows
c5a5f8c5d4 bug fix: bad logic in capsule-vs-capsule 2014-07-11 10:54:16 -07:00
Andrew Meadows
7c8f5e2c12 Remove some old TODO comments 2014-07-11 10:54:03 -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
wangyix
25f4f63a1e added window PacketStreamStats to AudioStreamStats 2014-07-10 16:42:23 -07:00
barnold1953
4bfd393d02 Proper scaling for oculus UI using avatar scale 2014-07-10 16:42:00 -07:00
Andrew Meadows
7e4efa6c73 Skeleton gets custom update for visible transforms 2014-07-10 16:21:12 -07:00
Andrew Meadows
b012c0a008 update visible transforms right before render 2014-07-10 16:19:27 -07:00
Andrew Meadows
fb287f71e8 add more methods for processing visible transforms 2014-07-10 16:17:55 -07:00
Andrew Meadows
2046608fa8 enforce alphabetical sort of Menu option strings 2014-07-10 16:16:54 -07:00
Andrzej Kapolka
d858e20af2 For now, tie the metavoxel LOD threshold to the avatar LOD parameter. 2014-07-10 16:02:53 -07:00
Andrzej Kapolka
817b50c7b8 Show upload/download stats for all reliable messages, not just reliable delta 
downloads.
 2014-07-10 15:34:45 -07:00
wangyix
ce0101aa2a fixed octreeEditPacketSender seq numbers errors; untested 2014-07-10 14:53:29 -07:00
Andrzej Kapolka
e55a0fbc9c Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-10 14:39:42 -07:00
barnold1953
8bc9214445 Added helper scaling function to Avatar. 2014-07-10 14:37:04 -07:00
barnold1953
fc21f7bbac Removed outdated and incorrect getFingerTipPosition() 2014-07-10 14:21:17 -07:00
wangyix
b4c9e51011 Audio now periodically sends downstream audio stats to audiomixer 2014-07-10 14:14:29 -07:00
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