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

21211 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Andrzej Kapolka
bc0fa0ed24 Push granularity option down the line in preparation for selectively 
increasing resolution.
 2015-01-23 13:58:51 -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
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
Andrew Meadows
f2bcdfa2b4 update _lastSimulated for kinematic motion 2015-01-23 13:10:41 -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
ZappoMan
31f72107da remove support for old pre-entity svo files 2015-01-23 09:26:48 -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
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
Andrzej Kapolka
c1c9f698df Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-22 14:55:37 -08:00
Andrzej Kapolka
805d5ace13 Another slight stitching improvement. 2015-01-22 14:55:14 -08:00
Stephen Birarda
e488e841b7 Merge pull request #4151 from murillodigital/ice-monitoring 
Adding http monitoring for ICE server
 2015-01-22 14:26:49 -08:00
Andrew Meadows
355759d3d4 Merge pull request #4152 from ZappoMan/fixGlitches 
Fix glitches in bullets and multiple viewers
 2015-01-22 13:49:00 -08:00
Philip Rosedale
59f79fd436 Add handedness choice, default to right handed 2015-01-22 13:42:19 -08:00
Leonardo Murillo
001d689646 Fixing includes 2015-01-22 15:37:58 -06:00
ZappoMan
d34764bd55 fix whitespace diff 2015-01-22 13:33:59 -08:00
Leonardo Murillo
162c2f031b Remove https unneeded crust 2015-01-22 15:33:37 -06:00
ZappoMan
6a9a6968f2 debugging stutter 2015-01-22 13:32:57 -08:00
ZappoMan
c6ad1462e6 debugging stutter 2015-01-22 13:31:59 -08:00
ZappoMan
838a549abe debugging stutter 2015-01-22 13:31:09 -08:00
ZappoMan
14c7dc8eb9 debugging stutter 2015-01-22 13:13:18 -08:00
Leonardo Murillo
5efc046316 Adding http monitoring for ICE server 2015-01-22 15:03:13 -06:00
Philip Rosedale
45a84895e1 Paddle ball game, first version 2015-01-22 12:44:07 -08:00
Sam Gateau
aecc8b85bd Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-01-22 12:40:30 -08:00
dev
03a5c398ec splitting the GLBackend.cpp in several files and fixing the build for mac 2015-01-22 12:38:24 -08:00
Brad Hefta-Gaub
ad209ee731 Merge pull request #4150 from AndrewMeadows/bispinor 
remove ground collision hack for physics testing
 2015-01-22 10:56:36 -08:00
Andrew Meadows
b2f2a3ad27 Merge pull request #4149 from huffman/improve-loading 
Update ImageOverlay to use TextureCache
 2015-01-22 09:26:10 -08:00
Andrew Meadows
3997b916c1 remove ground collision hack for physics testing 2015-01-22 09:17:51 -08:00
Ryan Huffman
0e9e77f166 Fix broken support for color-only ImageOverlay 2015-01-22 08:58:55 -08:00