Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 03:53:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
29068 commits 71 branches 56 tags 1.2 GiB
Commit graph

29068 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
9e76c0296d Merge pull request #5487 from samcake/daft 
Remove completely GL transform legacy support
 2015-08-03 15:54:01 -07:00
samcake
caa5732e06 Remove completely GL transform legacy support 2015-08-03 14:51:57 -07:00
Brad Davis
5dce2dcf23 Merge pull request #5486 from samcake/daft 
GL CORE PROFILE: Update BackendINput to work with 4.1 and remove glColor4f
 2015-08-03 14:24:38 -07:00
Sam Gateau
4b1d2f00fb Merge branch 'core' of https://github.com/highfidelity/hifi into daft 2015-08-03 13:41:23 -07:00
Sam Gateau
647abe5009 Replace the glCOlor4f by a glVertexAttribute4f on the color slot instead 2015-08-03 13:41:02 -07:00
Sam Gateau
f23df03ea9 REsolve the bracket issue, 2015-08-03 13:10:06 -07:00
Brad Davis
c4d353e3af Merge pull request #5481 from samcake/punk 
GL CORE PROFILE:Fixing a few shader and enableing the INput core profile that breaks on mac
 2015-08-03 13:01:06 -07:00
Brad Davis
3eab3e6802 Merge pull request #5484 from SamGondelman/core 
GL Core Profile: adding the rest of the shaders to shaders-test
 2015-08-03 13:00:27 -07:00
samcake
32c253453b REsolving the input 2015-08-03 12:47:51 -07:00
Sam Gondelman
d182199c71 adding the rest of the shaders to shaders-test 2015-08-03 12:08:14 -07:00
Sam Gateau
a417b77c01 Merge branch 'punk' of https://github.com/samcake/hifi into daft 2015-08-03 11:55:23 -07:00
samcake
d3fc05e99f FIxed a few shaders varyings, problem identified on MAC to be solved 2015-08-03 11:18:08 -07:00
Sam Gateau
785fd03085 Merge branch 'core' of https://github.com/highfidelity/hifi into punk 2015-08-03 10:26:06 -07:00
samcake
85077604dc Merge pull request #5478 from jherico/marge 
CORE BRANCH - More shader fixes
 2015-08-03 10:25:33 -07:00
Sam Gateau
1a276924f0 Merging core 2015-08-03 10:05:23 -07:00
samcake
12505573df Merge pull request #5477 from jherico/bart 
CORE BRANCH - Integrate glew directly into GPU
 2015-08-03 09:59:32 -07:00
Brad Davis
53feaf2ab6 More shader fixes 2015-08-01 20:17:57 -07:00
Bradley Austin Davis
f19653f3e2 Integrate glew 2015-08-01 20:08:19 -07:00
Brad Davis
180f912924 Merge remote-tracking branch 'upstream/master' into core 
Conflicts:
	interface/src/ui/overlays/Circle3DOverlay.cpp
	libraries/gpu/src/gpu/Format.h
	libraries/render-utils/src/GeometryCache.cpp
	libraries/render-utils/src/Model.cpp
	libraries/render-utils/src/text/Font.cpp
 2015-08-01 20:01:59 -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
samcake
35e977989b Merge pull request #5474 from jherico/marge 
CORE BRANCH - Update shaders to core
 2015-08-01 14:53:38 -07:00
Brad Davis
b84eef93c9 Core profile shader work and test code 2015-08-01 14:43:52 -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
samcake
bbd8de2d70 Merge pull request #5472 from jherico/homer 
CORE BRANCH - Initialize the GL widget with the 4.1 core profile
 2015-08-01 09:07:30 -07:00
Sam Gateau
6a8faca0ee Install the GLCore way of doing input without all the legacy stuff 2015-07-31 22:46:06 -07:00
Brad Davis
1712ab322f Fixing includes in test code 2015-07-31 17:46:47 -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
Brad Davis
1e44495f7c Initialize the GL widget with the 4.1 core profile 2015-07-31 16:21:47 -07:00
Brad Davis
d9d0f8dcfd Merge pull request #5473 from samcake/punk 
GLCORE : Merged upstream master into core
 2015-07-31 16:21:04 -07:00
Brad Davis
e8fafeb601 Fixing merge conflict 2015-07-31 16:17:32 -07:00
Sam Gateau
ca4dbdb996 Merging with upstream and compiling on windows 2015-07-31 16:14:53 -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
Brad Davis
aea07fe671 Merge branch 'master' into gl4_1 
Conflicts:
	libraries/gpu/src/gpu/Config.slh
	libraries/render-utils/src/deferred_light_limited.slv
	libraries/render-utils/src/simple.slf
	libraries/render-utils/src/simple_textured.slf
	tests/render-utils/src/main.cpp
	tools/scribe/src/main.cpp
 2015-07-31 15:08:37 -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
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
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
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