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

14564 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
ad6a219a60 fix bug: remove redundant _skeleton.simulate() 2014-07-10 11:08:15 -07:00
Andrew Meadows
fdd9acb477 bug fix: bad logic for early exit 2014-07-10 10:55:41 -07:00
Brad Hefta-Gaub
21e7833938 Merge pull request #3150 from AndrewMeadows/inertia 
rename: ParentFrame --> ConstrainedFrame
 2014-07-09 18:35:25 -07:00
Brad Hefta-Gaub
635cb380f2 Merge pull request #3151 from ctrlaltdavid/19860 
Code Review for Job #19860
 2014-07-09 18:35:01 -07:00
Andrew Meadows
8fa7bf4fa0 rename: ParentFrame --> ConstrainedFrame 2014-07-09 16:43:46 -07:00
Andrzej Kapolka
af6704a83c Merge pull request #3134 from wdings23/light_and_haze 
Added local lights to avatar. Added haze to voxel.
 2014-07-09 16:07:20 -07:00
Stephen Birarda
33e42ae272 Merge pull request #3149 from birarda/master 
add two new concert cameras to examples
 2014-07-09 15:51:56 -07:00
Stephen Birarda
d412e21008 add two new concert cameras to examples 2014-07-09 15:51:37 -07:00
David Rowe
f2d49fa6a1 Rename focus indicators menu item and default to off 2014-07-09 15:12:29 -07:00
Brad Hefta-Gaub
1f00923146 Merge pull request #3148 from AndrewMeadows/inertia 
improved performance stats API
 2014-07-09 15:07:46 -07:00
Andrew Meadows
9ce6844e9d fix accidental broken class definition 2014-07-09 14:39:08 -07:00
Andrew Meadows
63bcee0229 fix whitespace formatting 2014-07-09 14:33:09 -07:00
Andrew Meadows
f463099d16 add "simulate" stat name to Avatar::simulate() 2014-07-09 14:31:47 -07:00
Andrew Meadows
6ffa09f9e6 modified scope of devices stats 2014-07-09 13:58:54 -07:00
TonyPeng
ef4b95c6e0 Merged from master. Get rid of redundant GL fog states. Moved local light parameters to shader uniform arrays. 2014-07-09 13:27:42 -07:00
Andrew Meadows
3d6752ad90 merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
 2014-07-09 12:52:00 -07:00
TonyPeng
56eadcb0dc Get rid of redundant GL calls for fog. Enable and disable fog during rendering stage of voxels. Moved the local light parameters to shader uniform arrays. 2014-07-09 12:05:34 -07:00
Andrew Meadows
d26585728b Improved stat accumulation and context names 2014-07-09 11:53:53 -07:00
Andrew Meadows
d214998d1a enforce coding standard: explicit casts 2014-07-09 11:53:09 -07:00
Philip Rosedale
7bcd7e03a4 Merge pull request #3147 from Barnold1953/master 
Fixed full screen mirror mode for non oculus
 2014-07-09 11:41:56 -07:00
Brad Hefta-Gaub
170aa3e659 Merge pull request #3146 from ctrlaltdavid/default_ui_on 
Default UI to "on"
 2014-07-09 11:41:45 -07:00
David Rowe
527f6b2a3f Fix User Interface menu item string 2014-07-09 11:32:38 -07:00
barnold1953
862f311306 Fixed full screen mirror mode for non oculus 2014-07-09 11:29:33 -07:00
David Rowe
603ca02ef9 Default UI to "on" 2014-07-09 11:21:16 -07:00
Clément Brisset
3f24feeb1d Merge pull request #3143 from PhilipRosedale/master 
Add Low Velocity Filter for hand movement as menu option
 2014-07-08 23:22:46 -07:00
Clément Brisset
2003dc41df Merge pull request #3138 from ctrlaltdavid/19836 
Code Review for Job #19836
 2014-07-08 23:16:32 -07:00
Philip Rosedale
f8185dec75 removed some debug logs 2014-07-08 22:26:11 -07:00
Philip Rosedale
c50d9ae3e4 Hand low velocity filter as a menu option 2014-07-08 22:22:27 -07:00
David Rowe
305623d8a7 Add option to hide focus indicators 2014-07-08 21:37:08 -07:00
Clément Brisset
e648c3475b Merge pull request #3139 from PhilipRosedale/master 
Another improvement to clapping to match animation pace with keystrokes
 2014-07-08 21:34:04 -07:00
Philip Rosedale
32eb51a224 Merge pull request #3141 from ey6es/metavoxels 
Fixes, congestion control for metavoxel streaming.
 2014-07-08 21:30:13 -07:00
Brad Hefta-Gaub
90d720face Merge pull request #3142 from mpursley/master 
adding "export QT_CMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.2.1/lib/cmake" for qt5.2.1
 2014-07-08 21:12:10 -07:00
David Rowe
51f7e8904d Integrate UI toggling menu item and Hydra UI toggling 
They work together and both fade the UI in / out.
 2014-07-08 21:04:30 -07:00
David Rowe
1e7a18e625 Guard _framebufferObject deletion 2014-07-08 21:02:32 -07:00
Philip Rosedale
b2912552f6 switched to better sounds for clapping 2014-07-08 21:00:02 -07:00
Philip Rosedale
a7ad803a7f Merge branch 'master' of https://github.com/worklist/hifi 2014-07-08 17:09:50 -07:00
Philip Rosedale
272e8c6e97 Merge pull request #3140 from ctrlaltdavid/script_error_reporting 
Fix script errors not being reported
 2014-07-08 16:56:26 -07:00
Andrzej Kapolka
2dbe72a818 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-08 16:49:14 -07:00
David Rowe
bc785115a9 Fix script errors not being reported 
Script.update event needs to be emitted after reporting any script errors.
 2014-07-08 16:33:31 -07:00
Andrzej Kapolka
1b890a9e48 Use congestion control for client sends, too. 2014-07-08 15:37:59 -07:00
Andrzej Kapolka
b6570dc4ee Use congestion control on server. 2014-07-08 15:10:05 -07:00
Philip Rosedale
40ad03dbf5 Another improvement to clapping to match animation pace with keystrokes 2014-07-08 14:53:41 -07:00
Andrzej Kapolka
5636171836 Timing fix. 2014-07-08 14:41:16 -07:00
Andrzej Kapolka
e579be82a2 Merge pull request #3137 from PhilipRosedale/master 
Better clapping and hand squeezing scripts, started new hair class to hold vertlet hair
 2014-07-08 14:20:03 -07:00
Andrzej Kapolka
7163db7586 Merge pull request #3136 from birarda/master 
use compiler default C++ standard library on OS X, tweak RtMidi find module
 2014-07-08 14:16:22 -07:00
Brad Hefta-Gaub
29a2a9aaa2 Merge pull request #3135 from wangyix/quick_audio_PR 
changed Audio.cpp to not overflow _audioOutput buffer; fixed premature injector stream deletion; disabled silent-frame dropping in non-dyanimic-jitter-buffers mode
 2014-07-08 13:56:31 -07:00
Andrzej Kapolka
02cf1f006e Change tests to reflect transmission changes and fixed issue with reprocessing 
already-handled reliable delta.
 2014-07-08 13:41:42 -07:00
wangyix
df1b4107fd moved qAudioOutput buffer overflow debug option to existing audio menu 2014-07-08 13:01:05 -07:00
TonyPeng
e212f9f42e Change fog start to use default value. 2014-07-08 12:48:01 -07:00
TonyPeng
4e04cecd8c Use glFog for haze (better performance). 2014-07-08 12:28:44 -07:00