Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 09:07:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
overte/libraries
History
Brad Davis 9eb15d3d55 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/GLCanvas.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/OculusManager.h
	libraries/render-utils/src/DeferredLightingEffect.cpp
2015-07-13 12:54:19 -07:00
..
animation fix AnimationLoop::setRunning() to not constantly reset the frame when the running state doesn't actually change 2015-07-10 12:43:35 -07:00
audio Allow scripted audio injectors to have options set. 2015-06-23 21:01:34 -07:00
audio-client Merge pull request #5161 from PhilipRosedale/master 2015-06-22 12:09:08 -07:00
auto-updater Don't display update dialog if this is a PR build 2015-07-02 14:17:36 -06:00
avatars Make renderDisplayName const 2015-06-18 15:22:49 +02:00
display-plugins Fixing the 0.6 Oculus plugin 2015-07-03 07:08:48 -07:00
embedded-webserver
entities Merge pull request #5302 from AndrewMeadows/astatine 2015-07-12 11:17:09 -07:00
entities-renderer Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-10 11:10:07 -07:00
environment wire up atmosphere.hasStars property 2015-05-04 14:19:13 -07:00
fbx fix syntax 2015-06-19 17:13:29 +02:00
gpu Merge remote-tracking branch 'upstream/master' into plugins 2015-07-13 12:54:19 -07:00
model Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers. 2015-07-10 11:03:12 -07:00
networking add stats for PPS for inbound from network into OctreePacketProcessor and processing out of OctreePacketProcessor 2015-07-06 16:03:42 -07:00
octree CR feedback 2015-07-04 19:13:35 -07:00
physics this code can be called for hold actions if they end up in an svo save. revert a line from a previous commit 2015-07-12 13:43:21 -07:00
plugins Working on plugin menu items 2015-07-01 09:05:26 -07:00
render Adding intrsumentation for nsight and hiding the nsight specific code in cpp 2015-07-08 14:25:13 -07:00
render-utils Merge remote-tracking branch 'upstream/master' into plugins 2015-07-13 12:54:19 -07:00
script-engine on script shutdown, wait to process all pending edit messages before ending the script engine 2015-07-09 15:01:16 -07:00
shared Still trying to get jenkins builds to work 2015-07-10 16:00:51 -07:00
ui Merge pull request #5219 from venkatn93/master 2015-06-29 10:51:16 -07:00