Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 19:54:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
29454 commits 75 branches 59 tags 1.2 GiB
Commit graph

11122 commits

Author SHA1 Message Date
Howard Stearns
e7516aab02 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-28 11:17:35 -07:00
Sam Gateau
22e70ee691 merged master 2015-07-28 10:13:05 -07:00
Brad Hefta-Gaub
43eec08514 Merge pull request #5376 from venkatn93/avatar 
New ambient occlusion effect in render pipeline
 2015-07-28 09:58:51 -07:00
Seth Alves
be39e5d6cf Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-07-27 19:13:48 -07:00
Seth Alves
f4a23065b4 if obj data isn't from a url, don't dereference null url pointer 2015-07-27 19:06:14 -07:00
Sam Gateau
baf7873ce1 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-07-27 17:40:19 -07:00
Sam Gateau
f525a8a245 Removing all the unecessary calls of Batch from the gl legacy time 2015-07-27 17:17:56 -07:00
Seth Alves
6e5aca6da4 merge from upstream 2015-07-27 16:52:36 -07:00
Seth Alves
5ae15d46b4 add some javascript callable stuff back to MyAvatar 2015-07-27 16:42:54 -07:00
Andrew Meadows
c7f367bfd7 removing unnecessary #include <Shape.h> 2015-07-27 15:30:37 -07:00
Howard Stearns
1bb734aec0 Kill warnings. 2015-07-27 15:26:03 -07:00
Sam Gateau
a5ad40bee9 INtroduce the resetStage command to clear up all cache and state in the gpu::Conference and make sure no more resource are linked 2015-07-27 14:07:28 -07:00
Howard Stearns
80763b3fc5 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-27 13:45:25 -07:00
Howard Stearns
146ddd2240 Cleanup false starts. 2015-07-27 13:42:18 -07:00
Howard Stearns
ef52c0703f Merge pull request #8 from AndrewMeadows/cadmium 
remove unused legacy Shapes from Model and friends
 2015-07-27 13:20:41 -07:00
Howard Stearns
990f0d6d07 Pass correct position/velocity/orientation to Rig simulation. 2015-07-27 12:57:39 -07:00
Niraj Venkat
d2ee74f7c7 Shader code indentation 2015-07-27 12:20:41 -07:00
Niraj Venkat
1193b89918 Coding standard and tab fixes 2015-07-27 12:14:29 -07:00
Niraj Venkat
92595583ec Coding standard and building 2015-07-27 11:55:17 -07:00
Brad Hefta-Gaub
9464fe8f90 Merge pull request #5433 from hyperlogic/ajt/particle-render-fix 
Improved ParticleEffectEntityItem rendering and updates
 2015-07-27 11:47:09 -07:00
Andrew Meadows
73ac941230 remove unused legacy Shapes from Model and friends 2015-07-27 11:15:33 -07:00
Seth Alves
a3c6a4b9bc merge from upstream 2015-07-27 09:29:18 -07:00
Anthony J. Thibault
604ef5dc71 Fixed float constant. 2015-07-27 09:28:56 -07:00
Anthony J. Thibault
5844b594dc Converted magic numbers to constants. 2015-07-27 09:27:16 -07:00
Howard Stearns
dac6667ee6 Start of state. 2015-07-27 09:21:24 -07:00
Howard Stearns
1ec0518d05 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-27 09:20:30 -07:00
Niraj Venkat
83e0856279 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 2015-07-27 09:20:19 -07:00
Seth Alves
9631268710 don't double-call updateOnCount when RenderablePolyVoxEntityItem::setAll is called 2015-07-26 21:03:11 -07:00
Seth Alves
ac53b6b22c Merge branch 'master' of github.com:highfidelity/hifi into rig 2015-07-26 20:00:56 -07:00
Anthony J. Thibault
5cc0b45850 Improved ParticleEffectEntityItem rendering and updates 
* Created custom pipelines and shaders for untextured and textured
  particle rendering.
* Created custom render payload for particles
* Moved all particle updates into simulation rather then render.
* Uses pendingChanges.updateItem lambda to update the playload with
  new data for rendering.
