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

10366 commits

Author SHA1 Message Date
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
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
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
Sam Gateau
2fdcbb1a97 changing the atmoshpere position 2015-01-05 16:46:42 -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
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
Sam Gateau
b8e44a3e7a Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2015-01-05 11:27:53 -08:00
Sam Gateau
458ea6759e Adding the shadow.slh file containing the shader functions used for shadowing, itis used by both normal and cascaded shadow deferred lighting passes 2015-01-05 11:27:29 -08:00
Stephen Birarda
6d8f319e51 remove Audio methods re-introduced after merge 2015-01-05 09:27:01 -08:00
Stephen Birarda
dfb02aea0c resolve conflicts on merge, add cstring inc 2015-01-05 09:25:30 -08:00
Brad Hefta-Gaub
89e499a78f only active sixsense palms 2015-01-04 12:26:30 -08:00
Philip Rosedale
218ae9c9d8 Hydra hands deactivate when placed back on controller base, removed measuring non-movement for inactivity 2015-01-04 12:12:57 -08:00
Philip Rosedale
fefcdfa9f6 Revert "Hydra hands deactivate when placed back on controller base" 2015-01-03 21:03:23 -08:00
ZappoMan
b0ac9e22c1 Merge branch 'master' of https://github.com/highfidelity/hifi into audioStarvation 2015-01-02 17:33:25 -08:00
ZappoMan
1df54cffd6 add audio starvation detection 2015-01-02 17:28:51 -08:00
Sam Gateau
ef7c002237 Improving the shadow effect with lightmaps 2015-01-02 10:31:34 -08:00
Ryan Huffman
b6b2388d41 Update grid rendering to fade from center location rather than distance from camera 2014-12-31 11:15:44 -08:00
ZappoMan
9630279459 Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 
Conflicts:
	examples/editVoxels.js
	examples/fallingSand.js
	examples/growTrees.js
	interface/src/Application.cpp
	interface/src/Application.h
	libraries/avatars/CMakeLists.txt
	libraries/entities/src/EntityItem.h
 2014-12-31 10:50:53 -08:00
Brad Hefta-Gaub
eaa6d4455d Merge pull request #4024 from samcake/temp1 
Moving deferred lighting shaders from the resource folder to embedded source in the executable
 2014-12-31 10:33:30 -08:00
Brad Hefta-Gaub
43e6ba77fa Merge pull request #4007 from AndrewMeadows/inertia 
Bullet physics part 1
 2014-12-31 10:33:00 -08:00
Brad Hefta-Gaub
d47b0a33ea Merge pull request #3995 from huffman/camera-display 
Camera tool - orientation + mode display
 2014-12-31 10:32:31 -08:00
Ryan Huffman
7478b631da Move write lock in Overlays::overlayDrawOnChanged to encompass reads 2014-12-31 10:16:29 -08:00
Ryan Huffman
5caec4dea5 Update overlays to handle updates in drawOnHUD after creation 2014-12-31 10:15:15 -08:00
Sam Gateau
e1a295fb37 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-12-31 08:40:15 -08:00
Andrew Meadows
ec1ef39a7f Merge pull request #4023 from PhilipRosedale/master 
Torso twists to follow head, fix bug with head rotations
 2014-12-31 08:01:39 -08:00
Philip Rosedale
104f7b7576 make formula more readable 2014-12-30 20:34:12 -08:00
ZappoMan
5cef7d0e9d more voxelEctomy 2014-12-30 20:24:27 -08:00
ZappoMan
95bb125e48 more voxelEctomy 2014-12-30 20:13:57 -08:00
ZappoMan
27d8ccb51e more voxelEctomy 2014-12-30 19:58:04 -08:00
ZappoMan
f1de9cabe9 comment 2014-12-30 19:07:32 -08:00
ZappoMan
49d8f2b2f5 more work on voxelEctomy 2014-12-30 18:52:33 -08:00
ZappoMan
141e231958 more work on voxelEctomy 2014-12-30 18:41:56 -08:00
ZappoMan
4ea9bbc309 first major pass at voxelEctomy 2014-12-30 18:08:58 -08:00