Commit graph

55643 commits

Author SHA1 Message Date
Menithal
c2c1e607c0 Formating 2017-06-13 20:31:41 +03:00
Menithal
395cc55fb2 Fixed formatting 2017-06-13 20:20:54 +03:00
Menithal
020760cc97 21324: Fixed accidental inccorect bracket 2017-06-13 20:16:56 +03:00
Menithal
00701eb5c7 Merge remote-tracking branch 'origin/master' into 21324 2017-06-13 19:08:37 +03:00
Menithal
0edb763dac 21324: Formatting and PR Feedback Changes 2017-06-13 19:06:47 +03:00
Brad Hefta-Gaub
77a6ecfdaa Merge pull request #10618 from kencooke/nvtt-optimized-gamma
Optimized NVTT library with fast gamma conversion
2017-06-05 16:24:09 -07:00
Clément Brisset
67970182aa Merge pull request #10579 from AndrewMeadows/fix-generateBasisVectors
Fix generateBasisVectors() helper
2017-06-05 14:47:18 -07:00
Brad Hefta-Gaub
51e00b9de9 Merge pull request #10614 from samcake/brown
Introduce a stencil mask pass in the rendering to optimize HMD
2017-06-05 14:14:11 -07:00
Seth Alves
dcbd279bd8 Merge pull request #10589 from vladest/create_in_landscape
Implements landscape mode for tablet as rotation instead of stretching [DO NOT MERGE]
2017-06-05 12:46:03 -07:00
Ken Cooke
45db8c3bef Rebase optimizations on NVTT 2.1.0 instead of master 2017-06-05 11:18:54 -07:00
Andrew Meadows
85a1e1d691 Merge pull request #10608 from ctrlaltdavid/21379
Fix icon for polylines in entities editor properties page
2017-06-05 11:06:23 -07:00
Andrew Meadows
793ed1313d change variable name for more readable code 2017-06-05 10:30:52 -07:00
Andrew Meadows
6970576bb8 use helper constants in helper code 2017-06-05 08:54:05 -07:00
Andrew Meadows
205e5d7309 add unit tests and fix final bugs 2017-06-05 08:54:05 -07:00
Andrew Meadows
506f522802 use correct format for float literals 2017-06-05 08:54:05 -07:00
Andrew Meadows
1621d31a8e cleanup usage of GLMHelpers::generateBasisVectors() 2017-06-05 08:54:05 -07:00
Andrew Meadows
81764f0f71 fix GLMHelpers::generateBasisVectors() 2017-06-05 08:54:05 -07:00
Andrew Meadows
347104204e fix StorageTests on linux 2017-06-05 08:54:05 -07:00
Ken Cooke
024499bdc4 Optimized NVTT library with fast gamma conversion 2017-06-04 12:59:15 -07:00
Menithal
4842de8f07 Fixed issue with orientation 2017-06-04 00:03:14 +03:00
Sam Cake
d38a396e9d Fixing warning 2017-06-03 08:59:47 -07:00
samcake
f70702beb7 Introducing debug flags 2017-06-02 17:54:41 -07:00
Clément Brisset
0a864a7ce9 Merge pull request #10570 from ctrlaltdavid/21376
Move record script files to unpublishedScripts directory
2017-06-02 16:25:56 -07:00
manapa01
8e1577d3d3 Merge pull request #10596 from manapa01/Snapshot-Sound
Snapshot sound
2017-06-02 16:07:05 -07:00
Patrick Manalich
0b2de18e8e Volume Change 2017-06-02 16:04:03 -07:00
Clément Brisset
c636922a5d Merge pull request #10590 from huffman/fix/running-marker
Update server-console to watch interface via pid rather than marker
2017-06-02 15:57:44 -07:00
Clément Brisset
5f91d2dcb7 Merge pull request #10569 from ctrlaltdavid/21312
Improve positioning of assets when added / imported
2017-06-02 15:45:18 -07:00
samcake
0a3c1712eb Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-02 14:35:05 -07:00
Seth Alves
142739eec7 Merge pull request #10602 from AndrewMeadows/simulation-ownership-002
fixes for some simulation ownership problems
2017-06-02 14:23:19 -07:00
Patrick Manalich
76901f5bf9 Final Application.cpp change 2017-06-02 14:08:56 -07:00
Ryan Huffman
a5296d50fc Replace static use of qApp with QCoreApplication 2017-06-02 13:51:39 -07:00
Ryan Huffman
c0bca73ec7 Merge pull request #10606 from huffman/feat/startup-went-to-event
Add startup_sent_to user activity event
2017-06-02 13:49:41 -07:00
Chris Collins
34201ea1da Merge pull request #10599 from jherico/ktx_cache_wipe
Add versioning support to the KTX cache
2017-06-02 13:02:18 -07:00
Sam Gateau
8a2837e1f7 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-02 11:52:11 -07:00
Andrew Meadows
d480123e93 Merge pull request #10555 from ctrlaltdavid/21372
Make stopwatch buttons work properly
2017-06-02 11:27:27 -07:00
David Rowe
58c4a2f12a Fix icon for polylines in entities editor properties page 2017-06-03 06:26:13 +12:00
Brad Davis
1f95daf5c1 Add dev menu option to wipe KTX cache on next launch 2017-06-02 11:19:43 -07:00
Ryan Huffman
0d96f82888 Merge pull request #10592 from birarda/close-report
Send a close event to API on shutdown
2017-06-02 10:57:41 -07:00
Patrick Manalich
1f478bdf13 Repair Application.cpp 2017-06-02 10:44:58 -07:00
Patrick Manalich
a705e722f1 Ctrl-S sound feature added 2017-06-02 10:35:57 -07:00
Patrick Manalich
0c71cf4bda Edit: Snapshot will make sound when initially clicked 2017-06-02 10:24:27 -07:00
Patrick Manalich
4e61db8263 Snapshot will make sound when initially clicked 2017-06-02 10:24:27 -07:00
Ryan Huffman
0fdbf4a342 Add startup_sent_to user activity event 2017-06-02 09:59:29 -07:00
Vladyslav Stelmakhovskyi
8068e7201d Fix position after rotation. May be fix rotation in HMD mode 2017-06-02 18:58:18 +02:00
Seth Alves
bc2311cb35 Merge pull request #10561 from AndrewMeadows/sanity-check-physics
fix crash in EntityMotionState::handleDeactivation()
2017-06-02 09:55:20 -07:00
David Kelly
70b6236890 Merge pull request #10605 from davidkelly/dk/analyticsForBubble
Add UserActivity calls for bubble usage
2017-06-02 09:48:15 -07:00
David Kelly
2feea16063 added comment 2017-06-02 09:47:03 -07:00
Seth Alves
f47a49e631 Merge pull request #10597 from druiz17/record-standard
Saved recording are officially g zipped and pose are played back to the standard endpoint
2017-06-02 09:44:03 -07:00
Ryan Huffman
de2f8bd944 Add clarifying comment to use of kill in isProcessRunning 2017-06-02 08:58:35 -07:00
David Kelly
4dae77cd9d make sure we dont log the initial call to onBubbleToggled 2017-06-02 08:45:02 -07:00