Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 01:26:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
21017 commits 75 branches 59 tags 1.2 GiB
Commit graph

6776 commits

Author SHA1 Message Date
ZappoMan
9630279459 Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 
Conflicts:
	examples/editVoxels.js
	examples/fallingSand.js
	examples/growTrees.js
	interface/src/Application.cpp
	interface/src/Application.h
	libraries/avatars/CMakeLists.txt
	libraries/entities/src/EntityItem.h
 2014-12-31 10:50:53 -08:00
Philip Rosedale
bd88e0f38d Merge pull request #4026 from ZappoMan/entityScriptsAndEvents 
evaluate entity scripts in a sandbox before constructing
 2014-12-31 10:44:55 -08:00
Brad Hefta-Gaub
eaa6d4455d Merge pull request #4024 from samcake/temp1 
Moving deferred lighting shaders from the resource folder to embedded source in the executable
 2014-12-31 10:33:30 -08:00
Brad Hefta-Gaub
43e6ba77fa Merge pull request #4007 from AndrewMeadows/inertia 
Bullet physics part 1
 2014-12-31 10:33:00 -08:00
ZappoMan
eb28efa648 evaluate entity scripts in a sandbox before constructing 2014-12-31 09:58:18 -08:00
Sam Gateau
e1a295fb37 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-12-31 08:40:15 -08:00
Andrew Meadows
ec1ef39a7f Merge pull request #4023 from PhilipRosedale/master 
Torso twists to follow head, fix bug with head rotations
 2014-12-31 08:01:39 -08:00
ZappoMan
67595ea571 more voxelEctomy 2014-12-30 20:35:21 -08:00
ZappoMan
5cef7d0e9d more voxelEctomy 2014-12-30 20:24:27 -08:00
ZappoMan
27d8ccb51e more voxelEctomy 2014-12-30 19:58:04 -08:00
ZappoMan
278ed96f14 more work on voxelEctomy 2014-12-30 18:54:53 -08:00
ZappoMan
49d8f2b2f5 more work on voxelEctomy 2014-12-30 18:52:33 -08:00
ZappoMan
141e231958 more work on voxelEctomy 2014-12-30 18:41:56 -08:00
Andrzej Kapolka
83967d49cf More rendering bits. 2014-12-30 18:16:49 -08:00
ZappoMan
4ea9bbc309 first major pass at voxelEctomy 2014-12-30 18:08:58 -08:00
Sam Gateau
ae6ccf1a7d Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-12-30 17:56:08 -08:00
Sam Gateau
4fb9e9c775 cleaning the code 2014-12-30 17:55:49 -08:00
Sam Gateau
8d95639416 moving the deferrered shaders from the resource folder to built-in the executable 2014-12-30 17:43:52 -08:00
Sam Gateau
37017d0c16 moving the deferrered shaders from the resource folder to built-in the executable 2014-12-30 17:42:10 -08:00
Philip Rosedale
dc9937e11a only twist own body, remove unused head functions 2014-12-30 17:02:53 -08:00
samcake
20d66d201e Merge pull request #4020 from ZappoMan/gpuStreamizing 
Improvements to GeometryCache::renderQuad()
 2014-12-30 16:49:16 -08:00
Andrzej Kapolka
de4776ef08 More progress on rendering. 2014-12-30 15:36:22 -08:00
ZappoMan
86a9d5719b fix one more case of animaiton stutter 2014-12-30 15:12:23 -08:00
Clément Brisset
860098585c Merge pull request #4018 from samcake/temp0 
Moving the shaders used in Model.cpp from resources folder into the built-in executable
 2014-12-30 13:36:13 -08:00