* ParticleEffectEntityItem now updates its dimensions properly,
  based on emitter properties.
* Bug fix for dt not accumulating properly, during gaps between updates.
  now we just update all the time.  (super cheap tho, if there are no particles
  animating)
 2015-07-26 17:21:17 -07:00
Brad Hefta-Gaub
89d1e82f89 Merge pull request #5431 from jherico/homer 
Limit the amount of time consumed by QML rendering
 2015-07-26 11:54:05 -07:00
Seth Alves
5abed29a43 merge from upstream 2015-07-25 21:15:57 -07:00
Marcel Verhagen
d25e09af74 removed the last 2 filename lines, they should not be there. 2015-07-26 00:48:31 +02:00
Brad Davis
843a333727 Merge pull request #5424 from samcake/yellow 
Cleaning up the FBO cache and the output stage in general
 2015-07-25 11:49:22 -04:00
Bradley Austin Davis
7be33dcb58 Limit the amount of time consumed by rendering QML 2015-07-25 11:40:58 -04:00
Howard Stearns
8b5f24e4df Keep list of animations in Rig, not MyAvatar. 2015-07-24 22:02:39 -07:00
Howard Stearns
05dda1220e Add logging. 2015-07-24 22:01:55 -07:00
Niraj Venkat
6bc3d65bf4 Fixing build errors 2015-07-24 16:16:18 -07:00
Philip Rosedale
e24395a226 Merge pull request #5383 from ctrlaltdavid/20630 
Improve looking-at-me indication
 2015-07-24 16:15:13 -07:00
Niraj Venkat
5dd16d9f80 Blend function applied to reduce one FBO 2015-07-24 16:07:30 -07:00
Sam Gateau
776d4747b2 Cleaning up the FBO cache and the output stage in general 2015-07-24 14:47:44 -07:00
Howard Stearns
1663d095a1 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-24 14:08:51 -07:00
Howard Stearns
4e298d815d Add the joint mapping necessary for playing animations in the rig. 2015-07-24 14:07:32 -07:00
Niraj Venkat
fc612ab8cd Merge conflict fix 2015-07-24 11:29:52 -07:00
Niraj Venkat
e036602726 Fixing merge conflicts 2015-07-24 11:08:40 -07:00
Seth Alves
5f2e8f5b71 Merge pull request #5419 from birarda/master 
only output the no listener for type message once
 2015-07-24 10:41:11 -07:00
Howard Stearns
f9f8b0ffc1 Merge branch 'rig' of https://github.com/howard-stearns/hifi into rig 2015-07-24 10:40:19 -07:00
Brad Davis
6eec04c798 Merge pull request #5407 from samcake/yellow 
Removing the glNaked code for capturing the billboard snaphot and rendering the rearViewMirror in a separate render target
 2015-07-24 13:09:07 -04:00
Andrew Meadows
1bf49d72f1 Merge branch 'rig' of github.com:howard-stearns/hifi into bromine 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
 2015-07-24 10:06:02 -07:00
Stephen Birarda
71557a1846 only output no listener for type message one time 2015-07-24 09:36:27 -07:00
samcake
e6f2504514 FIx the problem of clear when the color mask is not WRITE_ALL 2015-07-24 09:26:32 -07:00
samcake
52ac5b3ef6 On mac cannot get ther erendering to properly display the overlay if the rear view mirror is active on resize 2015-07-24 03:38:21 -07:00
Sam Gateau
cb375e8ece FIund a nasty bug with the scissor which was the reason for many issues, tried to integrate the framebuffer setup and clear as part of the enginepipeline so calling display side is simpler 2015-07-24 02:15:50 -07:00
Sam Gateau
66cd17ec66 REmove the crappy solution for drawing transparent texture into overlay by a proper shader 2015-07-23 23:09:40 -07:00
Niraj Venkat
216c499d14 HAO (Horrendous Ambient Occlusion) 2015-07-23 18:53:43 -07:00
Stephen Birarda
974108734a add a comment for size guard 2015-07-23 17:17:59 -07:00
Stephen Birarda
f919d2985b don't attempt to send the avatar billboard if too large 2015-07-23 17:17:15 -07:00
Sam Gateau
ded95a3dde removing dead code 2015-07-23 16:58:21 -07:00
Sam Gateau
a424ff98ca Fixing issues with the review process 2015-07-23 16:55:18 -07:00
Sam Gateau
a002560003 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-23 16:32:00 -07:00
Sam Gateau
d56b5f39fb strenghening the checks in GLBackend::downloadFramebuffer before actually calling the true glReadPixels 2015-07-23 16:31:11 -07:00
Sam Gateau
be9d99264f Introducing the download Framebuffer call on the context to capture a snapshot 2015-07-23 16:15:10 -07:00
Howard Stearns
05fae0e977 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-23 16:12:42 -07:00
Brad Davis
2ac6304752 Merge pull request #5404 from ZappoMan/renderBug 
Fix rendering of primitive objects on Windows
 2015-07-23 19:10:54 -04:00
