Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:33:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26848 commits 71 branches 56 tags 1.2 GiB
Commit graph

26848 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
a8d3dc7218 Updating oglplus version 2015-06-17 23:50:38 -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
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
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
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
Seth Alves
0568dc983e Merge pull request #5151 from ZappoMan/fixWarnings 
fix some warnings
 2015-06-17 14:44:10 -07:00
Niraj Venkat
225e2ebfdc Fixing build issues and finishing up address bar 2015-06-17 14:27:16 -07:00
ZappoMan
f2ba91383c fix some warnings 2015-06-17 14:26:36 -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
Bradley Austin Davis
11fff7c6e5 debugging stack on OSX 2015-06-17 13:49:42 -07:00
Niraj Venkat
1328ea6199 Calling AddressManager back and forward functions 2015-06-17 13:41:41 -07:00
Philip Rosedale
196a1546ab Merge pull request #5135 from howard-stearns/not-clipped-local-sounds 
Don't clip local audio sounds
 2015-06-17 13:37:56 -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
Brad Davis
4282c044ef Working on mirror and overlay 2015-06-17 12:01:39 -07:00
Howard Stearns
b4dfaba55e Incorporate ctrlaltdavid's changes. 2015-06-17 11:59:15 -07:00
Stephen Birarda
71475f13b5 Merge pull request #5146 from birarda/master 
fix for path handling on return of place info
 2015-06-17 14:57:55 -04: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
Brad Davis
1e90aaf9c3 Working on overlays still, mirror rendering and overlay order 2015-06-17 11:35:30 -07:00
Stephen Birarda
bc20ea6ed2 fix for path handling on return of place info 2015-06-17 11:18:43 -07:00
Brad Davis
5ded9e7eb9 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 10:50:01 -07:00
Philip Rosedale
8b8f0bcbde Merge pull request #5132 from sethalves/polyvox 
Polyvox fixes
 2015-06-17 10:49:35 -07:00
Clément Brisset
d67d350e72 Merge pull request #5143 from ZappoMan/atmosphereBatchFix 
Change atmospheres to render using batch compatible pipeline and shaders
 2015-06-17 19:48:11 +02:00
Clément Brisset
42a5ddd116 Merge pull request #5144 from birarda/master 
make goToUser public again
 2015-06-17 19:27:29 +02:00
Stephen Birarda
dc4ae082f8 make goToUser public again 2015-06-17 10:13:53 -07:00
ZappoMan
fb59939cf4 CR feedback 2015-06-17 10:02:02 -07:00
ZappoMan
e9bf553254 CR feedback 2015-06-17 09:59:38 -07:00
ZappoMan
689e10cc27 build buster fix 2015-06-17 09:53:50 -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
8162c37013 cleanup 2015-06-17 09:33:15 -07:00
Ryan Huffman
4f4bbddf9b Merge pull request #5142 from samcake/yellow 
Migrating the rendering of 3D overlay elements to the batch rendering
 2015-06-17 09:31:26 -07:00
ZappoMan
268bb370cc cleanup 2015-06-17 09:24:42 -07:00
ZappoMan
0e18c75b0b cleanup 2015-06-17 09:23:12 -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