ZappoMan
eb4b8291d7 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2014-12-30 13:28:49 -08:00
ZappoMan
4e6ed4a449 fix comments 2014-12-30 13:26:13 -08:00
Andrzej Kapolka
135e3bf574 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-30 13:25:57 -08:00
ZappoMan
28569836bb rename parameters and reuse previously registered quad if geometry didn't change 2014-12-30 13:24:31 -08:00
Andrew Meadows
6f72d4ad81 easier to read Bullet to GLM conversions and back 2014-12-30 13:15:57 -08:00
Andrzej Kapolka
180bed4609 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-30 12:51:03 -08:00
Sam Gateau
a022e94814 Adding the shader files 2014-12-30 12:38:36 -08:00
ZappoMan
be137534b5 first cut at registered quads to reduce copies of constantly changing quads 2014-12-30 12:38:16 -08:00
Sam Gateau
e752edc44a Moving the shaders used in Model.cpp from resources folder into the built-in executable 2014-12-30 12:35:00 -08:00
Andrzej Kapolka
c9b3b5ff7d Scale back on first dropped packet, use Qt send/receive buffer size options 
rather than setsockopt/getsockopt.
 2014-12-30 12:30:38 -08:00
Andrew Meadows
5e2246625b fix layout to abide by the coding standard 2014-12-30 12:09:22 -08:00
Clément Brisset
9a1c521df2 Merge pull request #4014 from ZappoMan/animationFrameIndex 
Fix stuttering in animation caused when animation plays too long without lastFrame set
 2014-12-30 12:07:26 -08:00
Andrew Meadows
e43d7b7369 fix indentation in ctor init 2014-12-30 12:05:28 -08:00
Andrew Meadows
da551a0a76 restore script change detection to what it was 2014-12-30 11:56:39 -08:00
Andrew Meadows
ba873deb49 ignore Entity updates that don't change anything 2014-12-30 11:38:24 -08:00
ZappoMan
53a7d83f35 CR feedback spacing 2014-12-30 10:33:22 -08:00
ZappoMan
cb951763fd CR feedback spacing 2014-12-30 10:29:18 -08:00
ZappoMan
a4520f6a07 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2014-12-30 10:27:06 -08:00
ZappoMan
a0ec2ddfe9 clamp frame index between 0 and 100,000 2014-12-29 21:07:04 -08:00
Andrzej Kapolka
fbd4ca5c08 More work on rendering. 2014-12-29 18:37:06 -08:00
Andrew Meadows
ce14c823a1 add comment about stubbed ObjectMotionState 
for when Bullet lib is not found
 2014-12-29 16:41:27 -08:00
Andrew Meadows
a97b8b0ea9 fix memory leak of EntityMotionState's 2014-12-29 16:33:41 -08:00
Andrew Meadows
97f44b64fc assert NULL EntityItem::_physicsInfo in dtor 2014-12-29 15:27:54 -08:00
Andrew Meadows
213133c705 restoring EntityTreeElement::cleanupEntities() 2014-12-29 15:19:25 -08:00
Andrzej Kapolka
c78d38b925 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-29 14:38:17 -08:00
Andrzej Kapolka
84a2a8b83d Working on rendering. 2014-12-29 14:37:53 -08:00
ZappoMan
49e350fab2 Merge branch 'master' of https://github.com/highfidelity/hifi into animationFrameIndex 2014-12-29 14:01:35 -08:00
Andrew Meadows
8cb8092310 remove unused code 
I forget what I was using UUIDHashKey for
 2014-12-29 10:55:47 -08:00
Andrew Meadows
58f3436d9b fix bug in != operator 2014-12-29 10:50:06 -08:00
Andrew Meadows
b078850c6a remove personal TODO list from code file 2014-12-29 10:46:56 -08:00
Andrew Meadows
0ec56816c0 remove unused variable cruft 2014-12-29 10:43:09 -08:00
Andrew Meadows
bef14a46ac remove commented out cruft 2014-12-29 10:41:19 -08:00
Stephen Birarda
e02f81da01 fix a call to address manager in nodelist 2014-12-29 11:00:49 -07:00
Stephen Birarda
c7a5f3c86c resolve conflicts and merge with upstream master 2014-12-29 10:59:42 -07:00
Andrew Meadows
9b7e50858a merge upstream/master into andrew/inertia 
Conflicts:
	libraries/avatars/CMakeLists.txt
	libraries/entities/CMakeLists.txt
 2014-12-29 09:15:49 -08:00
