Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 18:30:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
27062 commits 75 branches 59 tags 1.2 GiB
Commit graph

27062 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
5166d833a7 Make array size a constexpr 2015-06-18 15:23:53 +02:00
Atlante45
d0f27f1648 Change display names size 2015-06-18 15:23:53 +02:00
Atlante45
c38fa46eb1 Increase anti z-fighting value 2015-06-18 15:23:53 +02:00
Atlante45
045a6a6ad9 Use render args frustum 2015-06-18 15:23:52 +02:00
Atlante45
30fbd37645 Transmit normal to text rendering shader 2015-06-18 15:23:52 +02:00
Atlante45
be261cd038 Increase anti z-fighting value 2015-06-18 15:23:52 +02:00
Atlante45
fb6de91cbe HACK Prevent head hight value explosion 2015-06-18 15:23:51 +02:00
Atlante45
3b41a8f209 Cancel display names roll 
This is annoying in HMD
 2015-06-18 15:23:51 +02:00
Atlante45
e1b5a3c204 Fix display name transform 
They now have a fixed pixel size and ar pixel aligned
 2015-06-18 15:23:51 +02:00
Atlante45
1cab853f18 Better guard Transform scale 2015-06-18 15:23:50 +02:00
Atlante45
8a3a7e5b7f Reorder triangle strip 2015-06-18 15:23:50 +02:00
Atlante45
a9d2bb1e1c Coding standard 2015-06-18 15:23:50 +02:00
Atlante45
254f05072f Fix inverted if 2015-06-18 15:23:49 +02:00
Atlante45
70a020c7e3 BevelRect use triangle strips 2015-06-18 15:23:49 +02:00
Atlante45
d7b9a1b032 Cleanup TextRenderer3D methods args 2015-06-18 15:23:49 +02:00
Atlante45
47634a48a6 Make renderDisplayName const 2015-06-18 15:22:49 +02:00
Atlante45
ca98b378df Adjust sdf frag shader alpha correctly 2015-06-18 15:22:49 +02:00
Atlante45
bdaf8a8a32 Fix bevel quads 2015-06-18 15:22:48 +02:00
Atlante45
e8e1f81880 Make Batch copy constructor explicit 2015-06-18 15:22:48 +02:00
Atlante45
a486ed1a57 Add _glUniform1i to Batches 2015-06-18 15:22:48 +02:00
Sam Gateau
5d33cd00b3 Merge branch 'daft' of https://github.com/samcake/hifi into daft 2015-06-18 13:12:12 +02:00
samcake
89fe1c47be preping for debug the jobs 2015-06-18 13:02:06 +02:00
Brad Davis
5c4fa77acd Merge branch 'temp' into overlay 2015-06-18 00:59:31 -07:00
Brad Davis
d9452cfd2e Merge branch 'gpu-error-tweak' into overlay 2015-06-18 00:54:48 -07:00
Brad Davis
dfea571e62 Removing a 'using namespace' from a header and tweaking error checking code 2015-06-18 00:54:35 -07:00
Brad Davis
acdf7c48d9 Adding more explicit error checking 2015-06-18 00:53:19 -07:00
Brad Davis
84c3dab3d8 Fixing error in stats qml parsing 2015-06-18 00:23:40 -07:00
Brad Davis
a8d3dc7218 Updating oglplus version 2015-06-17 23:50:38 -07:00
Brad Hefta-Gaub
db56e15410 Merge pull request #5155 from sethalves/fix-line-data-handling 
Fix line data handling
 2015-06-17 22:47:53 -07:00
Brad Davis
a83a4fb0a1 Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/ui/ApplicationOverlay.cpp
 2015-06-17 19:53:31 -07:00
Seth Alves
c6a0630aa5 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-17 19:10:37 -07:00
Seth Alves
eb89835d42 Merge branch 'master' of github.com:highfidelity/hifi into fix-line-data-handling 2015-06-17 18:35:00 -07:00
Seth Alves
610bfc63e8 check success in OctreePacketData::appendValue for qvectors of vec3s before proceeding with further data appends 2015-06-17 18:34:46 -07:00
Seth Alves
8735fa1eac have variantMapToScriptValue handle lists. 2015-06-17 18:33:43 -07:00
Brad Hefta-Gaub
4501fb1d61 Merge pull request #5073 from jherico/ovr6 
Support Oculus SDK version 0.6 on windows only
 2015-06-17 18:17:34 -07:00
Brad Hefta-Gaub
d1777e0231 Merge pull request #5153 from jherico/fix-gl-matrix 
Preserve the GL matrix stack when running batch commands
 2015-06-17 17:14:25 -07:00
Bradley Austin Davis
4633cabcec Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-17 17:07:43 -07:00
Brad Hefta-Gaub
d4f4580a7c Merge pull request #5152 from sethalves/fix-build 
fix debug build
 2015-06-17 16:27:58 -07:00
Bradley Austin Davis
1705eb8f80 Reverting some changes, putting overlay rendering in its own state manager 2015-06-17 16:08:19 -07:00
Brad Davis
8a1b519071 Working on overlays 2015-06-17 16:06:06 -07:00
Brad Davis
f2261b5ed5 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 15:34:50 -07:00
Brad Davis
2ab3f42c6a Merge pull request #5124 from venkatn93/master 
New address bar with forward and back buttons
 2015-06-17 15:33:10 -07:00
Seth Alves
15f156fcd2 Merge branch 'fix-build' of github.com:sethalves/hifi into actions-over-wire 2015-06-17 15:18:39 -07:00
Seth Alves
fbfa73af2d Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-17 15:18:17 -07:00
Brad Davis
c8cc3a46b3 Merge remote-tracking branch 'origin/fix-gl-matrix' into overlay 2015-06-17 15:13:35 -07:00
Brad Davis
ae1c9603b9 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 15:13:04 -07:00
Seth Alves
68df6b662d fix ifdefs around asserts 2015-06-17 15:03:09 -07:00
Bradley Austin Davis
a27e06713b Preserve the GL matrix stack when running batch commands 2015-06-17 14:57:14 -07:00
Seth Alves
44bb220130 fix debug build 2015-06-17 14:54:13 -07:00
Seth Alves
9a51a4c5b1 fix debug build 2015-06-17 14:48:37 -07:00