Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 20:34:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
28021 commits 25 branches 0 tags 1.1 GiB
Commit graph

10400 commits

Author SHA1 Message Date
Atlante45
fd1648c0d7 Code cleanup 2015-07-14 15:30:41 -07:00
Atlante45
c05105e2f9 Added takeFront method to PacketList 2015-07-14 15:29:49 -07:00
Atlante45
bbb00b9d3a Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-07-14 14:11:41 -07:00
Stephen Birarda
821c16cbc4 resolve conflicts on merge with uptream/master 2015-07-14 09:52:20 -07:00
Brad Davis
684d466b44 Merge pull request #5308 from venkatn93/avatar 
Avatars rendered correctly based on Scene.shouldRenderAvatars
 2015-07-14 09:06:49 -07:00
Niraj Venkat
ef3c6b25e0 More coding standard changes 2015-07-14 00:45:38 -07:00
samcake
99ae0326ad FIxing th ecompilation issue on mac, ready to ship 2015-07-13 19:17:09 -07:00
Sam Gateau
5555ccd225 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-07-13 16:19:09 -07:00
Sam Gateau
4743bbad80 Adding shaders to the lib for rendering simple textured quad and solve the ImageOverlay issue for edit.js 2015-07-13 16:18:39 -07:00
Clément Brisset
24eb4c8263 Merge pull request #5309 from sethalves/quiet-compiler 
quiet compiler
 2015-07-13 15:55:35 -07:00
Atlante45
eb56999077 Make PacketList class NLPacketList inherits from 2015-07-13 15:30:41 -07:00
Atlante45
44c5d4a2bf Couple fixes SharedNodePointer > Node& 2015-07-13 15:29:41 -07:00
Atlante45
c80df94b06 Update includes for moved files 2015-07-13 15:28:55 -07:00
ZappoMan
5676246d75 fix the lingering model parts sometimes left behind when switching domains 2015-07-13 15:26:52 -07:00
Atlante45
4a22f18add Setup udt namespace/move relevant files 2015-07-13 15:25:25 -07:00
Atlante45
7a160db8dd sendPacketList first implementation 2015-07-13 12:58:26 -07:00
Atlante45
77bff0c4f2 First draft at sendPacket type method impl 2015-07-13 11:57:56 -07:00
Atlante45
957e6394a9 sendPacket function take Node& not a pointer 2015-07-13 11:57:20 -07:00
Seth Alves
5aca0c28ef quiet compiler 2015-07-13 07:37:59 -07:00
Seth Alves
848e5bcebf this code can be called for hold actions if they end up in an svo save. revert a line from a previous commit 2015-07-12 13:43:21 -07:00
Seth Alves
fb23eb0faf Merge pull request #5301 from samcake/yellow 
Rename gpu::Batch::setUniformTexture into gpu::Batch::setResourceTexture
 2015-07-12 11:36:03 -07:00
Seth Alves
87152a4de2 Merge pull request #5302 from AndrewMeadows/astatine 
cleanup of ObjectActionSpring and AvatarActionHold
 2015-07-12 11:17:09 -07:00
Seth Alves
c17c9f1818 quiet compiler 2015-07-12 10:29:43 -07:00
Andrew Meadows
9ce9c541de fix activation of object when action changes 2015-07-10 18:45:40 -07:00
Brad Davis
c1b72db18d Still trying to get jenkins builds to work 2015-07-10 16:00:51 -07:00
Brad Davis
2ce8dba819 Removing heap allocation from property flag parsing, adding some manual tests 2015-07-10 15:08:10 -07:00
Brad Davis
200cbd7e8d Merge pull request #5303 from ZappoMan/animationGlitch 
fix motor proteins in cell science
 2015-07-10 12:59:50 -07:00
ZappoMan
1dd40af162 fix AnimationLoop::setRunning() to not constantly reset the frame when the running state doesn't actually change 2015-07-10 12:43:35 -07:00
Andrew Meadows
294c1ba367 always serialize ACTION_TYPE_SPRING 2015-07-10 12:25:11 -07:00
Andrew Meadows
56f00a526d cleanup of ObjectActionSpring 2015-07-10 12:25:11 -07:00
Andrew Meadows
90ae1fea8b handle case where action params are missing 2015-07-10 12:25:11 -07:00
Andrew Meadows
71440dfbc5 add checks for NaN 2015-07-10 12:25:11 -07:00
Sam Gateau
6c04e6d382 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-07-10 11:59:31 -07:00
samcake
014802fd45 Merge pull request #5277 from venkatn93/gpuquery 
GPU Query infrastructure
 2015-07-10 11:59:08 -07:00
Niraj Venkat
2e5fd04d9e Fix to get build working on Linux 2015-07-10 11:27:34 -07:00
Sam Gateau
2c05349b06 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-10 11:10:07 -07:00
Sam Gateau
7fc9fd97ff Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers. 2015-07-10 11:03:12 -07:00
Brad Hefta-Gaub
89231adc19 Merge pull request #5299 from jherico/homer 
Performance optimizations in transform buffers and geometry cache
 2015-07-09 19:16:15 -07:00
Brad Hefta-Gaub
74ef91550c Merge pull request #5296 from venkatn93/master 
Entities are now added/removed from rendering based on Scene.shouldRenderEntities
 2015-07-09 18:54:06 -07:00
Brad Davis
6c5d7b8789 Performance optimizations in transform buffers and geometry cache 2015-07-09 17:53:26 -07:00
Brad Davis
cf7f3336d0 Merge pull request #5297 from samcake/daft 
Remove unecessary dependencies in DeferredLightingEffect
 2015-07-09 17:51:26 -07:00
Andrew Meadows
270ea7af9e Merge pull request #5292 from sethalves/palm-rotation 
action changes to allow "hold" action to track palm rotation
 2015-07-09 17:44:28 -07:00
Sam Gateau
11f2d74030 Simple cleaning to remove dependancies on the viewStateInterface in the deferredLightingEffect 2015-07-09 17:33:25 -07:00
Niraj Venkat
706f85e4ce Fixes to comply with coding standard 2015-07-09 17:31:38 -07:00
Seth Alves
bf6fce4e45 remove unneeded const 2015-07-09 17:05:15 -07:00
Niraj Venkat
bd91daf712 Removing debug code 2015-07-09 16:27:23 -07:00
Niraj Venkat
1dce5f80cc Entities are now added/removed from rendering based on Scene.shouldRenderEntities 2015-07-09 16:17:58 -07:00
Philip Rosedale
cac239ad88 Merge pull request #5291 from ZappoMan/waitToSendAllEdits 
Allow Assignment Client scripts to do edits in their shutdown handler
 2015-07-09 15:42:31 -07:00
Brad Hefta-Gaub
f0a1bc15a9 Merge pull request #5286 from samcake/daft 
Migrating the rendering openGL calls from DeferredLightingEffect to gpu::Batch
 2015-07-09 15:23:45 -07:00
Seth Alves
2dc4922da3 bring over code from entity-level-locking branch 2015-07-09 15:23:05 -07:00