Sam Gateau
6628f7b811 replace the model.frag and model.vert files from resource by the sl version of the shaders 2014-12-25 19:57:27 -08:00
ZappoMan
0790bd77b7 almost completely eliminate immediate mode QUADS 2014-12-24 11:14:50 -08:00
ZappoMan
02a1721185 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2014-12-24 10:25:41 -08:00
dev
42157161e0 fix the c++ header generation for mac though the brand new raw string format of c++11 2014-12-23 18:19:25 -08:00
Sam Gateau
c5eb04336f first version of SCribe used for shaders in render-utils 2014-12-23 16:27:02 -08:00
Sam Gateau
6f66b097f8 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-12-23 14:07:28 -08:00
ZappoMan
72cced12a6 guards for NULL collisions, possible fix to fountain crash 2014-12-23 11:30:32 -08:00
ZappoMan
17ed92cf7e fix runaway backup bug 2014-12-23 10:11:08 -08:00
ZappoMan
1f307e9667 more work on removing immediate mode GL_QUADS 2014-12-23 09:50:38 -08:00
ZappoMan
3d42d532e4 more work on removing immediate mode GL_QUADS 2014-12-22 17:43:02 -08:00
Sam Gateau
6b88eaceb5 FIx typos 2014-12-22 15:44:46 -08:00
Sam Gateau
bc83641300 add comments to Transform.h 2014-12-22 14:05:09 -08:00
ZappoMan
14458ac8fd first pass at removing immediate mode GL_QUADS 2014-12-22 13:47:18 -08:00
Atlante45
327daacecd Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	libraries/networking/src/NodeList.cpp
 2014-12-22 13:34:18 -08:00
Sam Gateau
1ae682ff21 fix end line typo 2014-12-22 11:36:18 -08:00
Sam Gateau
979d50f7d8 fixed pointers which were using 0 instead of NULL and syntax in resource.h 2014-12-22 11:20:04 -08:00
Sam Gateau
9ab6a680e9 fix typo in cmakelists 2014-12-22 11:03:08 -08:00
Sam Gateau
4c670ac17a merging with upstream master and origin temp0 2014-12-22 10:38:11 -08:00
Brad Hefta-Gaub
fb15b0f2a7 Merge pull request #3992 from samcake/temp0 
Add the BufferView class in gpu::Resource
 2014-12-22 10:12:48 -08:00
Brad Hefta-Gaub
483155f246 Merge pull request #3989 from birarda/master 
fix luckily linked dependencies in prep for shared hifi libraries
 2014-12-21 11:34:43 -08:00
Andrzej Kapolka
4153e32f57 Normal fix. 2014-12-19 18:31:49 -08:00
Andrzej Kapolka
a563c66ab8 Neighbor Hermite bits. 2014-12-19 17:16:45 -08:00
Sam Gateau
967c6dbc4b Add the Model library 2014-12-19 16:19:06 -08:00
Andrew Meadows
3e087bd75e Merge pull request #3990 from ZappoMan/entityScriptsAndEvents 
Entity Scripts bug fixes/improvements
 2014-12-19 16:02:00 -08:00
Andrzej Kapolka
2711b3f312 Closer to working edits. 2014-12-19 15:37:58 -08:00
Stephen Birarda
2780415b1d put glew link back into gpu 2014-12-19 15:07:31 -08:00
Stephen Birarda
d7d11955f3 Revert "add a test to confirm link fail" 
This reverts commit 691be3bf7c.
 2014-12-19 15:05:13 -08:00
Stephen Birarda
691be3bf7c add a test to confirm link fail 2014-12-19 14:59:55 -08:00
Stephen Birarda
9bd0bc671b resolve conflicts on merge with upstream master 2014-12-19 14:48:18 -08:00
Stephen Birarda
bd69a3aae3 Merge pull request #3993 from ZappoMan/gluRemoval 
more glu/glut removal
 2014-12-19 14:44:29 -08:00
