Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-03 01:09:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
21017 commits 74 branches 59 tags 1.2 GiB
Commit graph

10612 commits

Author SHA1 Message Date
Atlante45
74d819fe25 Merge branch 'master' of https://github.com/highfidelity/hifi into body_not_rotating 2015-01-12 16:42:35 -08:00
Clément Brisset
60aafba0ce Merge pull request #4077 from huffman/fix-render-hud-windows-linux 
Fix gl projection matrix stack overflow when rendering to HUD
 2015-01-12 16:22:09 -08:00
Clément Brisset
10331c52a8 Merge pull request #4094 from birarda/master 
repairs to AudioScriptingInterface playSound
 2015-01-12 16:18:41 -08:00
Thijs Wenker
8c7099a0bb changed "Load Scripts" label to be better understandable 2015-01-13 01:09:28 +01:00
Stephen Birarda
661221a189 repairs to AudioScriptingInterface playSound 2015-01-12 16:04:00 -08:00
Atlante45
ea3626d87f Merge branch 'master' of https://github.com/highfidelity/hifi into body_not_rotating 2015-01-12 16:03:32 -08:00
Atlante45
934d8d58ef Move some constants out of Menu class files 2015-01-12 16:03:15 -08:00
Atlante45
e30b119464 Some simple code cleanup 2015-01-12 15:55:25 -08:00
Thijs Wenker
336a96bd48 Merge branch 'master' of https://github.com/worklist/hifi into 20255 2015-01-13 00:44:39 +01:00
Atlante45
59c9e0bb50 Wire CachesSizeDialog in Menu 2015-01-12 15:19:36 -08:00
Atlante45
7bf57b3cca Removed unecessary method/cleanup header 2015-01-12 14:53:31 -08:00
Atlante45
e62fbe2557 Cleanup some headers 2015-01-12 14:09:26 -08:00
Atlante45
fd2b0edf7a Alphabetical order 2015-01-12 14:01:56 -08:00
Atlante45
894c4c9d59 All dialogs in Menu are QPointers 2015-01-12 14:00:23 -08:00
Atlante45
19f321c171 Fixed caches not in DM 2015-01-12 13:56:41 -08:00
Atlante45
38dc1643ef New Caches size dialog 2015-01-12 12:46:11 -08:00
Atlante45
5be5dc716f Make sure every widget has diolog has a parent 2015-01-12 12:45:50 -08:00
Andrzej Kapolka
cad8313e56 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2015-01-12 12:00:20 -08:00
David Rowe
022760be1d Remove menu item for Show Voxel Nodes which is no longer available 
And change Show Entity Nodes shortcut from Ctrl-Shift-2 to Ctrl-Shift-1.
 2015-01-12 11:52:51 -08:00
Atlante45
98dd401ea3 Remove duplicate definition 2015-01-12 11:12:19 -08:00
Stephen Birarda
d30490c760 resolve conflicts on merge with upstream master 2015-01-12 09:25:37 -08:00
Thijs Wenker
e4fd027d15 "load script from URL" button in Running scripts window 2015-01-12 00:49:41 +01:00
Thijs Wenker
8feb51013b running script window treeview fully works 2015-01-12 00:41:38 +01:00
David Rowe
968a34f966 Add instructions for building with SDL2 2015-01-11 11:44:16 -08:00
Andrzej Kapolka
d002359989 Stitching improvement. 2015-01-09 16:43:51 -08:00
Thijs Wenker
1d6066c837 replaced GetVersionEx with new Version helpers to resolve deprecation warnings. 2015-01-10 01:41:07 +01:00
Thijs Wenker
d84a65a5f9 running scripts list -> treeview initial 2015-01-10 01:29:06 +01:00
Ryan Huffman
e00b629133 Fix gl projection matrix stack overflow when rendering to HUD 
The projection matrix stack is considerably smaller than the modelview
stack and was overflowing on Windows and Linux machines that were tested.
 2015-01-09 16:11:17 -08:00
Andrzej Kapolka
e3074d726b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	libraries/metavoxels/src/Spanner.cpp
 2015-01-09 11:52:05 -08:00
Andrzej Kapolka
d82f269263 Don't show grid for tools where it isn't needed, started on "fill" tool. 2015-01-09 11:46:40 -08:00
Atlante45
05d2887c94 Move Torso twist to HeadData with Lean 2015-01-09 11:15:01 -08:00
Philip Rosedale
285e588266 Merge pull request #4072 from Atlante45/network_replies_cleanup 
Windows crash fix
 2015-01-09 07:42:36 -08:00
Atlante45
891d8d5abf Removed unecessary foreach 2015-01-08 18:22:25 -08:00
Atlante45
1c4903c346 Merge branch 'master' of https://github.com/highfidelity/hifi into head_rotation_fix 2015-01-08 16:33:01 -08:00
Andrzej Kapolka
c99e2c3ec6 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
 2015-01-08 14:57:03 -08:00
Andrzej Kapolka
8b2baf65e8 Color/material fix. 2015-01-08 14:13:23 -08:00
Andrzej Kapolka
ec32739689 CSG improvements. 2015-01-08 12:52:52 -08:00
Atlante45
e73f8baf93 Merge branch 'master' of https://github.com/highfidelity/hifi into head_rotation_fix 2015-01-08 11:54:54 -08:00
Atlante45
4157a3ca40 Remove lean from head rotation 2015-01-08 11:33:14 -08:00
David Rowe
198226450a Suppress warnings about inconsistent DLL linkage of lrintf in Windows 
This warning in Windows builds is due to redefinition of lrintf in gverb
library's ladspa-util.h file.
 2015-01-08 11:26:32 -08:00
