Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 13:09:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
overte/libraries
History
Andrew Meadows aa5a59c3dc merge upstream/master into andrew/nova 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/physics/src/PhysicsEngine.cpp
2015-05-05 10:24:17 -07:00
..
animation remove use of include_dependency_includes and use cmake 2015-02-18 14:12:05 -08:00
audio resolve conflicts on merge with upstream/master 2015-05-04 10:05:44 -07:00
audio-client resolve conflicts on merge with upstream/master 2015-05-04 10:05:44 -07:00
avatars move number constants out of SharedUtil to NumericalConstants 2015-05-01 10:26:53 -07:00
embedded-webserver try again without macro 2015-04-07 09:59:04 -07:00
entities merge upstream/master into andrew/nova 2015-05-05 10:24:17 -07:00
entities-renderer Merge pull request #4741 from sethalves/box-stacking-1 2015-05-02 00:34:44 -07:00
environment test the possibility that zlib is no longer required 2015-02-19 15:29:28 -08:00
fbx resolve conflicts on merge with upstream/master 2015-05-04 10:05:44 -07:00
gpu quiet compiler 2015-05-03 11:10:52 -07:00
model quiet compiler, remove some trailing control-Ms 2015-04-25 09:20:00 -07:00
networking fix for object below array in JSONBreakableMarshal 2015-05-04 16:32:26 -07:00
octree resolve conflicts on merge with upstream/master 2015-05-04 10:05:44 -07:00
physics merge upstream/master into andrew/nova 2015-05-05 10:24:17 -07:00
render-utils resolve conflicts on merge with upstream/master 2015-05-04 10:05:44 -07:00
script-engine now conforming to coding standards 2015-05-04 16:40:04 -07:00
shared merge upstream/master into andrew/nova 2015-05-05 10:24:17 -07:00
ui quiet compiler 2015-05-03 11:10:52 -07:00