David Rowe
|
5195ae2424
|
Merge branch 'master' into 20269
|
2015-01-15 11:01:17 -08:00 |
|
David Rowe
|
91e321565a
|
Change menu item text
|
2015-01-15 10:38:17 -08:00 |
|
Philip Rosedale
|
048d190350
|
Merge pull request #4108 from ctrlaltdavid/20263
CR for Job #20263 - Create a "Bookmarks" capability
|
2015-01-15 10:30:41 -08:00 |
|
Andrew Meadows
|
ff171a5782
|
Bullet is now required dependency
|
2015-01-15 10:27:43 -08:00 |
|
Philip Rosedale
|
67c3f9a3db
|
Merge pull request #4107 from huffman/fix-update-my-avatar
Fix issue with avatar data being sent too often
|
2015-01-15 10:22:18 -08:00 |
|
David Rowe
|
52876ecb16
|
Fix merge
|
2015-01-15 10:07:51 -08:00 |
|
David Rowe
|
95efe9857b
|
Merge branch 'master' into 20263
|
2015-01-15 09:52:19 -08:00 |
|
Ryan Huffman
|
00487fb175
|
Fix issue with avatar data being sent too often
|
2015-01-15 09:45:51 -08:00 |
|
David Rowe
|
544d412122
|
Add menu items that copy location address and location path
And Rename File > Go to File > Location
|
2015-01-15 09:33:35 -08:00 |
|
David Rowe
|
ebe80075dc
|
Tidy
|
2015-01-14 23:20:47 -08:00 |
|
David Rowe
|
426cd71fc6
|
Persist bookmarks to file
|
2015-01-14 22:58:13 -08:00 |
|
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 |
|
Stephen Birarda
|
79d214619d
|
update lobby for new places API
|
2015-01-14 18:18:26 -08:00 |
|
David Rowe
|
da58d5a381
|
Delete Bookmark menu item and dialog box
|
2015-01-14 18:15:39 -08:00 |
|
Thijs Wenker
|
8ffea45736
|
QFileDialog include
|
2015-01-15 02:59:37 +01:00 |
|
Thijs Wenker
|
80a81043ed
|
Merge branch 'master' of https://github.com/highfidelity/hifi into 20216
Conflicts:
interface/src/Menu.cpp
|
2015-01-15 02:28:31 +01:00 |
|
Stephen Birarda
|
ef87b59a0c
|
remove method declarations for location changes
|
2015-01-14 17:02:18 -08:00 |
|
Stephen Birarda
|
69869a696b
|
remove name this location call from application
|
2015-01-14 17:00:21 -08:00 |
|
Stephen Birarda
|
e5fe24e088
|
remove My Locations and Name This Location
|
2015-01-14 16:58:15 -08:00 |
|
Stephen Birarda
|
f745dfdb91
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-01-14 16:54:51 -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 |
|
Atlante45
|
48f1cbe644
|
Fixed QSharedPointer in connect()
|
2015-01-13 20:54:15 -08:00 |
|
Atlante45
|
476e2124b7
|
Moved DM::get() calls to auto
|
2015-01-13 20:51:02 -08:00 |
|
Atlante45
|
f77fab2fe0
|
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
|
2015-01-13 20:38:52 -08:00 |
|
Atlante45
|
38729c5790
|
Made dependencies inherit from Dependency
|
2015-01-13 20:38:01 -08:00 |
|
Atlante45
|
36db547c0f
|
Setup DependencyManager before any member of Application
|
2015-01-13 20:35:45 -08:00 |
|
David Rowe
|
7130c579f5
|
First pass at Bookmarks class
In-memory for starters.
|
2015-01-13 18:47:59 -08:00 |
|
Clément Brisset
|
3034b8f733
|
Merge pull request #4091 from ctrlaltdavid/20229
CR for Job #20229 - Expose the downloads section for models and metavoxels to javascript
|
2015-01-13 17:07:17 -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 |
|
Clément Brisset
|
aff0554a62
|
Merge pull request #4079 from thoys/fix-GetVersionEx-deprication-warnings
[WINDOWS ONLY] replaced GetVersionEx with new Version helpers to resolve deprecation warnings.
|
2015-01-13 17:06:26 -08:00 |
|
Stephen Birarda
|
6d2c87c7a3
|
put current domain hostname if no place name present
|
2015-01-13 15:15:39 -08:00 |
|
Stephen Birarda
|
6e1ba17c6e
|
handle application title change for place name change
|
2015-01-13 15:07:45 -08:00 |
|
Stephen Birarda
|
92b8cd2d1e
|
handle storage of user location in new format
|
2015-01-13 15:02:04 -08:00 |
|
Stephen Birarda
|
16261a5fc1
|
more updates for new place/location APIs
|
2015-01-13 14:49:24 -08:00 |
|
Atlante45
|
4429e144f4
|
Fix merge accidental code delete
|
2015-01-13 11:10:13 -08:00 |
|
Atlante45
|
2a82ff9768
|
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
Conflicts:
assignment-client/src/voxels/VoxelServer.cpp
interface/src/Application.cpp
interface/src/Audio.cpp
interface/src/DatagramProcessor.cpp
interface/src/Menu.cpp
interface/src/Util.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/ui/ApplicationOverlay.cpp
interface/src/ui/PreferencesDialog.cpp
libraries/networking/src/NodeList.cpp
libraries/shared/src/DependencyManager.h
|
2015-01-13 11:03:14 -08:00 |
|
Atlante45
|
cf7089e145
|
Move constant back to Menu
|
2015-01-12 18:49:05 -08:00 |
|
Atlante45
|
9ce405a744
|
Text3DOverlay forward definition
|
2015-01-12 17:46:38 -08:00 |
|
Atlante45
|
7d39b45f16
|
Hopefully fixes the windows compile error
|
2015-01-12 17:34:07 -08:00 |
|
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 |
|
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 |
|