Commit graph

38133 commits

Author SHA1 Message Date
Seth Alves
311e0cee67 Merge pull request #6820 from AndrewMeadows/collision-mask
use "collidesWith" instead of "collisionMask"
2016-01-21 09:13:34 -08:00
Brad Hefta-Gaub
61ab400131 Merge pull request #6881 from ctrlaltdavid/fix-connected-signal
Wire up missing GlobalServices.connected() signal
2016-01-21 09:06:35 -08:00
Eric Levin
0cfd9e429a Merge pull request #6872 from imgntn/messageTests
Add Messaging Tests and Organize
2016-01-21 09:05:23 -08:00
David Rowe
d7d4961778 Wire up missing GlobalServices.connected() signal 2016-01-21 20:58:14 +13:00
Philip Rosedale
fde13ae2e4 Merge pull request #6875 from imgntn/removesearchsphereonequip
Remove Search Sphere After Far Equip
2016-01-20 19:22:53 -08:00
Clément Brisset
9d97335a0e Merge pull request #6878 from birarda/audio-mixer-coma
add some debug for the next audio mixer coma
2016-01-20 19:07:51 -08:00
samcake
8d1ab01018 exposing one more parameter 2016-01-20 18:32:44 -08:00
Stephen Birarda
9c270822e4 Merge pull request #6873 from Atlante45/feat/default-dyn-jitter-buffer
Default dynamic jitter buffer to true on AM
2016-01-20 18:25:07 -08:00
Stephen Birarda
5e451360f7 add some debug for the next audio mixer coma 2016-01-20 18:22:37 -08:00
Stephen Birarda
0d47e812c8 fix typo in NSIS variable 2016-01-20 18:20:13 -08:00
Stephen Birarda
6daa34f164 fix component variable in NSIS template 2016-01-20 18:11:22 -08:00
Eric Levin
6f646dc193 Update weatherBox.js
Added header
2016-01-20 17:41:40 -08:00
Andrew Meadows
e77189fb1b keep reference to removed entity until next frame 2016-01-20 17:09:37 -08:00
Brad Hefta-Gaub
7919d7bc17 Merge pull request #6866 from jherico/menufix
Fixing overlay menu popup & some more QML cleanup
2016-01-20 16:58:21 -08:00
Stephen Birarda
13d6ec0b28 make the post install options read correct 2016-01-20 16:54:31 -08:00
ericrius1
3b75cbea3a removed old weather box 2016-01-20 16:32:30 -08:00
samcake
4e5869b247 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-20 16:30:24 -08:00
ericrius1
0ffcf437e9 Fix for transparent textures not being rendered with opacity 2016-01-20 16:22:49 -08:00
James B. Pollack
c2b5dfdfe6 clear sphere 2016-01-20 16:09:37 -08:00
Stephen Birarda
583feddac0 Merge pull request #75 from huffman/console-content-always
Update content downloader to always d/l if no content present
2016-01-20 16:03:23 -08:00
Ryan Huffman
36d725b67a Update content downloader to always d/l if no content present 2016-01-20 15:51:08 -08:00
Ryan Huffman
5784b81290 Merge pull request #74 from birarda/console-migrate-sm
add option to migrate Stack Manager content
2016-01-20 15:43:16 -08:00
Stephen Birarda
2d3e036102 Merge pull request #73 from huffman/console-log-rot
Add deletion of old log files
2016-01-20 15:38:08 -08:00
Ryan Huffman
b7e939bbdd Adjust console logs for deleting old files 2016-01-20 15:35:31 -08:00
Ryan Huffman
c31ceeca86 Add deletion of old log files 2016-01-20 15:35:30 -08:00
Stephen Birarda
fc3cee776f split directory debug into two lines 2016-01-20 15:35:29 -08:00
Stephen Birarda
f872dfac04 remove some unused variables 2016-01-20 15:31:23 -08:00
Stephen Birarda
d08a64a4d6 use a big try-catch for migration block 2016-01-20 15:25:58 -08:00
James B. Pollack
6f1ea9a3d3 cleanup 2016-01-20 15:20:59 -08:00
ericrius1
eb5a950f85 texture opacity potential fix 2016-01-20 15:08:39 -08:00
Stephen Birarda
6ec55dc746 only wait for state change for migration once 2016-01-20 15:06:46 -08:00
Stephen Birarda
430d1351db preserve timestamps for assets copy 2016-01-20 14:58:15 -08:00
Stephen Birarda
278ab0fa8f don't make the dialogs synchronous 2016-01-20 14:54:52 -08:00
Stephen Birarda
54c13efe6a add migration for stack manager content 2016-01-20 14:40:12 -08:00
samcake
0da4df93b8 Merge pull request #6860 from zzmp/refactor/cull-functor
Refactor ShouldRenderFunctor to be out of RenderArgs
Tested on windows, checking the values returned by the culling/visible/too small
Looks good
2016-01-20 14:25:42 -08:00
James B. Pollack
53b4a509f7 remove particle search beams and create / destroy systems on demand 2016-01-20 14:17:32 -08:00
ericrius1
055d56b9e5 lightning texture appearing> 2016-01-20 14:16:38 -08:00
Atlante45
fb60a048a5 Default dynamic jitter buffer to true on AM 2016-01-20 14:04:14 -08:00
James B. Pollack
a57ccdd0e8 messages 2016-01-20 13:37:58 -08:00
Zach Pomerantz
0a34ee9138 Externalize list sizing for render::cullItems 2016-01-20 12:39:27 -08:00
Stephen Birarda
289156f473 don't re-write exec name other than OS X 2016-01-20 12:27:17 -08:00
Stephen Birarda
5f21b1f35c cpack properties file must be setup after variables 2016-01-20 12:10:37 -08:00
Stephen Birarda
922f868abc use backticks for CMAKE_INSTALL_PREFIX` 2016-01-20 12:07:23 -08:00
Stephen Birarda
38f7591317 use backticks for target names 2016-01-20 12:07:00 -08:00
Ryan Huffman
92d2479b31 Correctly stop content set download when downloader window is closed 2016-01-20 12:02:45 -08:00
Ryan Huffman
0e31c79535 Update content set to lounge 2016-01-20 11:58:31 -08:00
ericrius1
44fd7e8c15 Model and lightning showing up 2016-01-20 11:57:33 -08:00
samcake
07c630bcda And cleaning again hopping to have the pr build 2016-01-20 11:44:01 -08:00
Stephen Birarda
1921aae08f add a simple INSTALL guide 2016-01-20 11:41:55 -08:00
Stephen Birarda
3e5448612a more tweaks to server console readme 2016-01-20 11:27:29 -08:00