ZappoMan
b7165abd5b possible glew warning fix for windows 2014-12-19 14:33:45 -08:00
ZappoMan
22e2fcf746 add some vec2 debugging 2014-12-19 13:46:42 -08:00
Sam Gateau
a7b039fbb9 Disabling glDebug 2014-12-19 13:28:19 -08:00
Sam Gateau
1ba8b89439 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-12-19 13:11:18 -08:00
Stephen Birarda
08581b4dac Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-19 12:50:32 -08:00
Clément Brisset
dbfbe35a49 Merge pull request #3986 from birarda/domain-connect 
fix domain connection with port, show current address in address bar
 2014-12-19 12:49:51 -08:00
Sam Gateau
096b09e8e1 Importing fixes from Model branch to the gpu library 2014-12-19 12:44:46 -08:00
Stephen Birarda
979f5f8fc5 fix for coding standard compliance 2014-12-19 12:19:49 -08:00
ZappoMan
32ea38b938 added leaveAllEntities support 2014-12-19 11:33:25 -08:00
Stephen Birarda
715b3a245e remove GLUT from Cmake files 2014-12-19 10:53:36 -08:00
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
Stephen Birarda
bc363dbf3b Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-19 10:32:41 -08:00
Andrew Meadows
a141ce37e4 merge upstream/master into andrew/inertia 2014-12-19 10:25:03 -08:00
ZappoMan
dd06d1f4a9 added comments to explain hand state 2014-12-19 10:01:14 -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
504cd86fef Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-19 09:13:06 -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
Andrzej Kapolka
377dc23dbe Wrap the QByteArray into a more convenient subclass. 2014-12-18 18:23:24 -08:00
Andrew Meadows
25b00977be fix cmake config for bullet after c++-11 changes 2014-12-18 17:34:39 -08:00
Stephen Birarda
114e3bb2ff rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
Stephen Birarda
2df9512dde Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-18 16:49:01 -08:00
Stephen Birarda
3a4f75ff62 fix AddressManager domain lookup to handle port 2014-12-18 16:40:02 -08:00
Andrzej Kapolka
f299004e09 The journey continues and continues and continues. 2014-12-18 16:26:33 -08:00
Stephen Birarda
1ab66c2bfe split port and hostname for cleaner domain changes 2014-12-18 16:17:03 -08:00
ZappoMan
8091564a73 remove all glut 2014-12-18 16:12:30 -08:00
Stephen Birarda
087ac1db90 send port along with domain hostname lookup 2014-12-18 16:03:13 -08:00
Atlante45
296c0025de Switched to auto and changed macro 2014-12-18 15:42:38 -08:00
Atlante45
f2847cec06 Changed Singleton Dependency macro and tweaked DM 2014-12-18 15:42:03 -08:00
ZappoMan
26bcca95c9 remove glutWireCube() 2014-12-18 15:42:02 -08:00
Stephen Birarda
f474cfc9d0 link to render-utils from entities renderer 2014-12-18 15:06:44 -08:00
Andrew Meadows
11f01e1859 merge upstream/master into andrew/inertia 2014-12-18 15:01:08 -08:00
Andrew Meadows
6df91b92a8 merge upstream/master into andrew/thermonuclear 2014-12-18 15:00:15 -08:00
Stephen Birarda
d87e06a9d3 add missing metavoxels link to script-engine 2014-12-18 14:54:10 -08:00
Stephen Birarda
4bd3a94794 add missing avatars link to entities 2014-12-18 14:53:52 -08:00
Stephen Birarda
e8adc19ac6 fix more missing dependencies in render-utils 2014-12-18 14:52:36 -08:00
Stephen Birarda
4f4ffc42d3 add missing link to fbx from avatars 2014-12-18 14:52:16 -08:00
ZappoMan
6f6cf3b08d Merge branch 'master' of https://github.com/highfidelity/hifi into librarization 2014-12-18 14:52:00 -08:00
Atlante45
9c038d33b9 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2014-12-18 14:43:01 -08:00
Stephen Birarda
1b5552de1a fix GLUT library link in render-utils 2014-12-18 14:42:08 -08:00
Stephen Birarda
ecb17a61d6 fix missing render-utils dependencies 2014-12-18 14:39:35 -08:00
Stephen Birarda
6a604ca340 fix missing script dependency from shared 2014-12-18 14:36:31 -08:00
Stephen Birarda
325d0dbce1 include QUuid instead of UUID in UUIDHasher 2014-12-18 14:31:34 -08:00
Atlante45
990362b8ff Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11 2014-12-18 14:18:21 -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
dab1f026d7 simpler EntityItem::simulate() bypass for bullet 2014-12-18 13:56:18 -08:00
Andrew Meadows
85fd1fc14f merge andrew/thermonuclear into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
	libraries/entities/src/EntityItem.cpp
 2014-12-18 13:46:06 -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