Howard Stearns
25e9893d0e Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-23 16:06:04 -07:00
ZappoMan
8007fba909 add type to shader include 2015-07-23 15:37:56 -07:00
Ryan Huffman
396bb613f8 Avoid creating a new variable in js print 2015-07-23 15:32:40 -07:00
Ryan Huffman
5f33ac5459 Update script print() to be variadic 2015-07-23 15:30:54 -07:00
Andrew Meadows
f40feba36d Merge remote-tracking branch 'andrew/boron' into bromine 
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/avatar/Hand.h
	interface/src/avatar/SkeletonModel.cpp
 2015-07-23 15:29:53 -07:00
Seth Alves
d5400e2b9d Merge branch 'rig' of github.com:howard-stearns/hifi into rig 2015-07-23 15:14:23 -07:00
Seth Alves
1e19e46aa6 Merge branch 'master' of github.com:highfidelity/hifi into rig 2015-07-23 15:14:19 -07:00
Seth Alves
33c97a1833 get rid of _firstPersonSkeletonModel in MyAvatar. add flag in Rig for joints being dirty so Model knows when to recompute meshes 2015-07-23 15:14:10 -07:00
Sam Gateau
dc10f30d3d Merged 2015-07-23 15:10:42 -07:00
Howard Stearns
81e0a1e629 Better name for signal. 2015-07-23 15:09:06 -07:00
Howard Stearns
9593668110 Bring animation file headers up to date. 2015-07-23 15:08:22 -07:00
ZappoMan
e6262de864 CR feedback 2015-07-23 14:56:52 -07:00
Sam Gateau
a561874ce3 Render the rear view mirror in a separate target and then display it during overlay pass 2015-07-23 14:56:14 -07:00
ZappoMan
1177ffd439 more hacking 2015-07-23 14:12:52 -07:00
ZappoMan
96e83e3ed4 remove gl_FrontMaterial 2015-07-23 14:11:28 -07:00
ZappoMan
9496b6c024 more hacking 2015-07-23 13:56:59 -07:00
ZappoMan
5774af0856 more hacking 2015-07-23 13:38:08 -07:00
ZappoMan
a0666d5e99 testing windows render bug 2015-07-23 13:17:12 -07:00
Seth Alves
4566d16402 move Model's AnimationHandles to Rig. Move a bunch of Model methods from public to protected 2015-07-23 13:03:38 -07:00
ZappoMan
91d317f964 testing windows render bug 2015-07-23 12:42:55 -07:00
samcake
fecb0e3675 Merge pull request #5398 from ZappoMan/removeTextureRescale 
remove rescaling of textures
 2015-07-23 11:22:38 -07:00
samcake
805e7326e0 Merge pull request #5396 from ZappoMan/deadCodeRemoval 
remove non-batch versions of GeometryCache renderXYZ() methods
 2015-07-23 11:11:35 -07:00
