Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 01:00:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
overte/libraries
History
Brad Davis f7a2513f26 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/MyAvatar.h
	tests/ui/src/main.cpp
2015-07-30 12:55:22 -07:00
..
animation Merge pull request #5323 from MarcelEdward/20605 2015-07-30 07:30:01 -07:00
audio resolve conflicts on merge with upstream/master 2015-07-20 12:29:38 -07:00
audio-client kill the PacketLister (AKA Huffman 1 : PacketListener 0) 2015-07-17 09:07:39 -07:00
auto-updater Don't display update dialog if this is a PR build 2015-07-02 14:17:36 -06:00
avatars Merge branch 'master' into plugins 2015-07-24 13:38:18 -04:00
display-plugins HMDTools dialog restoration phase 2, electric boogaloo 2015-07-30 12:25:21 -07:00
embedded-webserver
entities Fixed float constant. 2015-07-27 09:28:56 -07:00
entities-renderer Merge remote-tracking branch 'upstream/master' into plugins 2015-07-30 12:55:22 -07:00
environment put back correct include for memcpy 2015-07-17 16:38:20 -07:00
fbx Merge pull request #5323 from MarcelEdward/20605 2015-07-30 07:30:01 -07:00
gpu Merge remote-tracking branch 'upstream/master' into plugins 2015-07-30 12:55:22 -07:00
input-plugins switched vive buttons 2015-07-27 10:53:01 -07:00
model REmove the crappy solution for drawing transparent texture into overlay by a proper shader 2015-07-23 23:09:40 -07:00
networking only output no listener for type message one time 2015-07-24 09:36:27 -07:00
octree add back a removed comment from jurisdiction map 2015-07-17 14:00:02 -07:00
physics Merge branch 'master' into plugins 2015-07-23 13:42:03 -04:00
plugins Revert to using QGLWidget 2015-07-30 10:59:05 -07:00
render Merge remote-tracking branch 'upstream/master' into plugins 2015-07-30 12:55:22 -07:00
render-utils Merge remote-tracking branch 'upstream/master' into plugins 2015-07-30 12:55:22 -07:00
script-engine fixed merge conflicts and refactored hit effect to catch up with refactored rendering engine 2015-07-29 10:02:06 -07:00
shared Merge branch 'master' into plugins 2015-07-23 13:42:03 -04:00
ui Merge remote-tracking branch 'upstream/master' into marge 2015-07-21 08:59:29 -07:00