Atlante45
aa0998dc7d Moved LimitedNodeList into DM 2014-12-18 10:32:34 -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
Andrzej Kapolka
c7cae28c07 Increment fix. 2014-12-17 20:38:10 -08:00
Andrzej Kapolka
8629f7d00a Fiddly normalization bits. 2014-12-17 20:08:15 -08:00
Andrzej Kapolka
70a0bd07ab Various editing bits. 2014-12-17 17:56:52 -08:00
Stephen Birarda
7beb3a7b62 resolve conflicts on merge with upstream master 2014-12-17 16:57:35 -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
Atlante45
0bd9ed469e Changed NodeList::getInstance() calls to use the DM 2014-12-17 15:28:25 -08:00
Atlante45
52f2033dce Updated Nodelist class 2014-12-17 15:27:35 -08:00
Atlante45
ce7f72d2cd Update macro 2014-12-17 15:26:47 -08:00
Atlante45
d9d0166bc9 Use variadic templates to create instance with arguments 2014-12-17 15:23:39 -08:00
Andrew Meadows
547c4cdaf9 make non-bullet entity simulation work again 2014-12-17 14:52:38 -08:00
Andrew Meadows
c6afa0f7e1 remove test hack for higher than normal ground 2014-12-17 14:17:30 -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
Andrew Meadows
6ea766b48d merge andrew/thermonuclear into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityTypes.cpp
 2014-12-17 13:21:00 -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
Andrew Meadows
905d7f50eb comments on TODO list 2014-12-17 12:39:48 -08:00
Andrew Meadows
8de309a7a9 more correct _created and _lastEdited 2014-12-17 12:38:26 -08:00
Andrew Meadows
5efd996548 clarifying some comments on member variables 2014-12-17 12:37:49 -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
Andrzej Kapolka
068d6035c0 More progress on stack edits. 2014-12-16 20:39:49 -08:00
Andrzej Kapolka
ab52f434c9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-16 17:07:16 -08:00
Andrzej Kapolka
682800c618 Working on stack edits. 2014-12-16 17:06:05 -08:00
Atlante45
8a76429a0e Merge branch 'applications_diet' into applications_diet_cpp11 2014-12-16 16:50:51 -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
c40e83c9e4 Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11 2014-12-16 15:42:40 -08:00
Stephen Birarda
e0752cef54 remove collision sound creation calls 2014-12-16 15:35:37 -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
Stephen Birarda
1db12453d4 move audio stats into member of Audio 2014-12-16 14:47:24 -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
Stephen Birarda
1e91d0fe93 fix incorrect sample rate constant 2014-12-16 13:15:38 -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
Stephen Birarda
6fd55e6f42 make Audio class use DependencyManager 2014-12-16 12:31:01 -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
Stephen Birarda
7f2baa056e some cleanup in audio library 2014-12-16 12:02:10 -08:00
Stephen Birarda
4077a76e46 remove AudioRingBuffer include where not needed 2014-12-16 11:58:12 -08:00
ZappoMan
ec5c33fecc try this 2014-12-16 11:57:06 -08:00
Stephen Birarda
c734bc89a3 move the audio scope into its own class 2014-12-16 11:54:59 -08:00
ZappoMan
a9b3fdd3eb try this 2014-12-16 11:44:15 -08:00
ZappoMan
fc1e1ecfc0 move DeferredLightingEffect and AmbientOcclusionEffect to libraries, make them DependencyManager enabled 2014-12-16 11:27:44 -08:00
Stephen Birarda
1cf88e7666 Merge branch 'master' of https://github.com/highfidelity/hifi into lasagna-not-spaghetti 2014-12-16 10:47:45 -08:00
ZappoMan
4d79a08533 remove Application dependencies from AmbientOcclusion and DeferredLightingEffect 2014-12-16 10:32:03 -08:00
ZappoMan
660bf2720e convert AnimationCache to DependencyManager 2014-12-15 19:48:15 -08:00
ZappoMan
02737a4ec4 move JointState to libraries 2014-12-15 19:38:30 -08:00
ZappoMan
fac6ff572b see if this works 2014-12-15 19:29:53 -08:00
ZappoMan
41c135c4e5 move GlowEffect to libraries 2014-12-15 19:19:21 -08:00
Andrzej Kapolka
b62ad547ed More work on spanner edits. 2014-12-15 18:31:01 -08:00
ZappoMan
37abe8e89c move RenderUtils.cpp/h to libraries 2014-12-15 17:35:26 -08:00
Andrzej Kapolka
564bce7c10 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-15 17:09:32 -08:00
ZappoMan
79bc5e0507 Merge branch 'master' of https://github.com/highfidelity/hifi into InterfaceConfigEctomy 2014-12-15 16:48:07 -08:00
Andrzej Kapolka
892141fe14 Fix for crash on exit due to cache references' not being cleared. 2014-12-15 16:36:26 -08:00
Andrzej Kapolka
67a6134d9a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/src/MetavoxelSystem.cpp
 2014-12-15 15:30:27 -08:00