Niraj Venkat
9ccf316513 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 2015-07-23 10:36:46 -07:00
Seth Alves
5a1c1446cd Merge branch 'rig' of github.com:howard-stearns/hifi into rig 2015-07-23 09:46:48 -07:00
Seth Alves
57eb798d63 Merge branch 'master' of github.com:highfidelity/hifi into rig 2015-07-23 09:46:41 -07:00
David Rowe
68254c1ff0 Merge branch 'master' into 20630 2015-07-23 09:46:20 -07:00
Bradley Austin Davis
f19800f0de Don't overwrite the normals buffer when copying the resolved lighting back to the primary FBO 2015-07-23 12:37:58 -04:00
ZappoMan
06b6c49b9a remove rescaling of textures 2015-07-23 08:56:59 -07:00
ZappoMan
bd6534a991 remove deprecated renderBatch() 2015-07-23 08:35:03 -07:00
Andrew Meadows
6657026a12 remove cruft: legacy shapes for skeleton bones 2015-07-23 08:34:44 -07:00
ZappoMan
c2113ea96b remove non-batch versions of GeometryCache renderXYZ() methods 2015-07-23 07:42:58 -07:00
Howard Stearns
a1a10ad08e Merge branch 'rig' of https://github.com/sethalves/hifi into sethalves-rig 2015-07-22 21:08:57 -07:00
Howard Stearns
5a0c1a9402 Checkpoint testing stuff. 2015-07-22 21:03:48 -07:00
Seth Alves
ee334ff826 JointStates are owned by Rig objects. Model, FaceModel, SkeletonModel call into their Rig pointer to access JointStates. 2015-07-22 18:43:10 -07:00
Andrew Meadows
bf3ff8daea fix crash for convex hull of co-planar points 2015-07-22 15:06:10 -07:00
Seth Alves
47965bc39c merge from upstream 2015-07-22 13:48:19 -07:00
Seth Alves
7c8d52cbd1 back out some changes to Model.cpp, change how rig pointer is delivered to model initilizer 2015-07-22 13:41:31 -07:00
Marcel Verhagen
8f0893ba21 Added fileOnUrl to check if a texture exist at the location. It return the correct filename of where the texture lives. 
Added the url of the fix file to extractFBXGeometry and readFBX and updated the calls to readFBX to include the url of the fix file.

So it now does not break existing content.

Found a second place in the FBXReader.cpp where the RelativeFileName stripped out the dir location.
 2015-07-22 22:34:45 +02:00
Howard Stearns
a6395a2351 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-22 12:29:27 -07:00
Howard Stearns
a161f527c4 Comments documenting direction and questions. 2015-07-22 11:41:24 -07:00
Howard Stearns
dbb4a8b767 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-22 11:40:25 -07:00
Sam Gateau
f70553ec95 Fixing merge 2015-07-22 11:31:46 -07:00
Sam Gateau
837ff45763 Removing code aroung the selfie fremebuffer 2015-07-22 10:57:08 -07:00
Sam Gateau
8dbd991652 USing a modern singleton guard 2015-07-22 10:54:40 -07:00
Sam Gateau
7ac2030862 Preparing for first pr 2015-07-22 10:43:50 -07:00
Niraj Venkat
adf7a1098d Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 2015-07-22 10:27:39 -07:00
Bradley Austin Davis
2f13488f11 Fixing FBO bug on resizing windows 2015-07-22 11:28:36 -04:00
Bradley Austin Davis
65732d874c Merge branch 'maggie' into marge 2015-07-22 09:07:50 -04:00
Bradley Austin Davis
9596452c32 Trying to fix oculus rendering 2015-07-22 08:07:44 -04:00
David Rowe
55683e0cd5 Size looking-at-me eye spheres per avatar model dimensions 2015-07-21 18:24:47 -07:00
Bradley Austin Davis
bd5da87551 Merge remote-tracking branch 'upstream/master' into marge 2015-07-21 19:23:38 -04:00
Bradley Austin Davis
d6994c6dfd Restoring star size and color variation 2015-07-21 19:22:10 -04:00
bwent
5a8106a049 fixes in edit.js UI 2015-07-21 13:15:24 -07:00
Niraj Venkat
e0634de403 Turn on/off debug AO from menu item 2015-07-21 12:14:09 -07:00
bwent
2b745395ec use radius for z-component 2015-07-21 11:38:10 -07:00
Sam Gateau
7b35048e52 Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-21 11:18:15 -07:00
Sam Gateau
93afdf79a3 Removing the gl driver version report intiialization code out of applciation 2015-07-21 11:17:41 -07:00
bwent
d688e5f915 fix case where v not normalizable 2015-07-21 11:08:53 -07:00
bwent
30d4b9f635 switch to radians, overload fromPolar, use atan2 2015-07-21 11:08:53 -07:00
bwent
89eed589e2 Add Vec3 function to convert vec3 to/from euler angles 2015-07-21 11:08:53 -07:00
Seth Alves
fecdc08720 merge from upstream 2015-07-21 09:53:51 -07:00
Seth Alves
cdc26526b4 merge from upstream 2015-07-21 09:51:16 -07:00
Bradley Austin Davis
fda1cb6f7b Merge remote-tracking branch 'upstream/master' into marge 2015-07-21 08:59:29 -07:00
Brad Davis
9016f437a8 Merge pull request #5371 from Atlante45/smart_pointers 
Smart pointers fixes
 2015-07-21 08:52:29 -07:00
