Commit graph

45626 commits

Author SHA1 Message Date
Ryan Huffman
8ba105d1e4 Fix open-log-dir button handler 2016-08-17 09:36:42 -07:00
Ryan Huffman
0e259dcd29 Add open log dir button to server-console 2016-08-17 09:29:45 -07:00
James B. Pollack
4c663b9d18 Merge pull request #8416 from SamGondelman/shaderFix
Don't always mark procedural shaders dirty
2016-08-11 22:49:46 -07:00
Stephen Birarda
3ec1681a4e Merge pull request #8412 from birarda/default-permissions
default DS to allow connect for standard groups
2016-08-11 15:14:52 -07:00
Brad Hefta-Gaub
ea1e090053 Merge pull request #8383 from AndrewMeadows/faster-is-better
faster image processing on load
2016-08-11 13:10:44 -07:00
SamGondelman
0f988fb209 don't always mark _shaderDirty when user data changes unless url actually changes 2016-08-11 13:05:16 -07:00
James B. Pollack
6da2ea1932 Merge pull request #8409 from SamGondelman/loadingFade
Fix procedural entity transparency
2016-08-11 12:02:57 -07:00
Stephen Birarda
5bac88c004 default domain-server permissions to connect for standard 2016-08-11 10:52:36 -07:00
SamGondelman
d8545bc7a3 fix procedural transparency 2016-08-10 13:49:35 -07:00
Brad Hefta-Gaub
5bd5fc43d3 Merge pull request #8408 from SamGondelman/miniMirrorFade
Mini mirror fades with overlays
2016-08-10 11:07:47 -07:00
Brad Hefta-Gaub
a714f325fe Merge pull request #8333 from SamGondelman/miscFixes
Miscellaneous cmake and render engine improvements
2016-08-10 11:06:50 -07:00
SamGondelman
e35d453b37 ...missing space 2016-08-10 10:36:37 -07:00
SamGondelman
9e20d92241 CR changes 2016-08-10 10:35:18 -07:00
Brad Hefta-Gaub
7503a495fd Merge pull request #8401 from ctrlaltdavid/21026
Fix crash when adding new attachment
2016-08-10 09:18:17 -07:00
Brad Hefta-Gaub
9874c63b25 Merge pull request #8398 from zzmp/refactor/system-html
refactor system html to split js/css
2016-08-10 09:17:52 -07:00
Brad Hefta-Gaub
d736857ecb Merge pull request #8391 from AlexanderOtavka/qml-atp
Add support for ATP protocol to QML
2016-08-10 09:16:20 -07:00
SamGondelman
50a4c8b496 mini mirror fades with overlays 2016-08-09 18:02:56 -07:00
Brad Hefta-Gaub
412052c285 Merge pull request #8380 from highfidelity/fade
Add fade in loading effect
2016-08-09 16:50:05 -07:00
Brad Hefta-Gaub
8abbe27c07 Merge pull request #8387 from SamGondelman/mappingFixes
Fix Standard.A/B/X/Y primary thumb JSON mappings
2016-08-09 16:43:45 -07:00
Brad Hefta-Gaub
657dc530b4 Merge pull request #8399 from SamGondelman/xboxFixes
Teleport works with xbox controllers
2016-08-09 16:41:37 -07:00
SamGondelman
2360e90d39 simplify valid check for rotation 2016-08-09 15:48:31 -07:00
David Rowe
8e56e0bf18 Fix QML warning 2016-08-10 10:41:37 +12:00
David Rowe
afe76c69d2 Fix crash when adding new attachment 2016-08-10 10:41:16 +12:00
Zach Pomerantz
d5b822ddbe remove missing camera selectors 2016-08-09 15:23:36 -07:00
Zach Pomerantz
6965fb0520 refactor system html to split js/css 2016-08-09 15:23:31 -07:00
SamGondelman
956078bc91 teleport works with xbox controller 2016-08-09 15:17:36 -07:00
SamGondelman
9b27f8bc0f Merge remote-tracking branch 'upstream/master' into loadingFade 2016-08-09 14:55:14 -07:00
Ryan Huffman
093d80e102 Merge pull request #8397 from SamGondelman/ucharWarning
Fix warning on OSX/Linux
2016-08-09 14:31:16 -07:00
SamGondelman
5a4d15dd5b fix warning 2016-08-09 14:02:42 -07:00
SamGondelman
36d9f92101 performance optimization to minimize calling usecTimestampNow 2016-08-09 13:10:02 -07:00
Brad Hefta-Gaub
a2c0d515e8 Merge pull request #8388 from hyperlogic/feature/eslint-anon-func
eslintrc: accept spaces after function keyword in anonymous functions
2016-08-09 12:43:00 -07:00
Brad Hefta-Gaub
75edb74db4 Merge pull request #8386 from imgntn/edit_1_property_order
Edit.js - change spatial property order and cleanup
2016-08-09 12:42:20 -07:00
Brad Hefta-Gaub
1834b035d7 Merge pull request #8382 from ctrlaltdavid/21024
Disable Asset Browser's right-click popup menu if in HMD mode
2016-08-09 12:41:48 -07:00
Zander Otavka
51fb52977e Generalize atp handling in network access managers 2016-08-09 11:46:08 -07:00
Brad Hefta-Gaub
d8f1847fde Merge pull request #8365 from huffman/feat/default-skybox
Default skybox change
2016-08-09 11:17:36 -07:00
Brad Hefta-Gaub
beaa1e107f Merge pull request #8392 from AlexanderOtavka/log-spam
Suppress repeated ice server connection messages
2016-08-09 11:17:16 -07:00
Brad Hefta-Gaub
d8edf5c85a Merge pull request #8357 from sethalves/fsm-arrows-dont-walk
FSM arrow keys don't make the avatar walk
2016-08-09 11:17:00 -07:00
Andrew Meadows
85d87fe13f Merge pull request #8218 from huffman/feat/load-improvements
Speed up gamma correction in cube map processing
2016-08-09 11:10:36 -07:00
SamGondelman
ae9fb3768c CR notes 2016-08-08 17:45:25 -07:00
Zander Otavka
3df8aa0dba Suppress repeated ice server connection messages 2016-08-08 17:01:32 -07:00
Ryan Huffman
8ee3f680c9 Change default skybox ambient intensity from 3.5 to 2.0 2016-08-08 16:03:03 -07:00
Ryan Huffman
6854f9fda4 Remove stars shaders and renderable 2016-08-08 16:03:03 -07:00
Ryan Huffman
eaa77edc25 Replace 'Stars' menu option with 'Default Skybox' 2016-08-08 16:03:03 -07:00
Ryan Huffman
36744d72d6 Fix warning using init list for QVariantMap 2016-08-08 16:03:03 -07:00
Ryan Huffman
9cbfe195cd Adjust commenting out of old stars rendering code 2016-08-08 16:03:03 -07:00
Ryan Huffman
4c662b0d60 Add static consts for default skybox values 2016-08-08 16:03:03 -07:00
Ryan Huffman
c47a5c5aad Add default skybox images 2016-08-08 16:03:03 -07:00
Ryan Huffman
5b69ca03f0 Move default skybox out of global and make irradiance gen optional 2016-08-08 16:03:03 -07:00
Ryan Huffman
35ea9908cd Add default skybox 2016-08-08 16:00:58 -07:00
Brad Hefta-Gaub
55c690d016 Merge pull request #8368 from huffman/feat/domain-connection-display
Automatically show address bar after disconnected for X seconds
2016-08-08 15:56:29 -07:00