ZappoMan
b1d1cfee44 cmake cleanup 2014-12-15 15:29:05 -08:00
Andrzej Kapolka
50c1e9fb40 Fixes for missing audio device. 2014-12-15 22:41:35 -08:00
ZappoMan
bfcc78c57d replaced Application::resourcesPath() with PathUtils::resourcesPath() 2014-12-15 15:20:18 -08:00
Stephen Birarda
1b48cf7f5a use DependencyManager for AddressManager 2014-12-15 14:54:20 -08:00
Andrew Meadows
67c3a25475 Merge branch 'master' of ssh://github.com/highfidelity/hifi into inertia 
Conflicts:
	interface/src/Application.cpp
	libraries/entities/src/EntityItem.h
 2014-12-15 14:46:46 -08:00
Andrew Meadows
31486a81c1 updated TODO notes 2014-12-15 14:41:04 -08:00
Andrew Meadows
b3731e9530 hack for "reliable" packet send when objects stop moving 2014-12-15 14:36:27 -08:00
Andrew Meadows
0f488bca02 differentiation btw _lastEdited and _lastSimulated 2014-12-15 14:28:53 -08:00
ZappoMan
df7e115556 move ProgramObject to libraries 2014-12-15 14:21:22 -08:00
ZappoMan
49cacd85bd move GeometryCache to library 2014-12-15 14:00:41 -08:00
Andrzej Kapolka
a4c30be414 More spanner set bits. 2014-12-15 13:56:32 -08:00
ZappoMan
7b973453b4 move TextureCache to library 2014-12-15 13:14:16 -08:00
ZappoMan
0b95403949 cleanup the windows hackery a little 2014-12-15 12:25:20 -08:00
ZappoMan
95d820ee8b more windows hackery 2014-12-15 12:16:01 -08:00
ZappoMan
4e7368b643 more windows hackery 2014-12-15 12:09:30 -08:00
ZappoMan
28f2dc62ea add windowshacks.h to GPUConfig.h and move it to shared 2014-12-15 11:49:01 -08:00
Stephen Birarda
8549e9cb53 resolve conflicts on merge with upstream master 2014-12-15 09:36:17 -08:00
ZappoMan
3de3540ebe move back into interface for now 2014-12-15 08:37:33 -08:00
ZappoMan
4ac673fe63 more render util cleanup 2014-12-15 08:16:42 -08:00
ZappoMan
2df4c017f1 move GeometryCache out of application and remove dependency on Model 2014-12-15 08:15:55 -08:00
ZappoMan
e253b8afa4 move TextureCache out of interface and Application 2014-12-15 08:14:53 -08:00
Atlante45
e40961df12 Checking that T is in fact derived from Dependency 2014-12-14 21:34:27 -08:00
Andrzej Kapolka
51f82b4cd9 More stack bits. 2014-12-13 17:49:55 -08:00
Atlante45
28786721a6 Merge branch 'master' of https://github.com/highfidelity/hifi into dependancy_manager 2014-12-13 01:18:33 -08:00
Atlante45
9aea2843ac Remove pointer check 2014-12-12 21:20:26 -08:00
Atlante45
50fd52377f Couple improvements to the dependency manager 2014-12-12 21:10:45 -08:00
Atlante45
14cda00ebc First implementation of the DependencyManager 2014-12-12 20:52:41 -08:00
Andrzej Kapolka
dfcb22bd7a More progress towards stacks. 2014-12-12 15:12:03 -08:00
Andrew Meadows
fd8e3f6169 add moved entities to lists for sorting 
and also for outgoing packet updates
 2014-12-12 13:28:12 -08:00