Brad Davis
6d4c7cd4f2 Merge pull request #5374 from ZappoMan/warningFixes 
Warning fixes and removing dead code
 2015-07-21 07:23:40 -07:00
Seth Alves
abfe60aa20 whenever Model class uses _jointState, use the Rig version if there is a Rig. 2015-07-20 18:31:42 -07:00
Brad Davis
51973674f5 Merge remote-tracking branch 'upstream/master' into marge 2015-07-20 17:26:36 -07:00
Brad Davis
c3a2b72c13 Breaking framebuffer ops out of texture cache 2015-07-20 17:26:26 -07:00
Niraj Venkat
075c9f05de Introducing blend stage in the AO pipeline 2015-07-20 16:34:02 -07:00
Sam Gateau
b5090883a0 merge with latest network pr 2015-07-20 15:49:10 -07:00
Sam Gateau
59666f664a merging my changes to remove cruff from application to AUstin;s latest 2015-07-20 15:37:17 -07:00
Niraj Venkat
f40a6445f5 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 2015-07-20 15:34:30 -07:00
Stephen Birarda
74193b3dac bump packet versions after fix 2015-07-20 15:20:14 -07:00
Stephen Birarda
0dc62dd858 Merge branch 'protocol' of https://github.com/Atlante45/hifi into protocol 2015-07-20 15:14:40 -07:00
Atlante45
bca8d8181d fix entity data packet type value 2015-07-20 15:14:16 -07:00
Stephen Birarda
5f592df610 don't seek in Packet before open 2015-07-20 15:14:07 -07:00
ZappoMan
648d0f6d43 fix a bunch of warnings 2015-07-20 15:12:27 -07:00
Niraj Venkat
eaf75c01b9 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 
Conflicts:
	libraries/render-utils/src/AmbientOcclusionEffect.cpp
	libraries/render-utils/src/AmbientOcclusionEffect.h
 2015-07-20 14:55:27 -07:00
Niraj Venkat
85c9ee0feb Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 
Conflicts:
	libraries/render-utils/src/AmbientOcclusionEffect.cpp
 2015-07-20 14:53:19 -07:00
Atlante45
8d6ff2d9f9 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 14:50:44 -07:00
Brad Davis
c0859ffd4c Removing some dead forward declarations 2015-07-20 14:33:10 -07:00
ZappoMan
d41d86c33c Merge branch 'master' of https://github.com/highfidelity/hifi 2015-07-20 14:31:58 -07:00
Andrew Meadows
7578a70c4c Merge pull request #5359 from birarda/protocol 
Network Protocol Refactor
 2015-07-20 14:30:58 -07:00
Atlante45
59acfc9f47 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 13:51:51 -07:00
Brad Davis
488a449cb1 Merge branch 'master' into homer 2015-07-20 13:34:21 -07:00
Stephen Birarda
0177513285 resolve conflicts on merge with upstream/master 2015-07-20 12:29:38 -07:00
Sam Gateau
1a9f6e12a5 something not compiling but just before merge with upstream 2015-07-20 12:20:04 -07:00
Brad Hefta-Gaub
c41e20b90f Merge pull request #5366 from jherico/marge 
Naked GL removal work
 2015-07-20 12:12:22 -07:00
