Brad Hefta-Gaub
|
e5ac3eeea7
|
Merge pull request #10548 from NeetBhagat/21255
On Oculus Rift on/off, switch automatically to/from desktop mode
|
2017-06-06 18:05:56 -07:00 |
|
David Kelly
|
06527ac0a2
|
Merge pull request #10611 from davidkelly/dk/4873
protect _text member of Text3DOverlay with mutex
|
2017-06-06 16:50:57 -07:00 |
|
Brad Davis
|
171d3212fe
|
Merge pull request #10623 from jherico/qml_engine_singleton
Migrate to single QML engine
|
2017-06-06 15:00:43 -07:00 |
|
Stephen Birarda
|
0ccd0d3fd6
|
Merge pull request #10621 from highfidelity/stable
Merge Stable back into Master
|
2017-06-06 10:39:03 -07:00 |
|
NeetBhagat
|
c3621d7c32
|
Resolved two issues:
1) While in HMD mode -> open Tablet -> Click Desktop. Desktop mode will be on.
2) Menu sync problem while switching modes.
|
2017-06-06 22:31:14 +05:30 |
|
NeetBhagat
|
ae9a928740
|
Merge branch 'master' into 21255
# Conflicts:
# interface/src/Application.cpp
|
2017-06-06 19:06:50 +05:30 |
|
Bradley Austin Davis
|
995fe11c05
|
Migrate to single QML engine
|
2017-06-05 15:14:44 -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 |
|
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 |
|
Chris Collins
|
6cc6cd3bf6
|
Merge pull request #10604 from highfidelity/RC-42
Beta Release 42 - Includes up to Developer Release 6626
|
2017-06-05 09:13:19 -07:00 |
|
Ryan Huffman
|
52c60b35df
|
Add startup_sent_to user activity event
|
2017-06-02 17:57:40 -07:00 |
|
manapa01
|
8e1577d3d3
|
Merge pull request #10596 from manapa01/Snapshot-Sound
Snapshot sound
|
2017-06-02 16:07:05 -07:00 |
|
David Kelly
|
12cbc206d2
|
cr feedback
|
2017-06-02 15:59:15 -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 |
|
David Kelly
|
9b34abeb40
|
oops initializer order...
|
2017-06-02 15:43:29 -07:00 |
|
David Kelly
|
f9e1f02888
|
protect _text member of Text3DOverlay with mutex
|
2017-06-02 14:59:27 -07:00 |
|
samcake
|
0a3c1712eb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-06-02 14:35:05 -07:00 |
|
Patrick Manalich
|
76901f5bf9
|
Final Application.cpp change
|
2017-06-02 14:08:56 -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 |
|
Stephen Birarda
|
d89febac71
|
use a sleep instead of a yield waiting for close event
|
2017-06-02 13:22:02 -07:00 |
|
Stephen Birarda
|
e3d8229abe
|
rename ClosureEventSender to CloseEventSender
|
2017-06-02 13:21:55 -07:00 |
|
Stephen Birarda
|
ecc697dbe1
|
remove crash event definition for now
|
2017-06-02 13:21:45 -07:00 |
|
Stephen Birarda
|
40dfcb1e6e
|
send quit event during shutdown on thread, with timeout
|
2017-06-02 13:21:37 -07:00 |
|
Stephen Birarda
|
f5d732f332
|
initial version of the ClosureEventSender using std::thread
|
2017-06-02 13:21:28 -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 |
|
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 |
|
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 |
|
NeetBhagat
|
6228ff19bf
|
Resolve the reviewed comments of @ZappoMan
|
2017-06-02 15:23:21 +05:30 |
|
Sam Cake
|
f9aa400b95
|
Refining the stencil configuration and triggering only in hmd mode
|
2017-06-02 00:22:38 -07:00 |
|
NeetBhagat
|
e08c3453a4
|
Merge branch 'master' into 21255
|
2017-06-02 12:36:07 +05:30 |
|
Brad Davis
|
9a80a81321
|
Merge pull request #10565 from vladest/fix_claraio_download_clones
Make sure that there is only one connection created for web events, s…
|
2017-06-01 20:42:50 -07:00 |
|
Ryan Huffman
|
86da91ac8d
|
Remove the runningMarker timer
|
2017-06-01 18:19:13 -07:00 |
|
Stephen Birarda
|
6a89726a6a
|
Merge pull request #10593 from birarda/log-api-session-id
print the metaverse session ID to the debug log
|
2017-06-01 18:02:17 -07:00 |
|
Stephen Birarda
|
6d1bbc389d
|
use a sleep instead of a yield waiting for close event
|
2017-06-01 17:57:23 -07:00 |
|
Stephen Birarda
|
9fad8d1821
|
rename ClosureEventSender to CloseEventSender
|
2017-06-01 17:52:01 -07:00 |
|
Stephen Birarda
|
0f22b07026
|
move session ID logging later in app startup
|
2017-06-01 16:07:36 -07:00 |
|
anshuman64
|
694d1d042d
|
Merge pull request #10573 from druiz17/head-puck
Added head puck configuration
|
2017-06-01 16:06:00 -07:00 |
|
Stephen Birarda
|
c513d04b52
|
remove crash event definition for now
|
2017-06-01 13:40:50 -07:00 |
|
Stephen Birarda
|
792d938262
|
send quit event during shutdown on thread, with timeout
|
2017-06-01 13:01:24 -07:00 |
|
Ryan Huffman
|
aaf9b9ac7f
|
Update server-console to watch interface via pid rather than marker
|
2017-06-01 11:20:36 -07:00 |
|
David Kelly
|
b6b2f92af2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/5028
|
2017-06-01 09:58:07 -07:00 |
|
David Kelly
|
f79c9ea021
|
we can sort on ignored
|
2017-06-01 07:29:31 -07:00 |
|