Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-17 05:12:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
29241 commits 76 branches 59 tags 1.2 GiB
Commit graph

29241 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seiji Emery
91bfd07cd4 use geometry cache 2015-08-05 12:35:52 -07:00
Seiji Emery
5ce84c15ae updated shaders 2015-08-04 16:27:07 -07:00
Seiji Emery
e5cb9cb862 integrating core-profile work to get opengl 4.1 on mac 2015-08-04 15:18:47 -07:00
Seiji Emery
9caf440746 basic shader sort-of working (sip) 2015-08-04 12:53:23 -07:00
Bradley Austin Davis
3c76c0d4b6 Merge remote-tracking branch 'upstream/master' into core 2015-08-04 10:23:54 -07:00
Howard Stearns
597316b208 Merge pull request #5493 from thoys/fix-model-overlay-rig-crash 
Fix crash for ModelOverlays, caused by Rig changes
 2015-08-04 07:23:52 -07:00
Thijs Wenker
4bf6f8ed77 ModelOverlay causes a crash in the Model class. This is because ModelOverlay doesn't give a valid rig to the Model. 2015-08-04 14:47:13 +02:00
Bradley Austin Davis
ed5f70039f Merge branch 'master' into core 2015-08-03 22:18:38 -07:00
samcake
a3846b399a Merge pull request #5492 from jherico/homer 
Fixing the skinning shaders sizing problems
 2015-08-03 21:45:17 -07:00
Bradley Austin Davis
1a589160f4 Fixing the skinning shaders sizing problems 2015-08-03 18:44:51 -07:00
Brad Davis
3da2a1c64c Merge pull request #5488 from samcake/punk 
Fixing the skinning by simply reverting the change to the format for the inSkinIndex
 2015-08-03 16:17:05 -07:00
Sam Gateau
44e7223547 Fixing the skinning by simply reverting the change to the format for the inSkinIndex 2015-08-03 16:05:04 -07:00
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
Eric Levin
3f5f75d6d2 Merge pull request #5430 from AlexanderOtavka/floating-ui 
Improvements to overlays.
 2015-08-03 14:35:52 -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
Brad Davis
f0ba0a4f47 Merge pull request #5485 from ctrlaltdavid/reduce-hmd-velocity 
Reduce the speed of movement when in HMD view
 2015-08-03 14:16:56 -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
David Rowe
5e7cb72843 Reduce the speed of movement when in HMD view 
When using hmdControls.js.
 2015-08-03 13:02:12 -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
Seiji Emery
4e3cfd7c49 clear empty frame buffer fix 
thanks sam!
 2015-08-03 12:04:02 -07:00
Zander Otavka
1b4ba75b5a Fix click and drag logic for floatingUIExample.js. 2015-08-03 12:01:15 -07:00
Seiji Emery
883aa7af8d changed gl calls to gpu:: 2015-08-03 11:58:38 -07:00
Sam Gateau
a417b77c01 Merge branch 'punk' of https://github.com/samcake/hifi into daft 2015-08-03 11:55:23 -07:00
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
samcake
d3fc05e99f FIxed a few shaders varyings, problem identified on MAC to be solved 2015-08-03 11:18:08 -07:00
Zander Otavka
d24006e715 Improve logic around handling click and drag. 2015-08-03 11:14:55 -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
Zander Otavka
055c9dc59b Fix image URLs in controlPanel.js. 2015-08-03 10:41:35 -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
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
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
Howard Stearns
8f616c04fb Fix https://app.asana.com/0/32622044445063/43589567731045 2015-08-02 21:46:39 -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