Brad Davis
3d09e772f9 Merge branch 'marge' into homer 2015-07-20 12:09:51 -07:00
ericrius1
dcb2012070 can toggle hit effect on and off from a script 2015-07-20 12:02:01 -07:00
ericrius1
e75a6feafe can toggle hit effect on and off from a script 2015-07-20 11:58:26 -07:00
Brad Davis
23b058e4eb Removing starfield tilt and reducing grid alpha 2015-07-20 11:40:12 -07:00
ericrius1
3439d45e0e adding hit effect logic 2015-07-20 11:02:15 -07:00
Brad Davis
dcaaeec593 Removing AO effect (temporarily) and wireframe mode 2015-07-20 10:55:11 -07:00
Seth Alves
7c5286e804 Merge pull request #5356 from howard-stearns/isPlaying 
Make sure that Audio isPlaying is correct
 2015-07-20 10:51:58 -07:00
Atlante45
fc2956342e Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 10:39:16 -07:00
Brad Davis
cd677ccb18 Removing animation from star grid 2015-07-20 10:18:14 -07:00
Seth Alves
c10a5147fe Merge branch 'rig' of github.com:howard-stearns/hifi into rig 2015-07-20 09:47:29 -07:00
Seth Alves
9af104f745 Merge branch 'master' of github.com:highfidelity/hifi into rig 2015-07-20 09:47:23 -07:00
Brad Davis
d4e637c5b8 Removing superfluous lighting and naked GL in mirror 2015-07-20 09:36:05 -07:00
Stephen Birarda
6b11495a20 resolve conflicts on merge with upstream master 2015-07-20 08:51:48 -07:00
Brad Davis
5159452335 Fixing invalid vector usage and strange picking crash 2015-07-19 23:03:46 -07:00
Brad Davis
4c3cfe1e82 Starfield jazz hands 2015-07-19 20:53:50 -07:00
Brad Davis
35f7307f30 More header cleanup 2015-07-18 22:15:50 -07:00
Brad Davis
c446bb307d Adding convenience return *this to many transform methods 2015-07-18 16:56:32 -07:00
Bradley Austin Davis
5e0a0409bf Removing setupWorldLight from viewstateinterface 2015-07-18 12:16:51 -07:00
Brad Davis
b7fdfd8663 Working on lighting 2015-07-18 10:55:53 -07:00
Brad Davis
d68618e206 Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
Atlante45
640171d5bd Restore AccountManager setup 2015-07-17 18:22:35 -07:00
Atlante45
1c965736e8 Remove merge error 2015-07-17 18:15:11 -07:00
Atlante45
052c3c987b Fix some more smart pointer 2015-07-17 18:10:34 -07:00
Atlante45
256c786e28 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-17 17:59:19 -07:00
ZappoMan
816fd41624 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-07-17 17:10:52 -07:00
Brad Hefta-Gaub
2423d25839 Merge pull request #5355 from ctrlaltdavid/20620 
QA for #20620 - Make renderGrid handle changing position and dimensions
 2015-07-17 17:10:43 -07:00
ZappoMan
9c52f28ff4 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-07-17 17:05:13 -07:00
Brad Davis
c822e66317 Merge pull request #5346 from samcake/daft 
Adding the scissor rect in the Batch and a way to enable the scissor during clear command
 2015-07-17 17:04:42 -07:00
Stephen Birarda
4661bd0075 resolve conflicts on merge with clement/protocol 2015-07-17 16:58:57 -07:00
Atlante45
c6e471256d Fix atomic construction 2015-07-17 16:55:45 -07:00
Howard Stearns
ed815a0573 Reflect dependencies in unit test setup. 2015-07-17 16:53:41 -07:00
Stephen Birarda
f8c832e50b resolve conflicts on merge with upstream master 2015-07-17 16:48:46 -07:00
ZappoMan
26e8090ec1 Merge branch 'master' of https://github.com/highfidelity/hifi into removeNakeGL 2015-07-17 16:48:42 -07:00
Brad Hefta-Gaub
3ea348b73b Merge pull request #5349 from jherico/marge 
Working on text rendering overlays
 2015-07-17 16:47:48 -07:00
