Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 11:52:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
overte/libraries
History
Brad Davis a83a4fb0a1 Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/ui/ApplicationOverlay.cpp
2015-06-17 19:53:31 -07:00
..
animation
audio Incorporate ctrlaltdavid's changes. 2015-06-17 11:59:15 -07:00
audio-client Incorporate ctrlaltdavid's changes. 2015-06-17 11:59:15 -07:00
auto-updater typo 2015-06-16 14:49:55 -06:00
avatars Undo the merge with the broken master checking. What could go wrong? 2015-05-28 13:48:27 -07:00
embedded-webserver
entities Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 15:13:04 -07:00
entities-renderer Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-17 13:50:30 -07:00
environment
fbx Merge branch 'master' of https://github.com/highfidelity/hifi into fix-attachments 2015-06-10 08:53:33 -07:00
gpu Merge remote-tracking branch 'origin/fix-gl-matrix' into overlay 2015-06-17 15:13:35 -07:00
model CR feedback 2015-06-17 10:02:02 -07:00
networking fix for path handling on return of place info 2015-06-17 11:18:43 -07:00
octree Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod 2015-06-03 19:47:51 +02:00
physics fix ifdefs around asserts 2015-06-17 15:03:09 -07:00
render Add post-scale to view matrix when in mirror mode 2015-06-12 13:05:10 -07:00
render-utils Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 15:13:04 -07:00
script-engine Signal Audio.disconnected, and use new hello/goodbye sounds in resources. 2015-06-11 20:33:30 -07:00
shared Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 19:53:31 -07:00
ui Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 15:13:04 -07:00