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

13858 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
4d423c679c Added some typedefs to simplify the various mapping types. 2014-06-09 10:21:55 -07:00
Andrzej Kapolka
45c35d3a68 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-09 10:05:09 -07:00
AndrewMeadows
5ed1dfc4b0 Merge pull request #2999 from ey6es/metavoxels 
Provide a way to stream enums that aren't object properties, added tests for delta streaming, fixed Windows initialization bug.
 2014-06-09 08:48:20 -07:00
Stojce Slavkovski
2cde2f5303 use worklist for assets 2014-06-08 16:03:43 +02:00
Stojce Slavkovski
83b096ca1d myBalance 
- balance formatting
	- symbol layout changes
 2014-06-08 15:56:37 +02:00
Stojce Slavkovski
939f8c49de return balance in satoshis 2014-06-08 15:55:16 +02:00
Stojce Slavkovski
b3279e03ca references fix 2014-06-07 23:27:51 +02:00
Stojce Slavkovski
8de2bdfb99 expose account details via AccountScriptingInterface 2014-06-07 23:17:49 +02:00
Stojce Slavkovski
39c1daca43 Merge branch 'master' of https://github.com/worklist/hifi into 19755 2014-06-07 22:29:36 +02:00
Stojce Slavkovski
976b76ac85 myBalance new layout changes 2014-06-07 22:29:06 +02:00
Stojce Slavkovski
6365f6b857 Extend TextOverlay to accept font size 
Fix TextRenderer color rendering
 2014-06-07 22:24:35 +02:00
Brad Hefta-Gaub
8f71335bec Merge pull request #2993 from Atlante45/temp_branch 
More editModels.js work
 2014-06-07 09:17:30 -07:00
Stojce Slavkovski
9810335adf Merge branch 'master' of https://github.com/worklist/hifi into 19755 2014-06-07 10:33:41 +02:00
Stojce Slavkovski
fea1433ced Add initial mybalance script 2014-06-07 10:32:36 +02:00
matsukaze
c2a6345705 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-06-06 22:27:12 -04:00
Andrzej Kapolka
e620518d2f Working on streaming script values. 2014-06-06 17:59:30 -07:00
wangyix
5286090812 removed interface print statements 2014-06-06 17:52:48 -07:00
wangyix
b39559d860 packet recovery seems to be working 
Seems to impact FPS a lot.  OctreeSceneStats is not being locked (causes
freezing, need to find out why).
 2014-06-06 17:44:30 -07:00
Andrzej Kapolka
384fe51937 If we're going to initialize one mapping lazily, we might as well initialize 
some more that way.
 2014-06-06 16:38:52 -07:00
Andrzej Kapolka
2fec0a9db6 Fixes for Windows. 2014-06-06 15:50:28 -07:00
wangyix
d21a8e73ff Merge remote-tracking branch 'upstream/master' into packet_recovery_pull 2014-06-06 15:05:29 -07:00
wangyix
0b1bffa83c added random packet drops; ready to test 2014-06-06 15:03:54 -07:00
wangyix
bd2148d4b7 added write lock/unlock 
...for _octreeSceneStatsLock
 2014-06-06 14:33:53 -07:00
wangyix
5c47485562 client-side nack sending complete; ready to test 2014-06-06 14:27:51 -07:00
Andrzej Kapolka
361461516c Check the delta-encoded objects, report bytes sent/received. 2014-06-06 14:26:20 -07:00
Andrzej Kapolka
ac2c8ffbd5 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-06 14:05:59 -07:00
Stephen Birarda
570b66b310 Merge pull request #2998 from birarda/master 
remove MMX math in stereo audio copy
 2014-06-06 12:02:21 -07:00
Stephen Birarda
194493ab9b remove MMX math to fix stereo discrepancies 2014-06-06 12:00:47 -07:00
wangyix
6bbf3f1f17 Merge remote-tracking branch 'upstream/master' 2014-06-06 11:53:37 -07:00
Andrzej Kapolka
73723e598f Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-06 11:51:09 -07:00
Stephen Birarda
53a15bc7ed Merge pull request #2997 from birarda/master 
bump silent audio frame packet version
 2014-06-06 11:50:52 -07:00
Stephen Birarda
6fdc5df47b bump silent audio frame version 2014-06-06 11:50:36 -07:00
wangyix
8cd5ec3b54 started work on sending nack packets from client 2014-06-06 11:50:34 -07:00
Andrzej Kapolka
4fbd0823f0 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-06 11:49:51 -07:00
Stephen Birarda
1c8cf20ec2 Merge pull request #2996 from birarda/master 
add a mixer crash guard for meeting
 2014-06-06 11:47:45 -07:00
Stephen Birarda
a7a9656ac7 add a mixer crash guard in addSilentFrame 2014-06-06 11:47:34 -07:00
Andrzej Kapolka
f78187c256 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-06 11:43:12 -07:00
Philip Rosedale
b07a3488aa Merge pull request #2995 from birarda/master 
initial pass at stereo input source
 2014-06-06 11:40:41 -07:00
Andrzej Kapolka
56d9bc5215 Working on delta-streaming tests. 2014-06-06 11:37:45 -07:00
Stephen Birarda
b6b148cd9f resolve conflicts on merge with upstream master 2014-06-06 11:31:16 -07:00
Stephen Birarda
f6011b65d7 fix input loudness for a stereo source 2014-06-06 11:26:04 -07:00
Atlante45
69adf8d0dd Removed extra debug, fix model jumping when releasing one of the two triggers. 2014-06-06 11:19:43 -07:00
Andrzej Kapolka
0fc6354b6c Fix for streaming the same object. 2014-06-06 11:18:55 -07:00
Stephen Birarda
ae2f6a3cb6 complete piping of stereo audio through mixer 2014-06-06 10:55:04 -07:00
Stephen Birarda
681ce247d6 tweak resample to handle 48 to 24 stereo, add stereo/mono byte 2014-06-06 10:27:59 -07:00
Atlante45
dece3ea095 Merge branch 'master' of https://github.com/highfidelity/hifi into temp_branch 2014-06-06 10:26:49 -07:00
Atlante45
4209c1102f Revert "Models.addModel now returns a more accurate modelID" 
This reverts commit 150477eea4.
 2014-06-06 10:26:08 -07:00
Stephen Birarda
7da091d2b4 initial hooks for stereo audio 2014-06-06 10:15:09 -07:00
wangyix
5461a06e99 completed code to resend nacked packets on AC 2014-06-06 09:33:14 -07:00
Andrew Meadows
7f25c3e011 merge upstream/master into andrew/ragdoll 2014-06-06 08:53:37 -07:00