Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-18 01:16:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
29158 commits 24 branches 28 tags 1.2 GiB
Commit graph

29158 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
761f638ce3 Merge pull request #5466 from sethalves/vhacd-improvements 
vhacd tool -- make the height of the tetrahedrons in 'fatten' mode less tall.
 2015-08-03 11:18:37 -07:00
Andrew Meadows
acfc907704 Merge pull request #5438 from howard-stearns/rig 
Rig: Bottleneck animation management through a Rig class
 2015-08-03 11:14:21 -07:00
Stephen Birarda
7916ca91d5 Merge pull request #5479 from howard-stearns/fix-multiple-local-sounds 
All multiple local sounds
 2015-08-03 10:23:48 -07:00
Howard Stearns
8f616c04fb Fix https://app.asana.com/0/32622044445063/43589567731045 2015-08-02 21:46:39 -07:00
Brad Davis
95620b6385 Merge pull request #5475 from ZappoMan/removeQuads 
remove GL_QUADS from code base
 2015-08-01 19:57:22 -07:00
ZappoMan
493836e363 remove QUADS from GLBackendShared and Format 2015-08-01 17:26:38 -07:00
ZappoMan
771ce6dca3 remove QUAD_STRIP from Circle3DOverlay 2015-08-01 17:20:48 -07:00
ZappoMan
b02f751830 diff redux 2015-08-01 16:53:35 -07:00
ZappoMan
b138c16c7f use Austins QUAD to TRIANGLE_STRIP approach 2015-08-01 16:50:36 -07:00
ZappoMan
05a4a6aa9b implement on-the-fly conversion of FBXMeshParts that are quads, into their triangle equivalents 2015-08-01 13:07:56 -07:00
ZappoMan
452225ddaf removed QUADS from Font::drawString() 2015-08-01 11:51:07 -07:00
ZappoMan
1dd6c1117d change GeometryCache::renderQuad() to use TRIANGLES as lower level render primitive 2015-08-01 11:29:28 -07:00
Howard Stearns
2713115336 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-31 18:05:47 -07:00
Howard Stearns
0dad1adf7d Speculative guard against crashing. 2015-07-31 18:05:14 -07:00
Philip Rosedale
04bea4dc98 Merge pull request #5471 from ctrlaltdavid/fix-inspect-pan 
Change the inspect.js pan direction and rate
 2015-07-31 17:34:24 -07:00
Seth Alves
bbee001366 Merge pull request #5470 from birarda/master 
fix for unique_ptr<char> allocations
 2015-07-31 15:09:18 -07:00
Stephen Birarda
12ad60a6b5 add a missed char[] in OctreePacketProcessor 2015-07-31 14:48:54 -07:00
David Rowe
c88e0360b3 Change the inspect.js pan direction and rate 
This makes camera zoom, orbit, and panning more similar to Second Life.
 2015-07-31 14:46:43 -07:00
Stephen Birarda
b0afdb21ad correct the unique_ptr char allocations 2015-07-31 14:29:05 -07:00
Brad Hefta-Gaub
b46a430fba Merge pull request #5468 from bwent/reset-position 
Add gettable naturalPosition property for model entities
 2015-07-31 11:03:27 -07:00
bwent
aab1f70800 Renaming vars 2015-07-31 10:47:05 -07:00
Stephen Birarda
1ad2f515de Merge pull request #5455 from thoys/assignment-agent-ping-fix 
Fixes Assignment-Agents to have no constantly reconnecting Avatar/AudioMixer
 2015-07-31 10:41:52 -07:00
bwent
67760fad79 Add gettable naturalPosition property for model entities 2015-07-31 10:15:35 -07:00
Howard Stearns
b685378ab0 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-31 10:08:30 -07:00
Seth Alves
5bae9843f5 code review 2015-07-31 09:34:50 -07:00
Brad Hefta-Gaub
569ed4bbf9 Merge pull request #5452 from samcake/yellow 
Migrate Linux to use GLEW and move to parity with windows for Opengl (compatibility 4.3)
 2015-07-31 09:33:52 -07:00
Seth Alves
c8f398024e replace a magic number with a constant 2015-07-30 21:16:07 -07:00
Seth Alves
0bc94158a8 make the height of the tetrahedrons in 'fatten' mode less tall. 2015-07-30 21:09:14 -07:00
Sam Gateau
b08b2d29cc Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-30 18:40:21 -07:00
samcake
fbf21cb089 FIxed the problem on Mac, by removing all of the gpuConfig includesgit status 
q
:q
wq
 2015-07-30 18:27:47 -07:00
Howard Stearns
51ed912f5e Merge branch 'rig' of https://github.com/howard-stearns/hifi into rig 2015-07-30 17:03:06 -07:00
Howard Stearns
78a900c866 Prototype blend. Just equal weighting for now. 2015-07-30 17:01:48 -07:00
Howard Stearns
40abd63b61 Merge pull request #14 from hyperlogic/ajt/cauterize-fix 
Fix for head cauterization.
 2015-07-30 15:55:42 -07:00
Anthony J. Thibault
e52bf2e12d Fix for head cauterization. 
When rendering rigidly bound mesh clusters were not properly using
the cauterization matrix set.
 2015-07-30 15:51:34 -07:00
Howard Stearns
6ad3cdd402 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-30 15:14:09 -07:00
Howard Stearns
31574521c1 Merge pull request #13 from hyperlogic/ajt/model-offset-fix 
Clear translation on root joint.
 2015-07-30 15:13:09 -07:00
Sam Gateau
14f4c9c6c0 REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend 2015-07-30 15:07:36 -07:00
Anthony J. Thibault
7a10b31dd9 Clear translation on root joint. 
Also, delete/rename all instances of updateJointState except for the one in Rig
and derived classes.
 2015-07-30 15:04:27 -07:00
Howard Stearns
5e3bebcd86 Merge pull request #12 from hyperlogic/ajt/head-model-fix 
Re-added neck and eye procedural animation to FaceModel.
 2015-07-30 12:32:17 -07:00
Anthony J. Thibault
314434e068 Re-added neck and eye procedural animation to FaceModel. 
This is only used in the case of split head/body avatars.
 2015-07-30 12:27:28 -07:00
Sam Gateau
d84e2d31ea Merge with master 2015-07-30 11:20:00 -07:00
Stephen Birarda
fc80e427b9 remove names from audio-mixer jitter calc comments 2015-07-30 11:08:45 -07:00
samcake
b84302a44a Merge pull request #4 from sethalves/test-5452 
fix linux build
 2015-07-30 10:16:58 -07:00
Howard Stearns
06aa107762 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-30 09:57:02 -07:00
Howard Stearns
95c43c4857 Merge pull request #11 from hyperlogic/ajt/spine-twist-fix 
Fix for torso twist.
 2015-07-30 09:50:42 -07:00
Anthony J. Thibault
4bb415fd0d Fix for torso twist. 
Off by one error, 0 is a valid parent bone index.
 2015-07-30 09:31:23 -07:00
Brad Hefta-Gaub
96fdb32edc Merge pull request #5461 from venkatn93/avatar 
HBAO implementation
 2015-07-30 08:46:55 -07:00
Brad Hefta-Gaub
b95e4e1e93 Merge pull request #5323 from MarcelEdward/20605 
Removed the  line where the directory is stripped off the RelativeFile
 2015-07-30 07:30:01 -07:00
Marcel Verhagen
fa6d6a5123 Added the & references to the const variables 2015-07-30 15:08:02 +02:00
Seth Alves
a9556660c4 fix linux build 2015-07-29 20:53:24 -07:00