Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 13:17:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
19935 commits 76 branches 59 tags 1.2 GiB
Commit graph

6251 commits

Author SHA1 Message Date
ZappoMan
cfa5e5c61b Merge branch 'master' of https://github.com/highfidelity/hifi into entityScriptsAndEvents 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.h
 2014-12-19 10:35:18 -08:00
Brad Hefta-Gaub
821cbe610c Merge pull request #3975 from ctrlaltdavid/20212 
CR for Job #20212 - Operate laser pointer with hands controlled by Leap Motion
 2014-12-19 09:55:45 -08:00
Stephen Birarda
365cd27c06 Merge pull request #3983 from ZappoMan/librarization 
Remove glut from the code base.
 2014-12-19 09:12:53 -08:00
ZappoMan
8091564a73 remove all glut 2014-12-18 16:12:30 -08:00
ZappoMan
26bcca95c9 remove glutWireCube() 2014-12-18 15:42:02 -08:00
Andrew Meadows
6df91b92a8 merge upstream/master into andrew/thermonuclear 2014-12-18 15:00:15 -08:00
ZappoMan
6f6cf3b08d Merge branch 'master' of https://github.com/highfidelity/hifi into librarization 2014-12-18 14:52:00 -08:00
Stephen Birarda
325d0dbce1 include QUuid instead of UUID in UUIDHasher 2014-12-18 14:31:34 -08:00
Stephen Birarda
e13e9febdc unlock the node mutex if node not found 2014-12-18 14:16:22 -08:00
Stephen Birarda
07f95c597c add read locks for find on tbb hash 2014-12-18 14:08:55 -08:00
Stephen Birarda
df3eca5aca add a comment for the UUID hasher 2014-12-18 14:01:22 -08:00
Stephen Birarda
587df1178d use constant for MSEC to USEC conversion 2014-12-18 13:57:19 -08:00
Andrew Meadows
b03e6c53e1 fixing derived classes to use new EntityItem API 
remove 'forceCopy' argument in EntityItem::setProperties()
 2014-12-18 11:41:20 -08:00
Andrew Meadows
28381a3b70 cleanup of EntityItem::_created timestamp logic 
EntityItem::_created initializes to 0 in ctor
and must be set either by EntityItemProperties (via server update)
or manually whenever a script creates a fresh entity
 2014-12-18 11:39:02 -08:00
Stephen Birarda
011b313b68 fix indentation in MetavoxelClientManager 2014-12-18 11:30:57 -08:00
ZappoMan
11b4400099 move all glut-ness to geometry cache 2014-12-18 11:20:17 -08:00
Stephen Birarda
4042b8b17a duh, glut only required on win 2014-12-18 09:50:10 -08:00
Stephen Birarda
e6d3278b59 add back include of GLUT in render-utils 2014-12-18 09:47:20 -08:00
Stephen Birarda
b326ab9839 remove quotes from library links for debug/optimized 2014-12-18 09:38:48 -08:00
Stephen Birarda
d38c78f2c3 remove bubbling of linked libraries, cmake does it 2014-12-18 09:34:04 -08:00
Stephen Birarda
b202eb7dae DRY up gpu library/header linking 2014-12-18 09:14:44 -08:00
Stephen Birarda
9425ea2c17 Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo 2014-12-17 16:47:15 -08:00
Andrew Meadows
756d09d895 fix typo that broke the build 2014-12-17 16:06:15 -08:00
Andrew Meadows
6e7eccdb27 merge upstream/master into andrew/thermonuclear 2014-12-17 15:59:45 -08:00
Andrew Meadows
75d468da9e set _lastEdited to _created rather than to zero 2014-12-17 15:59:16 -08:00
ZappoMan
ef42203481 add wire cube implementation to GeometryCache and DeferredLightingEffect 2014-12-17 15:58:52 -08:00
Andrew Meadows
44ebf37510 handle case where obj at rest but still falls 2014-12-17 15:52:34 -08:00
Andrew Meadows
1e5c44f117 accept changes with the same Edit timestamp 2014-12-17 15:48:49 -08:00
ZappoMan
7db350eac2 remove calls to glut in entities 2014-12-17 14:07:26 -08:00
ZappoMan
881119ebf3 removed dead code 2014-12-17 13:23:12 -08:00
ZappoMan
1a9cf126e4 Merge branch 'master' of https://github.com/highfidelity/hifi into librarization 
Conflicts:
	interface/src/Application.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.h
 2014-12-17 13:16:11 -08:00
ZappoMan
9f9b8bcb68 move interface/entities to libraries/entities-renderer 2014-12-17 12:54:41 -08:00
ZappoMan
2be3b73e8c move TextRender to libraries/render-utils 2014-12-17 12:32:52 -08:00
Andrew Meadows
e36ee2a961 more correct creation and edit times for entities 2014-12-17 12:19:34 -08:00
ZappoMan
a465aa20ff more Application and Menu dependency removal 2014-12-17 11:41:42 -08:00
ZappoMan
5d636e21c6 more Application dependency cleanup 2014-12-17 11:10:45 -08:00
ZappoMan
d3bf28e879 more Application dependency cleanup 2014-12-17 11:10:24 -08:00
Stephen Birarda
737741c13b Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo 2014-12-17 09:23:42 -08:00
Atlante45
6304a5e819 Unused removed method 2014-12-16 16:50:15 -08:00
ZappoMan
3dfded89b8 remove menu dependency from EntityTreeRenderer, some Application cleanup 2014-12-16 16:28:09 -08:00
Atlante45
3f2b5aeca4 Cleaner destruction handling 2014-12-16 16:22:59 -08:00
Atlante45
b2dac6f53f DM users update 2014-12-16 15:32:11 -08:00
Atlante45
11a2ecab56 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.cpp
	interface/src/entities/EntityTreeRenderer.h
	interface/src/ui/ApplicationOverlay.cpp
	libraries/render-utils/src/GlowEffect.cpp
	libraries/render-utils/src/Model.cpp
 2014-12-16 15:02:37 -08:00
Atlante45
2039895898 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/renderer/GlowEffect.cpp
	interface/src/renderer/TextureCache.cpp
 2014-12-16 14:27:50 -08:00
ZappoMan
89101872bb move Model and AnimationHandle to libraries 2014-12-16 14:04:39 -08:00
Atlante45
cf6aa563ac DM returns shared pointer 2014-12-16 13:54:24 -08:00
ZappoMan
efa8a752f2 remove dependency on Menu from Model 2014-12-16 13:14:57 -08:00
ZappoMan
16c1e597f1 remove Application dependency from Model 2014-12-16 12:53:22 -08:00
ZappoMan
1ed2c62bbf try this 2014-12-16 12:15:57 -08:00
ZappoMan
ee34dfffc1 try this 2014-12-16 12:05:23 -08:00