Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-28 01:15:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
20619 commits 71 branches 56 tags 1.2 GiB
Commit graph

905 commits

Author SHA1 Message Date
David Rowe
d9bd7f019f Simplify bookmark handling 2015-01-14 22:20:45 -08:00
David Rowe
1ffe22d5e9 Sanitize bookmark names 2015-01-14 18:31:54 -08:00
David Rowe
da58d5a381 Delete Bookmark menu item and dialog box 2015-01-14 18:15:39 -08:00
David Rowe
a78ab5a5b3 Teleport to selected bookmark 2015-01-14 10:14:56 -08:00
David Rowe
01f7efe767 Remove ellipsis from Collide With menu item 
Noticed in passing.
 2015-01-13 22:48:05 -08:00
David Rowe
fa6faa771a Add bookmarks with Bookmark Location menu item 
The menu of bookmarks is kept sorted.
 2015-01-13 22:39:16 -08:00
Clément Brisset
5635ac3d7b Merge pull request #4090 from ctrlaltdavid/no-show-voxel-nodes 
Remove menu item for Show Voxel Nodes which is no longer available
 2015-01-13 17:06:58 -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
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
894c4c9d59 All dialogs in Menu are QPointers 2015-01-12 14:00:23 -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
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
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
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
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
a660e7efed Add output starve values to settings 2015-01-07 09:37:03 -08:00
ZappoMan
e0338dd787 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-06 16:42:25 -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
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
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
ZappoMan
7cf4bd1860 remove head mouse 2015-01-05 16:29:02 -08:00
Stephen Birarda
51bba4884f resolve conflicts on merge with upstream master 2015-01-05 14:40:48 -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
Stephen Birarda
dfb02aea0c resolve conflicts on merge, add cstring inc 2015-01-05 09:25:30 -08:00
Ryan Huffman
4a72a4be83 Add audio output buffer size to settings 2015-01-02 17:03:01 -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
ZappoMan
fbfa40e3c9 remove hair 2014-12-30 13:44:25 -08:00
Stephen Birarda
c7a5f3c86c resolve conflicts and merge with upstream master 2014-12-29 10:59:42 -07:00
Atlante45
879c3e2fd0 Add entity model upload 2014-12-23 12:30:00 -08:00
Stephen Birarda
9f21b41d3f updates for new DependencyManager API 2014-12-17 18:08:41 -08:00
Stephen Birarda
7beb3a7b62 resolve conflicts on merge with upstream master 2014-12-17 16:57:35 -08:00
Stephen Birarda
0429b338c0 remove last Audio ref to Menu, fix local/server echo 2014-12-16 16:02:41 -08:00
Stephen Birarda
e86c5ff683 remove Audio dependency on Menu 2014-12-16 15:45:17 -08:00
Atlante45
b2dac6f53f DM users update 2014-12-16 15:32:11 -08:00
Stephen Birarda
0fae699ed3 remove a couple of headers, fix mute bool call 2014-12-16 15:26:56 -08:00
Stephen Birarda
d9ab673442 hook menu calls up to AudioIOStreamStatsRenderer 2014-12-16 15:05:14 -08:00
Atlante45
11a2ecab56 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.cpp
	interface/src/entities/EntityTreeRenderer.h
	interface/src/ui/ApplicationOverlay.cpp
	libraries/render-utils/src/GlowEffect.cpp
	libraries/render-utils/src/Model.cpp
 2014-12-16 15:02:37 -08:00
Atlante45
4d1529f77b typedefs 2014-12-16 14:02:22 -08:00
Stephen Birarda
a9eaa4b9f7 more decoupling of Audio from Interface 2014-12-16 12:43:06 -08:00
Stephen Birarda
aeb273a882 move environment mute to Audio 2014-12-16 10:46:24 -08:00
Stephen Birarda
78edb94963 move address lookup errors to AddressBarDialog 2014-12-16 10:12:25 -08:00