Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 14:06:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
26891 commits 76 branches 59 tags 1.2 GiB
Commit graph

12443 commits

Author SHA1 Message Date
Atlante45
9c7f24eeb6 Add culled option for simple programs 2015-06-19 16:50:38 +02:00
Atlante45
67473ac254 Fix rotation handle crash 2015-06-19 16:40:42 +02:00
Brad Hefta-Gaub
a7a53d8be7 Merge pull request #5148 from SamGondelman/rotationModes 
center player in view mode
 2015-06-18 18:02:47 -07:00
Brad Hefta-Gaub
750ce250fa Merge pull request #5150 from SamGondelman/mouseLook 
mouse look script
 2015-06-18 17:41:20 -07:00
Philip Rosedale
2f080a8e29 Merge pull request #5147 from sethalves/more-actions 
offset action
 2015-06-18 17:35:50 -07:00
Seth Alves
021dc64789 merge from upstream 2015-06-18 15:03:09 -07:00
Seth Alves
53b5c8e6e7 more merge fallout 2015-06-18 10:19:12 -07:00
Seth Alves
b258aeaa3d merge from master 2015-06-18 10:04:14 -07: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
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
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
Bradley Austin Davis
4633cabcec Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-17 17:07:43 -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
Sam Gondelman
0157997126 fix findDevice 2015-06-17 14:42:11 -07:00
Niraj Venkat
225e2ebfdc Fixing build issues and finishing up address bar 2015-06-17 14:27:16 -07:00
ZappoMan
58ee5217e3 fix some warnings 2015-06-17 14:08:02 -07:00
Niraj Venkat
9b9aba48f0 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-17 13:50:30 -07:00
Niraj Venkat
1328ea6199 Calling AddressManager back and forward functions 2015-06-17 13:41:41 -07:00
Bradley Austin Davis
2172445db7 Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-17 12:56:41 -07:00
Ryan Huffman
220a78eede Merge pull request #5149 from SamGondelman/master 
fix compile issue if you don't have sdl2
 2015-06-17 12:33:10 -07:00
Sam Gondelman
a37b089b33 merge with master 2015-06-17 12:17:09 -07:00
Sam Gondelman
45a5f1364a fix compile issue if you don't have sdl2 2015-06-17 11:56:44 -07:00
Andrew Meadows
61f62f96b0 Merge pull request #5129 from SamGondelman/master 
Integrating gamepads/hydras to input mapping system, zooming
 2015-06-17 11:39:38 -07:00
Seth Alves
85564199c6 git rid if pull-to-point action (spring handles this). add new action which tries to maintain an entity's distance from a given point 2015-06-17 11:22:10 -07:00
Sam Gondelman
17322645f2 added mouselook script, reticle and icons need changes 2015-06-17 11:17:38 -07:00
ZappoMan
467609f2b6 standardize skybox and atmosphere batch 2015-06-17 09:44:26 -07:00
ZappoMan
af5a910f58 Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereBatchFix 2015-06-17 09:36:16 -07:00
ZappoMan
ea98581d22 reorganize files to cleanup headers 2015-06-17 09:18:00 -07:00
ZappoMan
b5731135dd cleanup 2015-06-17 09:08:41 -07:00
ZappoMan
2356a071dd some cleanup 2015-06-17 08:48:04 -07:00
Sam Gateau
3176c8e93c polish before PR 2015-06-17 17:09:33 +02:00
samcake
d703748ec3 trying to solve the rendering of overlay3d 2015-06-17 16:44:02 +02:00
Seth Alves
02d7aa30ab don't check QtWidgets header for -Wdouble-promotion 2015-06-17 07:02:37 -07:00
Sam Gateau
5c547037f2 Migrating the overaly 3d rendering in their own job and their own shader 2015-06-17 15:54:20 +02:00
Sam Gateau
0653be445a Merge branch 'batch-overlay' of https://github.com/huffman/hifi into yellow 2015-06-17 10:39:45 +02:00
ZappoMan
006899d73f more hacking almost working 2015-06-16 22:23:14 -07:00
ZappoMan
569971582d more hacking on trying to port atmospheres to the new pipeline 2015-06-16 18:39:35 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
ZappoMan
722ac618f5 Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereBatchFix 2015-06-16 17:08:15 -07:00
Ryan Huffman
d47f5a2abb Update Rectangle, Grid, and Billboard overlays to use batches 2015-06-16 16:45:53 -07:00
Niraj Venkat
5fcf8e5922 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-16 16:34:38 -07:00
ZappoMan
167e7d1377 first cut at atmospheres in batch (doesn't work) 2015-06-16 14:05:14 -07:00
Andrew Meadows
7721f6de96 Merge pull request #5134 from birarda/master 
add goBack and goForward to AddressManager
 2015-06-16 13:50:20 -07:00
Philip Rosedale
7ead2bc46b Merge pull request #5120 from ctrlaltdavid/20576 
DO NOT MERGE - QA for #20576 - Play sound when mic is muted
 2015-06-16 13:27:01 -07:00