Niraj Venkat
0580c8477e 3-step groundwork for AO in the pipeline 2015-07-17 16:42:03 -07:00
Stephen Birarda
9794770815 put back correct include for memcpy 2015-07-17 16:38:20 -07:00
Stephen Birarda
6419e49f4b call QIODevice constructor from Packet copy 2015-07-17 16:35:26 -07:00
Howard Stearns
2d42746f3b Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-17 16:28:23 -07:00
Stephen Birarda
c846efb203 fix type in Packet constructor 2015-07-17 16:24:25 -07:00
Stephen Birarda
1a1c2d6bbe prepend module to QIODevice include 2015-07-17 16:20:53 -07:00
Stephen Birarda
30ee80313e add memory include for PacketList 2015-07-17 16:18:58 -07:00
Stephen Birarda
487f9dc45d add atomic include for NetworkPeer 2015-07-17 16:17:10 -07:00
Stephen Birarda
1fd4a1f0c3 resolve conflicts on merge with upstream master 2015-07-17 16:07:45 -07:00
Stephen Birarda
331bb54144 remove unused variable 2015-07-17 15:59:39 -07:00
Stephen Birarda
39272652e5 fix seeks in InboundAudioStream 2015-07-17 15:59:24 -07:00
Atlante45
151481d5bf Remove seek 2015-07-17 15:58:58 -07:00
Stephen Birarda
35c8a60f3b seek to correct place for bulk avatar data 2015-07-17 15:57:52 -07:00
Stephen Birarda
b71678dfdb repair constructor that takes QByteArray in PacketList 2015-07-17 15:47:37 -07:00
Sam Gateau
9eff19b0f7 add th emissing function 2015-07-17 15:47:17 -07:00
Stephen Birarda
9c9c3d5120 remove extra debug in PacketList 2015-07-17 15:44:17 -07:00
Stephen Birarda
0f534b9f7b fixes for new read and NLPacketList 2015-07-17 15:43:20 -07:00
Stephen Birarda
59e14dfd65 Merge branch 'protocol' of https://github.com/huffman/hifi into atp 2015-07-17 15:32:09 -07:00
ZappoMan
ccd2f98a76 one more try 2015-07-17 15:28:25 -07:00
Stephen Birarda
9a4cc1308d fix packet list segment break 2015-07-17 15:27:57 -07:00
Ryan Huffman
1e7691941c Add raw data read to Packet 2015-07-17 15:27:29 -07:00
Andrew Meadows
32b1fe0918 proper fix for incorrect render of scaled entities 2015-07-17 15:21:02 -07:00
Seth Alves
d287817829 give SkeletonModel created by MyAvatar a Rig pointer 2015-07-17 14:52:37 -07:00
Stephen Birarda
fe0cdc0529 put AvatarHashMap slots back to private 2015-07-17 14:35:38 -07:00
Stephen Birarda
8a2bb55231 add back a removed comment from jurisdiction map 2015-07-17 14:00:02 -07:00
Stephen Birarda
08bd2adb51 remove dead listeners from set of directly connected objects 2015-07-17 13:58:14 -07:00
Seth Alves
bcd6b30ec3 move AnimationHandle from render-utils to animation. give Rig some jointstates and animation lists 2015-07-17 13:31:48 -07:00
Andrew Meadows
1c7afbda04 workaround for bad sphere radius 2015-07-17 12:14:53 -07:00
Andrew Meadows
f09b3eb736 set creation time when loading unknown timestamp 2015-07-17 12:14:07 -07:00
Howard Stearns
2d277a2abd Fix https://app.asana.com/0/30233891560551/41734486809354/f 2015-07-17 11:28:25 -07:00
Stephen Birarda
7a13c867ae quit the ScriptEngine thread once the script is done 2015-07-17 11:18:14 -07:00
Stephen Birarda
eaeaa23f03 resolve conflicts on merge with origin/protocol 2015-07-17 11:10:30 -07:00
Stephen Birarda
33f42bec78 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-17 11:07:17 -07:00
Stephen Birarda
eb80922325 Merge branch 'protocol' of https://github.com/huffman/hifi into atp 2015-07-17 11:07:10 -07:00
Stephen Birarda
357963b6e0 fix reference to packet that is now buffer 2015-07-17 11:06:39 -07:00
Atlante45
6da9825bac Include stdlib string instead of cstring 2015-07-17 11:06:23 -07:00
Stephen Birarda
e5722098f6 resolve conflicts on merge with upstream/master 2015-07-17 11:06:01 -07:00
Ryan Huffman
9725184b24 Move dataSent signal from PacketReceiver to LimitedNodeList 2015-07-17 11:05:07 -07:00
Atlante45
fbaf25f3f9 Remove unused header 2015-07-17 11:04:54 -07:00
Atlante45
cf453952f4 Rename should nack 2015-07-17 10:52:27 -07:00
Stephen Birarda
0811553c41 add a direct registration for EntityEditPacketSender 2015-07-17 10:49:24 -07:00
Stephen Birarda
2d5428276a shouldNack default to true 2015-07-17 09:56:27 -07:00
Stephen Birarda
9466d5eca5 add the stop node packet to list of non sourced 2015-07-17 09:29:59 -07:00
ZappoMan
efa2001325 Merge branch 'master' of https://github.com/highfidelity/hifi into removeNakeGL 2015-07-17 09:25:37 -07:00
Stephen Birarda
7d2495e289 set the generic thread priority once it's actually started 2015-07-17 09:24:00 -07:00
Stephen Birarda
97312f9898 remove dead listener from map right before invoke 2015-07-17 09:21:10 -07:00
Stephen Birarda
7d60b86f52 kill the PacketLister (AKA Huffman 1 : PacketListener 0) 2015-07-17 09:07:39 -07:00
David Rowe
c46533d9a6 Make renderGrid handle changing position and dimensions 
So that audio scope grid moves when Interface window is resized.
 2015-07-16 21:05:14 -07:00
