Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 18:32:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
20424 commits 25 branches 0 tags 1.1 GiB
Commit graph

10393 commits

Author SHA1 Message Date
Brad Hefta-Gaub
476887b7ef Merge pull request #4055 from huffman/fix-overlays 
Update setting drawOnHUD and update to write lock for editOverlay
 2015-01-07 10:56:18 -08:00
Andrew Meadows
d3d80a0b1b Merge pull request #4049 from ZappoMan/gpuStreamizing 
Work on removing immediate mode OpenGL from application
 2015-01-07 10:55:15 -08:00
Andrew Meadows
559ec41bfe Merge pull request #4051 from Atlante45/master 
Restored addReverb default arg
 2015-01-07 10:25:26 -08:00
Stephen Birarda
35a69ce049 remove the faceplus find module 2015-01-07 09:48:12 -08:00
ZappoMan
7e8194a3d7 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-06 19:12:01 -08:00
Ryan Huffman
68a9d80ba3 Update setting drawOnHUD and update to write lock for editOverlay 2015-01-06 18:14:40 -08:00
Philip Rosedale
3ed5b0e9be Merge pull request #4052 from cozza13/20253 
CR for Job #20253 - Fix scripts that still link to highfidelity-public
 2015-01-06 17:08:51 -08:00
Chris Collins
0a1a64b7e6 Script updates and fixes to highfidelity-public 
Script updates and fixes to highfidelity-public
 2015-01-06 17:04:42 -08:00
ZappoMan
e0338dd787 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-06 16:42:25 -08:00
Atlante45
29839df9fe Restored addReverb default arg 2015-01-06 16:35:30 -08:00
Clément Brisset
fb6fb8a38d Merge pull request #4050 from birarda/lasagna-not-spaghetti 
put back current address storage in Menu
 2015-01-06 16:29:52 -08:00
Stephen Birarda
9c191be106 use the AddressManager's method to store current address 2015-01-06 16:13:06 -08:00
Stephen Birarda
8c8a925085 put back current address storage in Menu 2015-01-06 16:06:07 -08:00
ZappoMan
fb68037b74 more removal of immediate mode 2015-01-06 15:51:39 -08:00
ZappoMan
d796ebf632 migrate circle overlays to use renderVertices() 2015-01-06 14:43:42 -08:00
ZappoMan
1bfce7d876 more removal of immediate mode 2015-01-06 14:14:13 -08:00
ZappoMan
0d63391be8 formatting 2015-01-06 12:31:42 -08:00
ZappoMan
873403a333 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 
Conflicts:
	interface/src/Audio.cpp
	interface/src/Audio.h
	interface/src/Menu.cpp
	interface/src/Menu.h
 2015-01-06 12:27:16 -08:00
Atlante45
9d5ff5d274 Fix mouse disappearing in the menus on Windows 2015-01-06 10:36:42 -08:00
Philip Rosedale
413cbacbc1 Merge pull request #4043 from ZappoMan/voxelEctomy 
more voxel-ectomy cleaning up some remaining references to voxels
 2015-01-06 10:07:38 -08:00
ZappoMan
b605fe387e fix ui file 2015-01-06 09:55:49 -08:00
ZappoMan
ac1f7c9a84 multi-mode renderVertices 2015-01-06 09:52:27 -08:00
Stephen Birarda
5fadfa8c17 remove doubled friend declaration, is in macro 2015-01-06 09:35:11 -08:00
ZappoMan
b940dcfdb3 more voxel-ectomy cleaning up some remaining references to voxels 2015-01-06 09:27:48 -08:00
Andrew Meadows
f3255eeb0e Merge pull request #4008 from birarda/lasagna-not-spaghetti 
some Audio cleanup in prep for audio untangle
 2015-01-06 09:13:12 -08:00
ZappoMan
0606861b66 dashed lines in GeometryCache 2015-01-05 21:45:17 -08:00
ZappoMan
56a3f98b27 renderLinestrip() for audio scope and 3d rectangle overlays 2015-01-05 21:04:56 -08:00
ZappoMan
a9b7367fa9 more work on eliminating immediate mode calls 2015-01-05 20:51:05 -08:00
ZappoMan
9545bd1907 add alternate renderGrid for audio scope 2015-01-05 19:34:37 -08:00
ZappoMan
0e943ae240 remove render view frustum mode 2015-01-05 17:23:10 -08:00
ZappoMan
bd1612f6a4 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-05 16:51:31 -08:00
Sam Gateau
2fdcbb1a97 changing the atmoshpere position 2015-01-05 16:46:42 -08:00
ZappoMan
7cf4bd1860 remove head mouse 2015-01-05 16:29:02 -08:00
ZappoMan
8b22b166ac convert lookat vectors and laser pointers to use renderLine() 2015-01-05 16:06:35 -08:00
ZappoMan
a20fa1242d first cut are removing immediate mode GL_LINES 2015-01-05 15:46:48 -08:00
Stephen Birarda
f116d0bf5d block until audio IO stops on app quit 2015-01-05 15:20:36 -08:00
Sam Gateau
56758759e5 making the sun position a direction 2015-01-05 15:02:12 -08:00
Stephen Birarda
dbe4b6ccc0 include QDesktopServices in UpdateDialog 2015-01-05 14:45:41 -08:00
Stephen Birarda
9bcacaf512 put back declared constructor, inputReceived signal 2015-01-05 14:43:23 -08:00
Stephen Birarda
53ac1a2bb2 don't include QtGui from UpdateDialog 2015-01-05 14:41:38 -08:00
Stephen Birarda
51bba4884f resolve conflicts on merge with upstream master 2015-01-05 14:40:48 -08:00
ZappoMan
c2d45df541 add renderBevelCornersRect to GeometryCache 2015-01-05 14:39:14 -08:00
ZappoMan
bd38df2a15 replace GL_LINES with a call to renderWireBox for node bounds 2015-01-05 13:58:58 -08:00
Sam Gateau
f03b253260 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2015-01-05 13:23:14 -08:00
Andrew Meadows
162854c5a5 Merge pull request #4025 from ZappoMan/voxelEctomy 
Voxel ectomy
 2015-01-05 13:20:30 -08:00
Sam Gateau
3e4cbfd2dc clean code 2015-01-05 13:12:28 -08:00
Sam Gateau
7529b3d1b0 clean code 2015-01-05 13:10:32 -08:00
Ryan Huffman
c5e42aa50e Merge pull request #4035 from ZappoMan/audioStarvation 
add audio starvation detection
 2015-01-05 13:05:27 -08:00
Sam Gateau
0b8b4c6d08 for simple shadow map, cover 2 regions of the view frustum and not just one for similar quality 2015-01-05 13:01:21 -08:00
Brad Hefta-Gaub
58a2a5eb83 Merge pull request #4027 from huffman/grid-shader-updates 
Grid shader updates
 2015-01-05 13:00:05 -08:00