Atlante45
0bae05b924 Remove chat message 2015-01-08 11:25:53 -08:00
Andrew Meadows
25b9b50468 Merge pull request #4065 from ZappoMan/voxelEctomy 
fix some warnings and remove more references to voxels
 2015-01-08 08:07:06 -08:00
Andrzej Kapolka
4c3163fae8 Closer to working stitching. 2015-01-07 17:24:26 -08:00
Philip Rosedale
a04ce68fba Merge pull request #4063 from ZappoMan/restoreLookAt 
restore camera lookAt and keepLookingAt features
 2015-01-07 16:31:07 -08:00
ZappoMan
cc19c15c17 remove more references to voxels 2015-01-07 16:09:56 -08:00
ZappoMan
91351d7700 fix warnings 2015-01-07 16:09:26 -08:00
ZappoMan
806e691bbf restore camera lookAt and keepLookingAt features 2015-01-07 13:41:07 -08:00
Thijs Wenker
2690241eb6 fix to add GLEW debug library 2015-01-07 22:08:01 +01:00
Brad Hefta-Gaub
ddea2c4a68 Merge pull request #4058 from huffman/entity-tool-updates 
Entity tool updates
 2015-01-07 12:42:47 -08:00
Ryan Huffman
b471c1fa71 Update hotkey for audio stats 2015-01-07 12:15:53 -08:00
David Rowe
6c4932f9d0 Coding standard 2015-01-07 11:24:10 -08:00
David Rowe
40274df279 Add downloads information changed event for JavaScript 2015-01-07 11:20:46 -08:00
Andrzej Kapolka
1abf111d7f Index fix. 2015-01-07 11:19:40 -08:00
Brad Hefta-Gaub
8ad21d61c4 Merge pull request #4056 from huffman/audio-buffer-starvation-detection 
Audio buffer starvation detection
 2015-01-07 11:18:34 -08:00
Ryan Huffman
50fcf4ba8f Remove output buffer starvation log warnings 2015-01-07 11:06:36 -08:00
Ryan Huffman
19639367bf Use usecTimestampNow instead of QDateTime::currentMSecsSinceEpoch 2015-01-07 11:04:09 -08:00
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
Ryan Huffman
40f277b630 Fix use of dependency manager 2015-01-07 10:20:49 -08:00
Ryan Huffman
d113b3f85c Update getAudio() calls to use DependencyManager instead 2015-01-07 09:48:41 -08:00
Stephen Birarda
35a69ce049 remove the faceplus find module 2015-01-07 09:48:12 -08:00
Ryan Huffman
cb80e18ad0 Update default detection period to be int 2015-01-07 09:47:24 -08:00
Ryan Huffman
a07d92b6ea Merge branch 'master' of github.com:highfidelity/hifi into audio-buffer-starvation-detection 
Conflicts:
	interface/src/Audio.cpp
	interface/src/Audio.h
	interface/src/Menu.cpp
	interface/src/ui/PreferencesDialog.cpp
 2015-01-07 09:46:07 -08:00
Ryan Huffman
08776aec9d Add output starve settings to preferences 2015-01-07 09:37:17 -08:00
Ryan Huffman
a660e7efed Add output starve values to settings 2015-01-07 09:37:03 -08:00
Ryan Huffman
77aecaabd0 Remove extra switch output call 2015-01-07 09:36:26 -08:00
Ryan Huffman
288e2ee45a Add output buffer starve detection to audio 2015-01-07 09:36:14 -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
Andrzej Kapolka
48fb9a27ba Progress on heightfield/voxel interface. 2015-01-06 17:55:04 -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
David Rowe
8b0d859686 Add method to access downloads information in JavaScript 2015-01-06 15:54: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
Andrzej Kapolka
a20b12ad44 Material painting for stacks. 2015-01-06 14:25:26 -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
Andrzej Kapolka
5a46f3e20d Material/ray testing bits. 2015-01-05 18:37:47 -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
Atlante45
be050b0469 Added missing deletes 2015-01-05 15:13:07 -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
Andrzej Kapolka
808cb2e4bc Substantial cleanup, working on interface between heightfields and dual 
contour surfaces.
 2015-01-05 14:33:40 -08:00
Ryan Huffman
defb2cbffd Merge branch 'master' of git://github.com/highfidelity/hifi into audio-buffer-size 
Conflicts:
	interface/src/Audio.cpp
 2015-01-05 14:07:06 -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
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
Andrzej Kapolka
547c6db0a4 Slight simplification. 2015-01-02 17:43:41 -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
Andrzej Kapolka
a504d03b14 Normal fix. 2015-01-02 17:14:17 -08:00
Ryan Huffman
bbfe2ff1b9 Merge branch 'master' of git://github.com/highfidelity/hifi into audio-buffer-size 2015-01-02 17:08:02 -08:00
Ryan Huffman
4a72a4be83 Add audio output buffer size to settings 2015-01-02 17:03:01 -08:00
Ryan Huffman
0d71d25063 Add min/max for audio buffer size 2015-01-02 17:02:44 -08:00
Ryan Huffman
4c5bb66bd7 Add audio output buffer size to preferences 2015-01-02 16:01:04 -08:00
Ryan Huffman
f97109f6a4 Add outputBufferSizeFrames property to Audio 2015-01-02 16:00:07 -08:00
Andrzej Kapolka
3959f99910 Fixed voxel textures. 2015-01-02 13:57:27 -08:00
Sam Gateau
ef7c002237 Improving the shadow effect with lightmaps 2015-01-02 10:31:34 -08:00
Andrzej Kapolka
e242459ea2 More render progress. 2014-12-31 17:33:43 -08:00
Andrzej Kapolka
08dfd28ec0 More rendering bits. 2014-12-31 15:53:38 -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