Andrzej Kapolka
5e01695899 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-12 12:11:33 -08:00
Stephen Birarda
687072f19c fix for domain failed reconnect after disconnect 2014-12-12 09:47:15 -08:00
David Rowe
20b880ca09 Fix avatar hand state decoding for finger laser 2014-12-11 23:07:05 -08:00
David Rowe
fe8937e37e Make lasers able to emanate from index finger tips 2014-12-11 21:31:08 -08:00
Andrew Meadows
ad7641c7e0 repairs to build when Bullet not found 2014-12-11 16:05:45 -08:00
Andrzej Kapolka
828813dd07 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-11 14:57:36 -08:00
Brad Hefta-Gaub
31cbd6e88c Merge pull request #3954 from ctrlaltdavid/20226 
CR for Job #20226 - Change Overlays.getTextWidth into Overlays.getTextSize
 2014-12-11 14:33:24 -08:00
Andrew Meadows
c3f8f8ab98 init PhysicsEngine with an EntityEditPacketSender 2014-12-11 13:29:29 -08:00
Andrew Meadows
4977bfb708 ObjectMotionState puts self on outgoing queue 2014-12-11 12:40:43 -08:00
Andrew Meadows
572ceb75a4 clarification of what outgoing flags are about 2014-12-11 12:07:53 -08:00
Andrew Meadows
cc0e82b97f incoming changes is now QSet<ObjectMotionState*> 2014-12-11 10:56:22 -08:00
Andrew Meadows
11f1ad1d7f move worldOffset into ObjectMotionState 
add more methods for getting/clearing incoming/outgoing flags
 2014-12-11 10:52:34 -08:00
Stephen Birarda
f58d21d6f0 have ShutdownEventListener handle WM_CLOSE or SIGTERM 2014-12-11 10:21:11 -08:00
Andrew Meadows
d9f183458a _entityMotionStates is Qset of EntityMotionState* 2014-12-11 08:43:01 -08:00
Andrew Meadows
f9ba4d355c implement EntitySimulation API in PhysicsEngine 2014-12-10 17:01:20 -08:00
Andrew Meadows
ab75150175 moved position/velocity send history to base class 2014-12-10 17:00:23 -08:00
Andrew Meadows
4c74c041c2 remove unused cruft 2014-12-10 16:59:49 -08:00
Andrew Meadows
c4d076b0bb added comments about macro behavior 2014-12-10 16:59:17 -08:00
Andrzej Kapolka
d402f767c1 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-10 15:23:27 -08:00
Andrzej Kapolka
c57fd15bc9 Rather than loading the entire FBX file into a byte array, read it straight 
from the QNetworkReply.
 2014-12-10 15:22:48 -08:00
ZappoMan
f2ed1337b5 fix ray picking output distance to be meters 2014-12-10 11:04:32 -08:00
David Rowe
ff6db7a9fa Merge branch 'master' into 20226 2014-12-09 19:20:30 -08:00
Leonardo Murillo
8d88c537bf Merge pull request #3938 from ZappoMan/fixcrash 
potential fix to crash on windows startup
 2014-12-09 19:12:53 -08:00
