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

12421 commits

Author SHA1 Message Date
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
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
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
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
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
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
Stephen Birarda
1af4b1c54c cleanup handleUrl call, add disabling of Menu items 2015-06-16 13:17:13 -07:00
Sam Gondelman
156adb1a98 one more coding standard fix 2015-06-16 11:34:59 -07:00
Sam Gondelman
814e22364a coding standard fixes 2015-06-16 11:30:28 -07:00
Sam Gondelman
1ecc954656 coding standard fixes 2015-06-16 10:25:30 -07:00
Sam Gondelman
68a08d969d code review fixes 2015-06-16 10:19:40 -07:00
Brad Davis
4f8ea3f624 Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-16 09:58:20 -07:00
Ryan Huffman
8241a2170b Update cube, line, and sphere overlays to use batches 2015-06-16 09:50:42 -07:00
Niraj Venkat
de13fe85fe Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-16 09:50:37 -07:00
Niraj Venkat
a24e0f7b14 Finishing up new address bar layout 2015-06-16 09:50:03 -07:00
Stephen Birarda
8e46043f14 add fixed back/forward, buttons to menu 2015-06-16 08:41:21 -07:00
Sam Gondelman
4090fd6aa1 attempt to fix build errors 2015-06-15 12:53:14 -07:00
Sam Gondelman
40bd747080 added trigger buttons to hydra, removed hydraMove.js from default scripts 2015-06-15 11:13:07 -07:00
Leonardo Murillo
c065269ba7 Merging with upstream 2015-06-15 11:58:52 -06:00
Sam Gondelman
fe576c6baf hands reset when hydras disconnect 2015-06-15 10:23:24 -07:00
Sam Gondelman
1a8df6509f userinputmapper supports hydra, but some hydra events still register as mouse events 2015-06-12 18:22:56 -07:00
Niraj Venkat
df8e1ac467 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-12 17:46:58 -07:00
Niraj Venkat
7142be07b6 New address bar layout with back and forward buttons 2015-06-12 17:45:18 -07:00
ZappoMan
648f9bebdf add LOD stats to the default stats 2015-06-12 15:58:26 -07:00
Philip Rosedale
c834937472 Merge pull request #5122 from huffman/fix-rear-view-mirror 
Fix rear view mirror
 2015-06-12 15:49:38 -07:00
Niraj Venkat
fcd4dd32ef Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-12 14:08:33 -07:00
Niraj Venkat
b9b8cfd60d Starting the new address bar layout 2015-06-12 14:08:06 -07:00