Andrew Meadows
2441be21e2 restore order of setting properties 2015-07-16 20:58:34 -07:00
Stephen Birarda
040c7557da fix double register for Agent avatar packets 2015-07-16 17:51:06 -07:00
Andrew Meadows
18d0cb5158 cleanup of EntityItem ctors and friends 2015-07-16 17:48:28 -07:00
Stephen Birarda
ce6585ccc8 fix AC monitor and AM double register 2015-07-16 17:44:43 -07:00
Stephen Birarda
e8de73427b fix suppression of hash mismatch messages 2015-07-16 17:25:55 -07:00
Stephen Birarda
b257daaef1 fix supression of repeated messages for version mismatch 2015-07-16 17:23:00 -07:00
Stephen Birarda
2a2eb39066 repairs for DS path query and response 2015-07-16 17:08:06 -07:00
Brad Davis
ae10d58142 Fixing font class 2015-07-16 16:42:29 -07:00
ZappoMan
398075e45a hacking on more naked GL 2015-07-16 16:26:28 -07:00
Stephen Birarda
14e92ceeea remove environment data from packet headers 2015-07-16 16:25:13 -07:00
Stephen Birarda
6d7b659dff remove the environment data process from header 2015-07-16 16:24:26 -07:00
Stephen Birarda
eb0ed438ec remove environment data packet 2015-07-16 16:23:57 -07:00
Stephen Birarda
b1be617481 add back MAX_PACKET_HEADER_BYTES 2015-07-16 16:12:01 -07:00
Stephen Birarda
1a85e95f71 remove implementation of packetTypeForPacket 2015-07-16 16:09:48 -07:00
Stephen Birarda
271575c832 remove unused octree method 2015-07-16 16:08:21 -07:00
Stephen Birarda
846506901a more removals from PacketHeaders 2015-07-16 16:06:56 -07:00