David Rowe
136c3a2cce Replace 2D and 3D text overlay textWidth() method with textSize() 2014-12-09 18:32:53 -08:00
ZappoMan
628046f13c potential fix to crash on windows startup 2014-12-09 18:26:59 -08:00
Sam Gateau
cf081f0deb Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-09 18:13:07 -08:00
Andrzej Kapolka
65bd3a3d26 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-09 18:09:38 -08:00
AndrewMeadows
9aaaae6759 Merge pull request #3934 from ZappoMan/bugfixes 
fix a bug in MovingEntitiesOperator that would sometimes leave dangling entities
 2014-12-09 18:08:14 -08:00
AndrewMeadows
1697636db5 Merge pull request #3933 from ZappoMan/entityCollisions 
move emit of collisions to after done moving entities, so that callbacks can delete entities
 2014-12-09 17:46:41 -08:00
Sam Gateau
8617c319d4 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-09 17:30:26 -08:00
ZappoMan
426517b072 fix a bug in MovingEntitiesOperator that would sometimes leave dangling entities 2014-12-09 17:11:01 -08:00
Andrzej Kapolka
8ccb44b71e Bits of stack implementation. 2014-12-09 16:24:07 -08:00
Andrew Meadows
bc22e5723c bundle the flags that EntitySimulation cares about 2014-12-09 12:55:58 -08:00
Andrew Meadows
699e632e68 remove EntityItem::SimulationState after bad merge 2014-12-09 12:45:21 -08:00
ZappoMan
663b9c393e add debugging 2014-12-09 12:43:34 -08:00
Andrew Meadows
3fd2f12a73 merge upstream/master into andrew/inertia 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItem.h
	libraries/entities/src/EntitySimulation.h
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTreeElement.cpp
	libraries/entities/src/SimpleEntitySimulation.cpp
	libraries/entities/src/SimpleEntitySimulation.h
	libraries/entities/src/SphereEntityItem.cpp
 2014-12-09 12:41:53 -08:00
Andrzej Kapolka
8ab315b61e Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-09 12:41:35 -08:00
Andrzej Kapolka
fa8f4e3b06 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-09 12:16:09 -08:00
Andrzej Kapolka
5fb9905186 Rather than reducing rate on first drop, wait until three consecutive packets 
have been dropped.
 2014-12-09 12:14:21 -08:00
Atlante45
36eecf1d15 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus 2014-12-09 11:53:47 -08:00
Atlante45
eaaaa0687c spacing 2014-12-09 11:53:14 -08:00
Andrzej Kapolka
87c789ea76 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-08 18:49:49 -08:00
Andrzej Kapolka
343f610442 Use the 1450 limit everywhere, in case other places are running into the issue 
I experienced with metavoxels.
 2014-12-08 18:45:05 -08:00
ZappoMan
3c09ca71cb move emit of collisions to after done moving entities, so that callbacks can delete entities 2014-12-08 18:09:49 -08:00
Andrzej Kapolka
d0ca75dd2c Reduce the MTU size to deal with Windows networking issue. 2014-12-08 18:04:45 -08:00
Andrew Meadows
b0cc3a8509 add logic for when to update moving entity 2014-12-08 17:18:07 -08:00
Andrew Meadows
d4c72ab203 handle case where EntityItem's script has changed 2014-12-08 17:16:45 -08:00
Andrew Meadows
a519775cb3 unecessary EntitySimulation::entityChanged() calls 2014-12-08 17:15:58 -08:00
Brad Hefta-Gaub
651e550063 Merge pull request #3925 from AndrewMeadows/thermonuclear 
fix for non-animating models
 2014-12-08 16:58:16 -08:00
Andrew Meadows
675a2dd989 add DIRTY_UPDATEABLE flag for changes that need it 2014-12-08 16:32:25 -08:00
Andrew Meadows
27bfc9907f fix bug preventing butterflies from animating 
(forgot to make base method virtual)
 2014-12-08 16:31:36 -08:00
Andrzej Kapolka
98afd7c3c2 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-08 16:10:23 -08:00
Andrzej Kapolka
a94372efc7 Working on stack data implementation. 2014-12-08 16:10:07 -08:00