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

21355 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
de75eec877 Merge branch 'master' of https://github.com/highfidelity/hifi into fixGlitches 2015-01-23 16:23:56 -08:00
Philip Rosedale
ba65112463 Merge pull request #4159 from Atlante45/master 
Request blocking calls
 2015-01-23 16:08:23 -08:00
Atlante45
7a1300d66c Request blocking calls 2015-01-23 16:05:06 -08:00
ZappoMan
9a0576adfb remove setting last simulated in setLastEdited() because it may cause problems 2015-01-23 15:54:26 -08:00
ZappoMan
9cc61e90f7 Merge branch 'master' of https://github.com/highfidelity/hifi into fixGlitches 
Conflicts:
	libraries/entities/src/EntityItem.cpp
 2015-01-23 15:01:35 -08:00
Brad Hefta-Gaub
494c189094 Merge pull request #4157 from AndrewMeadows/isentropic 
client-side kinematic motion for non-physical objects
 2015-01-23 15:00:01 -08:00
Andrew Meadows
1ad5f9c7db merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/physics/src/ObjectMotionState.cpp
 2015-01-23 14:04:26 -08:00
Stephen Birarda
98a470aa35 add wording to windows for soxr guide 2015-01-23 14:02:43 -08:00
Stephen Birarda
25ee7874ae fix instructions to source setenv script 2015-01-23 14:01:09 -08:00
Andrzej Kapolka
bc0fa0ed24 Push granularity option down the line in preparation for selectively 
increasing resolution.
 2015-01-23 13:58:51 -08:00
Stephen Birarda
24059f49fb fix eabi for openssl and cp for tbb 2015-01-23 13:57:27 -08:00
ZappoMan
c01d2d657c added comment 2015-01-23 13:55:12 -08:00
ZappoMan
fa485d21b7 added comment 2015-01-23 13:52:28 -08:00
Stephen Birarda
1baef08ffd add instructions for soxr, clarify for tbb 2015-01-23 13:42:52 -08:00
ZappoMan
3c38a9eb53 add last simulated to the protocal 2015-01-23 13:32:38 -08:00
Andrew Meadows
b34189115d Merge branch andrew/isentropic 2015-01-23 13:21:45 -08:00
Andrew Meadows
36c20c24fe fix for velocity in units of domain size 2015-01-23 13:20:12 -08:00
Atlante45
4eac6cd410 Moved IDENTITY_FRONT/UP/RIGHT to GLMHelpers 2015-01-23 13:19:03 -08:00
Andrew Meadows
f2bcdfa2b4 update _lastSimulated for kinematic motion 2015-01-23 13:10:41 -08:00
Stephen Birarda
5b81fa27fc fix for DEFAULT_NODE_AUTH_URL 2015-01-23 13:05:02 -08:00
Atlante45
9e923c453f Merge branch 'android' of git://github.com/birarda/hifi into android 2015-01-23 12:59:10 -08:00
Atlante45
ee9f183e14 Update static flag 2015-01-23 12:14:54 -08:00
Atlante45
a616edbb55 Remove avatars dependency on model,gpu,fbx (OpenGL) 2015-01-23 12:14:13 -08:00
Atlante45
bbf6ae7b01 Move Faceshift constants to their own file in shared 2015-01-23 12:11:08 -08:00
Atlante45
6d9deffdaa Remove avatars dependency to octree 2015-01-23 11:58:22 -08:00
Atlante45
4fce5113dd Use DM to access AvatarHashMap/Manager 2015-01-23 11:50:27 -08:00
Stephen Birarda
a3b92e05da support 44.1 for the note 4 2015-01-23 11:48:23 -08:00
Atlante45
9f58865937 Add AvatarHashMap and AvatarManager to DM 2015-01-23 11:46:11 -08:00
Sam Gateau
0d3f9c740d duplicate cleaning code at the end of Model renderCore 2015-01-23 11:14:17 -08:00
Andrew Meadows
eefd32b42b remove KinematicController classes 2015-01-23 11:04:02 -08:00
Andrew Meadows
d173afaa70 add support for non-physical kinematic movement 2015-01-23 11:01:46 -08:00
Sam Gateau
a5d131bcb5 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-01-23 10:57:46 -08:00
Sam Gateau
4151833549 cleaning up for pull request 2015-01-23 10:49:04 -08:00
Stephen Birarda
86c0cbe4a8 fix comment in Android manifest, move to Address 2015-01-23 10:24:28 -08:00
Stephen Birarda
39d9d99045 fix for local loop resample 2015-01-23 10:02:03 -08:00
ZappoMan
31f72107da remove support for old pre-entity svo files 2015-01-23 09:26:48 -08:00
Stephen Birarda
871d688db9 handle input to output resampling 2015-01-23 09:23:46 -08:00
Andrew Meadows
3a1c99b5e5 Merge pull request #4153 from PhilipRosedale/master 
Paddle ball game, first version
 2015-01-23 08:05:59 -08:00
Andrew Meadows
5672403900 Merge pull request #4154 from huffman/win-dpi-fixes 
Update runningScriptsWidgets px -> pt
 2015-01-23 08:05:24 -08:00
Andrew Meadows
cce763858e Merge pull request #4147 from ey6es/master 
Fixed bug with normal selection, incremental improvements to stitching.
 2015-01-23 08:04:10 -08:00
Andrzej Kapolka
b8a15f0726 Another tweak. 2015-01-22 22:04:10 -08:00
Andrzej Kapolka
c124dffd6a Another slight improvement. 2015-01-22 21:26:08 -08:00
Andrzej Kapolka
e65090bab9 Another slight stitching improvement. 2015-01-22 21:08:48 -08:00
David Rowe
22347dd794 Add AudioDevice.deviceChanged() signal and use to update audio menu 2015-01-22 19:11:55 -08:00
Sam Gateau
80784a7a33 fixing a bug in texture storage when accessing mip #0 2015-01-22 16:57:33 -08:00
Stephen Birarda
8544fccd84 use soxr resampling for loopback and output 2015-01-22 16:50:42 -08:00
Sam Gateau
258b5fd5a2 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-01-22 16:28:05 -08:00
Sam Gateau
49dde269a6 experimenting with linear space vs srgb space 2015-01-22 16:27:17 -08:00
Ryan Huffman
0e6f2d7252 Update runningScriptsWidgets px -> pt 2015-01-22 16:22:36 -08:00
Stephen Birarda
0440576dc2 use libsoxr for input to network resampling 2015-01-22 16:04:57 -08:00