Atlante45
|
98fc1836d8
|
Revert "Use QDickCache for every QNAM"
This reverts commit 2f39b93823 .
|
2015-01-27 18:09:22 -08:00 |
|
Andrew Meadows
|
026c39e010
|
Merge pull request #4131 from Atlante45/pull_out_menu_mess
Settings - Part I
|
2015-01-27 16:23:23 -08:00 |
|
Atlante45
|
71b565c33c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess
Conflicts:
interface/src/Application.cpp
|
2015-01-27 01:21:33 -08:00 |
|
Andrzej Kapolka
|
23f9c799dd
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-01-23 18:20:14 -08:00 |
|
Andrzej Kapolka
|
bc0fa0ed24
|
Push granularity option down the line in preparation for selectively
increasing resolution.
|
2015-01-23 13:58:51 -08:00 |
|
ZappoMan
|
3c38a9eb53
|
add last simulated to the protocal
|
2015-01-23 13:32:38 -08:00 |
|
Atlante45
|
2f39b93823
|
Use QDickCache for every QNAM
|
2015-01-21 11:12:11 -08:00 |
|
Atlante45
|
e1725d1eee
|
Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess
|
2015-01-20 17:41:08 -08:00 |
|
Atlante45
|
8d37f5ae00
|
More setting handles
|
2015-01-20 15:35:22 -08:00 |
|
Stephen Birarda
|
cd23876afc
|
fix QHttpMultiPart destroy from AccountManager
|
2015-01-20 11:00:08 -08:00 |
|
Stephen Birarda
|
a66888939c
|
add some debugging for domain switch
|
2015-01-20 10:51:11 -08:00 |
|
Stephen Birarda
|
483d072709
|
handle override path from address bar
|
2015-01-20 10:47:57 -08:00 |
|
Atlante45
|
6a00dcbf0a
|
More switches to new Settings
|
2015-01-20 00:30:29 -08:00 |
|
Andrzej Kapolka
|
f8f9c25d38
|
Back to JPG compression for heightfield colors.
|
2015-01-19 14:59:28 -08:00 |
|
Atlante45
|
43597ea29d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess
Conflicts:
interface/src/Application.cpp
interface/src/Menu.cpp
|
2015-01-19 14:18:22 -08:00 |
|
Brad Hefta-Gaub
|
215e3b732e
|
Merge pull request #4134 from ey6es/metavoxels
Big ol' metavoxel update. Mostly the switch to "stack" representation for dual contour data, but also includes some heightfield fixes.
|
2015-01-19 14:06:02 -08:00 |
|
Stephen Birarda
|
990ca8397e
|
add extra debugging for AddressManager connect to domain
|
2015-01-19 10:23:05 -08:00 |
|
Atlante45
|
967028e5cf
|
Removed more QSettings references
|
2015-01-18 19:29:27 -08:00 |
|
Atlante45
|
df69466887
|
Moved copyPath/Address out of Menu
Moved into AddressManager
|
2015-01-18 05:48:14 -08:00 |
|
Andrzej Kapolka
|
b6c843497d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2015-01-16 11:56:04 -08:00 |
|
Stephen Birarda
|
6f5d9d54ec
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-01-15 14:15:38 -08:00 |
|
Stephen Birarda
|
250a3de9fe
|
make node mutex in LimitedNodeList recursive for double read lock
|
2015-01-15 13:34:33 -08:00 |
|
Stephen Birarda
|
e538669343
|
resolve conflicts on merge with upstream
|
2015-01-15 13:12:05 -08:00 |
|
Stephen Birarda
|
b8b5b2b6ec
|
don't check the root object for path
|
2015-01-14 16:56:49 -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 |
|
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 |
|
Stephen Birarda
|
1af87e57da
|
handle new places API format in AddressManager
|
2015-01-13 14:21:07 -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
|
b6ba82653f
|
Remove glm dependency
|
2015-01-12 17:00:39 -08:00 |
|
Atlante45
|
80af2adf12
|
Remove constexpr because windows can't handle them
|
2015-01-12 16:42:27 -08:00 |
|
Atlante45
|
8415098fc2
|
Set different caches size depending on cache type
|
2015-01-12 15:36:36 -08:00 |
|
Atlante45
|
e70e435dcc
|
Added Min/Max values for cache size
|
2015-01-12 12:45:13 -08:00 |
|
Andrzej Kapolka
|
cad8313e56
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2015-01-12 12:00:20 -08:00 |
|
Atlante45
|
81bf1e4f53
|
Some code maintainance
|
2015-01-12 11:46:38 -08:00 |
|
Atlante45
|
bad96e0ba4
|
cache size getter/setter
|
2015-01-12 11:37:42 -08:00 |
|
Atlante45
|
ea0ffd0125
|
Introduce reserveUnusedResource
|
2015-01-12 11:37:00 -08:00 |
|
Atlante45
|
cb3f07e6f5
|
Remove unusedResourcesMaxCount
|
2015-01-12 11:18:55 -08:00 |
|
Atlante45
|
5cdc76ad35
|
Put cache max size/count as class members
|
2015-01-11 22:48:42 -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 |
|
Atlante45
|
02b9aaacf8
|
Bump packet version
|
2015-01-09 11:16:58 -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
|
441a1e4fee
|
Turns out windows doesn't like constexpr
|
2015-01-08 18:35:23 -08:00 |
|
Atlante45
|
ea832cfd45
|
Added constant
|
2015-01-08 17:33:47 -08:00 |
|
Atlante45
|
77e4a2ef35
|
Add byte limit to chaches
|
2015-01-08 17:06:05 -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 |
|
Atlante45
|
af9525ed33
|
Bump AvatarData packet number
|
2015-01-08 11:49:39 -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 |
|