Zach Pomerantz
|
be489e8728
|
Codify qt qml version in one header
|
2016-04-07 17:35:31 -07:00 |
|
Brad Hefta-Gaub
|
d79d66c34e
|
Merge pull request #7601 from ctrlaltdavid/20871
Entities editor fixes
|
2016-04-07 17:14:00 -07:00 |
|
Brad Hefta-Gaub
|
5287c174b4
|
Merge pull request #7605 from jherico/route_log_errors
Fixing logging errors on initial load of controller routes
|
2016-04-07 17:13:13 -07:00 |
|
David Rowe
|
86d314f31a
|
Clarify code comment
|
2016-04-08 10:47:45 +12:00 |
|
Brad Hefta-Gaub
|
3d94558d6b
|
Merge pull request #7589 from jherico/oculus_input
Support oculus remote input
|
2016-04-07 15:05:45 -07:00 |
|
Brad Hefta-Gaub
|
157dd96303
|
Merge pull request #7612 from ZappoMan/mirrorReturnsToLastView
when using the fullscreen mirror hot key, return to the view mode you were in when leaving full screen mirror
|
2016-04-07 14:56:53 -07:00 |
|
Brad Davis
|
d3f5f6ed00
|
Merge pull request #7609 from ZappoMan/reduceLogSpam
reduce log spam for the deadlock watchdog
|
2016-04-07 14:51:02 -07:00 |
|
Brad Hefta-Gaub
|
772e7b95f6
|
Merge pull request #7584 from zzmp/log/dep-is-set
Avoid warning for expected unset PresentThread
|
2016-04-07 14:47:56 -07:00 |
|
Brad Hefta-Gaub
|
e7d75cb22e
|
Merge pull request #7573 from sethalves/update-collision-hulls-of-avatar-children
Update collision hulls of avatar children
|
2016-04-07 14:47:44 -07:00 |
|
Brad Davis
|
72d8990fed
|
Fix menu launch from Oculus remote
|
2016-04-07 14:13:02 -07:00 |
|
Brad Hefta-Gaub
|
d1a2a30c02
|
fix build buster
|
2016-04-07 13:41:05 -07:00 |
|
Brad Hefta-Gaub
|
09004680d0
|
handle a couple edge cases
|
2016-04-07 13:32:26 -07:00 |
|
Brad Davis
|
2f28c64edb
|
Fixing menu navigation in oculus remote
|
2016-04-07 13:21:00 -07:00 |
|
Brad Davis
|
a58a627fdf
|
Support oculus remote input
|
2016-04-07 13:20:59 -07:00 |
|
Brad Davis
|
4c78c0b330
|
Fix broken xbox controllers
|
2016-04-07 13:17:49 -07:00 |
|
Seth Alves
|
45733478da
|
make auto-unequip code smarter -- equipping a long thing by the end is now possible
|
2016-04-07 13:15:39 -07:00 |
|
Brad Hefta-Gaub
|
81bb5ff07d
|
when using the fullscreen mirror hot key, return to the view mode you were in when leaving full screen mirror
|
2016-04-07 13:13:19 -07:00 |
|
Brad Hefta-Gaub
|
bd1eb5842a
|
fix crash related to menu vs watchdog create order
|
2016-04-07 12:45:24 -07:00 |
|
Brad Hefta-Gaub
|
f3275b680b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into reduceLogSpam
|
2016-04-07 12:10:15 -07:00 |
|
Brad Hefta-Gaub
|
dc4751a95b
|
Merge pull request #7595 from ZappoMan/depthReticleWork
Fix a random case of the depth reticle hiding when it shouldn't
|
2016-04-07 12:06:20 -07:00 |
|
Brad Davis
|
d8310cc6b1
|
Reduce controller log spam
|
2016-04-07 10:41:55 -07:00 |
|
Brad Davis
|
85019b2b5e
|
Fixing logging errors on initial load of controller routes
|
2016-04-07 10:41:54 -07:00 |
|
Brad Hefta-Gaub
|
2c3aeddbe4
|
reduce log spam for the deadlock watchdog
|
2016-04-07 10:25:08 -07:00 |
|
Seth Alves
|
8158d34b20
|
Merge branch 'master' of github.com:highfidelity/hifi into update-collision-hulls-of-avatar-children
|
2016-04-07 09:59:49 -07:00 |
|
Brad Hefta-Gaub
|
50a081db00
|
Merge pull request #7596 from jherico/texture_transfer_fix
Move the texture transfer context back to the main thread for shutdown
|
2016-04-07 09:31:42 -07:00 |
|
Brad Hefta-Gaub
|
ce1625b551
|
Merge pull request #7600 from sethalves/fix-entity-script-error-message
attempt to make the failed-to-load-entity-script error-message be more helpful
|
2016-04-07 09:17:04 -07:00 |
|
Brad Hefta-Gaub
|
94e797d752
|
Merge pull request #7585 from zzmp/log/failed-routes
Log failed routes
|
2016-04-07 09:16:26 -07:00 |
|
Brad Hefta-Gaub
|
e78b202433
|
Merge pull request #7602 from ZappoMan/default1PView
default to first person view
|
2016-04-07 09:16:04 -07:00 |
|
Brad Hefta-Gaub
|
7f164a7959
|
CR feedback
|
2016-04-07 08:42:40 -07:00 |
|
Brad Hefta-Gaub
|
07a508f3ac
|
Merge pull request #7604 from ZappoMan/loginRedraw
fix redraw issue when logging in to or out of a domain
|
2016-04-07 08:30:59 -07:00 |
|
Ryan Huffman
|
254f7675d1
|
Merge pull request #7608 from ctrlaltdavid/fix-edit-checkboxes
Fix checkbox being clickable outside of checkbox and label extents
|
2016-04-07 08:22:22 -07:00 |
|
Brad Hefta-Gaub
|
986b4bea7c
|
Merge pull request #7603 from zzmp/fix/entities-thread-crash
Fix intermittent crash on exit
|
2016-04-07 08:21:51 -07:00 |
|
Brad Hefta-Gaub
|
384ead8e4e
|
Merge pull request #7599 from howard-stearns/restore-text3d-overlay
Restore text3d overlay
|
2016-04-07 08:21:28 -07:00 |
|
David Rowe
|
fd7a6ed042
|
Fix checkbox being clickable outside of checkbox and label extents
|
2016-04-07 17:20:40 +12:00 |
|
Brad Hefta-Gaub
|
cef599eaed
|
Merge pull request #7586 from zzmp/log/failed-menu
Log failed MenuUserData::forObject
|
2016-04-06 19:44:05 -07:00 |
|
Brad Hefta-Gaub
|
cea622f6f1
|
Merge pull request #7571 from howard-stearns/sandbox-entity-includes
Sandbox entity includes
|
2016-04-06 19:11:25 -07:00 |
|
Brad Hefta-Gaub
|
89a7b5f731
|
Merge pull request #7548 from ericrius1/roomAudio
Add examples for entity scripts that set up audio reverb zones
|
2016-04-06 19:09:09 -07:00 |
|
Brad Hefta-Gaub
|
bfc96d277c
|
Merge pull request #7577 from birarda/domain-base64
migrate domain-server basic auth to use SHA256 hash
|
2016-04-06 19:08:52 -07:00 |
|
Brad Hefta-Gaub
|
4f1de77946
|
Merge pull request #7581 from birarda/suppress-more
suppress a couple more noisy messages in AudioRingBuffer
|
2016-04-06 19:08:23 -07:00 |
|
Brad Hefta-Gaub
|
5f4d6ca1d3
|
CR feedback
|
2016-04-06 19:07:26 -07:00 |
|
Clément Brisset
|
680ab1e38b
|
Merge pull request #7578 from zzmp/fix/delete-resource-later
Delete resource the Qt way
|
2016-04-06 17:17:47 -07:00 |
|
Brad Hefta-Gaub
|
40e53baa79
|
Merge pull request #7597 from Atlante45/fix/script-sound-hold-strong-ref
Fix audio injectors not working
|
2016-04-06 16:57:29 -07:00 |
|
Seth Alves
|
30d6734253
|
Merge branch 'master' of github.com:highfidelity/hifi into update-collision-hulls-of-avatar-children
|
2016-04-06 16:42:27 -07:00 |
|
Seth Alves
|
5375fdd0f0
|
don't do simple kinematic simulation on things that have parents
|
2016-04-06 16:42:14 -07:00 |
|
Zach Pomerantz
|
06e827cb5e
|
Guard against no script engine thread affinity
|
2016-04-06 15:41:13 -07:00 |
|
howard-stearns
|
f35c59ce5f
|
Guard against meaningless query and fragment parts.
|
2016-04-06 15:21:43 -07:00 |
|
Brad Hefta-Gaub
|
47aed9c8bd
|
fix redraw issue when logging in to or out of a domain
|
2016-04-06 14:56:20 -07:00 |
|
Zach Pomerantz
|
4300f2e415
|
Delete resource the Qt way
|
2016-04-06 14:43:48 -07:00 |
|
Seth Alves
|
672b4df7c1
|
get rid of magic number
|
2016-04-06 13:36:44 -07:00 |
|
Brad Hefta-Gaub
|
1f708ccb57
|
default to first person view
|
2016-04-06 13:35:08 -07:00 |
|