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

13621 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Philip Rosedale
b07a3488aa Merge pull request #2995 from birarda/master 
initial pass at stereo input source
 2014-06-06 11:40:41 -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
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
Atlante45
9322e1f71b More work on editModels 2014-06-05 17:36:56 -07:00
Brad Hefta-Gaub
3646a7a61d Merge pull request #2992 from PhilipRosedale/master 
Left and Right hands have clasping animations in squeezeHands.js
 2014-06-05 17:20:59 -07:00
Andrzej Kapolka
ff306e5675 Merge pull request #2991 from ey6es/master 
Temporarily disable enum streamers, which are crashing on Windows startu...
 2014-06-05 17:08:31 -07:00
Andrzej Kapolka
83c2938c2e Temporarily disable enum streamers, which are crashing on Windows startup. 2014-06-05 17:05:57 -07:00
Andrzej Kapolka
981d0eb36e Merge pull request #2990 from AndrewMeadows/bug-fix 
fix for broken windows build with PrioVR libs
 2014-06-05 17:04:58 -07:00
Philip Rosedale
6bef0c1a6a both left and right hands in animation 2014-06-05 17:03:58 -07:00
Andrew Meadows
c689d826f4 fix for broken windows build with PrioVR libs 
The Model API changed but this code path was not updated.
 2014-06-05 15:48:18 -07:00
Atlante45
150477eea4 Models.addModel now returns a more accurate modelID 2014-06-05 15:47:25 -07:00
Atlante45
0bdd20abc9 Coding Standard 2014-06-05 15:46:07 -07:00
Atlante45
145a159233 Slight glow on laser intersection 2014-06-05 15:45:25 -07:00
Clément Brisset
02452819c3 Merge pull request #2988 from AndrewMeadows/ragdoll 
RagDoll Part 1: basic data structure
 2014-06-05 14:44:36 -07:00
Andrzej Kapolka
8abcacd433 Merge pull request #2989 from ey6es/master 
That'll teach me not to wait for the PR build.
 2014-06-05 12:28:47 -07:00
Andrzej Kapolka
8d908a12a3 Fix build. 2014-06-05 12:28:02 -07:00
Andrzej Kapolka
c2d4113768 Merge pull request #2986 from Barnold1953/OculusOverlay 
Hemisphere Oculus Overlay
 2014-06-05 12:19:23 -07:00
barnold1953
f0f7d0c55f Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay 
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
 2014-06-05 12:17:09 -07:00
Andrew Meadows
4eb801b8e9 merge upstream/master into andrew/ragdoll 2014-06-05 11:32:18 -07:00
Andrew Meadows
1b2cd2e144 adding RagDoll scaffold 2014-06-05 11:07:35 -07:00
barnold1953
4e699c0f84 Fixed coding standard and build error 2014-06-05 10:34:06 -07:00
Philip Rosedale
3cc67f5229 Merge pull request #2984 from ZappoMan/octreeWireformatImprovements 
Octree wireformat improvements checkpoint
 2014-06-04 21:58:08 -07:00
Philip Rosedale
b59b26d87b Merge pull request #2985 from ey6es/metavoxels 
Pulled in fixes for delta-encoding from "deltatars," added support for version-resilient streaming of Qt enums/flags.
 2014-06-04 21:23:46 -07:00
Brad Hefta-Gaub
7f3630a990 Merge pull request #2981 from wangyix/master 
added MovingPercentile for filtering bad clockskew values for Node
 2014-06-04 19:45:17 -07:00
Andrzej Kapolka
fd2893bf6d Get rid of the log calls entirely; use the same code that we use for the ID 
streamer.
 2014-06-04 18:23:31 -07:00
Andrzej Kapolka
37382304f7 Perhaps this will avoid the ambiguity in Windows. 2014-06-04 17:41:36 -07:00
Andrzej Kapolka
9ec2a5aec1 Avoid ambiguous call to log on Windows. 2014-06-04 17:39:42 -07:00
Andrzej Kapolka
97dd90507b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-04 17:37:33 -07:00
Andrzej Kapolka
47c71e2d3a Merge pull request #2983 from PhilipRosedale/master 
Added squeezeHands.js for open/close hand animation with controller trigger
 2014-06-04 17:35:43 -07:00