Brad Hefta-Gaub
ec0ca1d173
Merge pull request #8146 from huffman/fix/launch-version
...
Add version to launch user activity
2016-06-28 17:13:10 -07:00
Howard Stearns
da61100b6d
Merge pull request #8150 from highfidelity/vive-ui
...
merge vive-ui to master
2016-06-28 13:31:55 -07:00
Ryan Huffman
b36a39b2bc
Add version to launch user activity
2016-06-28 09:59:59 -07:00
Andrew Meadows
58e05b2e90
Merge pull request #8143 from AlexanderOtavka/remove-cam-slots
...
namechange Camera::_rotation --> Camera::_orientation
2016-06-28 09:49:54 -07:00
Brad Davis
8561581ab2
Merge pull request #8121 from SamGondelman/miniMirrorFix
...
Mini mirror/multi-monitor bug fixes
2016-06-27 22:04:39 -07:00
Zander Otavka
235ee4bd46
Refactor Camera scripting interface a little
...
get/setRotation has been removed, as it was a duplicate of
get/setOrientation, but undocumented and barely used. get/setTransform
and get/setPerspective have been changed to methods from slots, since
glm::mat4 is not exposed to the scriping interface so they don't work in
scripting.
2016-06-27 13:06:12 -07:00
Triplelexx
aae3555b63
update TouchscreenDevice
...
* fix threading issue with zoom gesture
* KeyboardMouseDevice touchpad disabled to prevent interference
* device supported based on QTouchDevice::devices().count()
2016-06-27 21:01:06 +01:00
Brad Davis
f90a351400
Don't reposition windows prior to selecting the initial display plugin
2016-06-24 16:31:24 -07:00
Triplelexx
6542604d13
resolve conflicts with TouchscreenDevice
...
updated to master
2016-06-24 05:19:28 +01:00
Triplelexx
fd4d9761ce
merge master and resolve conflicts
...
* remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping
2016-06-24 03:34:39 +01:00
Brad Hefta-Gaub
d7bffc3eab
first cut at negotiating codecs
2016-06-23 17:14:41 -07:00
howard-stearns
f8391f0062
fix reticle bugs
2016-06-23 16:51:15 -07:00
Brad Hefta-Gaub
be37921845
first cut at codec plugins
2016-06-23 10:42:02 -07:00
howard-stearns
67f76db7e4
Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui
2016-06-22 15:58:53 -07:00
Ryan Huffman
2621add8e3
Fix nearby_avatars not tracking
2016-06-22 09:17:28 -07:00
SamGondelman
78a1845afe
fixed resizing of qml overlays when device pixel ratio changes
2016-06-21 18:13:11 -07:00
Ryan Huffman
70be7b3273
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions
2016-06-21 16:39:25 -07:00
howard-stearns
8421931c56
Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui
2016-06-21 14:47:45 -07:00
Brad Hefta-Gaub
160a5de271
CR feedback
2016-06-21 12:49:42 -07:00
Brad Hefta-Gaub
c322317878
rework plugins to not depend on PluginContainer unless they want to
2016-06-21 12:07:05 -07:00
Ryan Huffman
6d753e317b
Fix more osx warning
2016-06-21 10:51:31 -07:00
Ryan Huffman
a77dea9048
Fix osx warning
2016-06-21 10:30:05 -07:00
Ryan Huffman
cee897d6d3
Fix osx warning
2016-06-20 16:44:07 -07:00
Ryan Huffman
ab057010d6
Add changed display mode tracking
2016-06-20 16:09:34 -07:00
Ryan Huffman
1eaa9e40cd
Cleanup nearby avatar tracking
2016-06-20 16:09:17 -07:00
Ryan Huffman
3aac0cc4fb
Update fps useractivity with more general stats
2016-06-20 16:02:36 -07:00
Ryan Huffman
7b3b01a96a
Add more values to launch UserActivity
2016-06-20 16:02:14 -07:00
Bradley Austin Davis
ec615caa80
Support toolbar API
2016-06-17 13:06:42 -07:00
Bradley Austin Davis
5bc8b53d1b
Merge remote-tracking branch 'upstream/master' into vive-ui
2016-06-17 10:56:53 -07:00
Brad Hefta-Gaub
d8d4eb65ec
Merge pull request #8059 from Atlante45/feat/steamworks
...
Initial Steamworks integration
2016-06-16 18:49:51 -07:00
Ryan Huffman
c7955900ab
Add new user activity events
2016-06-16 13:17:18 -07:00
Ryan Huffman
8b3b62aad7
Add UserActivityLogger scripting interface
2016-06-16 10:25:38 -07:00
Bradley Austin Davis
33e9caa636
Simplify overlay conductor, menu interation
2016-06-15 17:24:39 -07:00
David Rowe
657f8fdad5
Fix reporting of JSON export failure
2016-06-15 14:12:49 +12:00
Atlante45
1403fad04e
Add cmd line opt to disable settings reset popup
2016-06-14 16:34:46 -07:00
Atlante45
5560ba9a4c
Quit application when SteamVR requests it
2016-06-14 16:29:50 -07:00
Howard Stearns
213479c530
Merge pull request #8043 from hyperlogic/bug-fix/hmd-ui-center-improvements
...
HMD UI re-centering while driving improvements.
2016-06-13 14:28:50 -07:00
Brad Davis
0ddee876c3
Merge remote-tracking branch 'upstream/master' into vive-ui
2016-06-13 13:03:46 -07:00
Anthony J. Thibault
ab4bef7d55
Fixes based on PR feedback
...
* The "Clear Overlay When Driving" avatar preference is obeyed.
* sensor reset will also center the ui.
2016-06-13 11:19:47 -07:00
Seth Alves
4c45d081cd
merge from upstream
2016-06-10 19:57:46 -07:00
Stephen Birarda
3c4f336e72
re-instate NodeList reset on limit of check ins reached
2016-06-10 09:11:25 -07:00
Stephen Birarda
12e5851ba4
fix connection denial message, put version back
2016-06-09 15:53:19 -07:00
Stephen Birarda
4b5a554122
remove check in version downgrading from NodeList
2016-06-09 15:53:19 -07:00
Seth Alves
1977efae4f
Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid
2016-06-08 10:36:52 -07:00
Howard Stearns
bf48099286
Merge pull request #8032 from jherico/pin-button
...
Add a constant hud toggle button to the UI
2016-06-08 10:33:11 -07:00
Brad Davis
ca6e86e767
Merge remote-tracking branch 'upstream/master' into vive-ui
...
Conflicts:
interface/resources/qml/hifi/dialogs/RunningScripts.qml
2016-06-07 21:51:47 -07:00
Brad Davis
29d9f51b58
Adding missed file
2016-06-07 16:46:17 -07:00
Seth Alves
b2f63a2132
hook up can-rez-tmp and can-write-to-asset-server
2016-06-07 16:17:58 -07:00
Atlante45
399517fcbd
Activate Inputs after menus are setup
2016-06-06 13:28:36 -07:00
Atlante45
26acc6fd8b
Typo
2016-06-06 13:28:36 -07:00
Atlante45
24bbb8db3f
Remove input plugin menu dependency
2016-06-06 13:28:36 -07:00
Atlante45
ee62a211ac
Remove "Input Devices" menu
2016-06-06 13:28:36 -07:00
Atlante45
992fa63932
Allow ordered list of preferred plugins
2016-06-06 13:28:36 -07:00
Atlante45
932838b1e3
Setup preferred display plugin
2016-06-06 13:28:36 -07:00
Atlante45
d8493f960a
Add command line option to enable/disable plugins
2016-06-06 13:28:36 -07:00
Brad Davis
b7d1659852
Merge remote-tracking branch 'upstream/master' into vive-ui
2016-06-06 09:32:33 -07:00
Brad Hefta-Gaub
c85923c69b
Merge pull request #7956 from jherico/web_entity_crash
...
fix crash on click on non-visible web-entity
2016-06-03 10:29:55 -07:00
Brad Davis
8c13ff4ee1
Pinned UI support
2016-06-02 17:24:25 -07:00
Brad Davis
bf734395e5
More invisible web entity fixes
2016-06-02 16:37:45 -07:00
Brad Davis
ac5912df01
Fix crash on shutdown of SteamVR
2016-05-27 13:40:47 -07:00
Brad Hefta-Gaub
fb9f6185db
CR feedback
2016-05-24 17:19:53 -07:00
Brad Hefta-Gaub
183f38e4f0
pop up warning if domain over capacity
2016-05-24 16:07:57 -07:00
Brad Hefta-Gaub
2eef07e414
cleanup and dead code removal
2016-05-24 15:38:08 -07:00
Brad Hefta-Gaub
12a1857280
check point with protocol refusal working
2016-05-24 15:20:11 -07:00
Brad Hefta-Gaub
1cf8236860
Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck
2016-05-24 13:31:36 -07:00
Brad Hefta-Gaub
1d9981e624
first cut at support for verifying all protocol version compatibility
2016-05-24 13:31:19 -07:00
Zach Pomerantz
7dabce9cff
Check throttle before idling/painting
2016-05-23 19:04:35 -07:00
Brad Hefta-Gaub
ac49feda22
Merge branch 'master' of https://github.com/highfidelity/hifi into removeDisableEntityNACKS
...
Conflicts:
libraries/entities/src/EntityEditPacketSender.h
2016-05-21 09:23:45 -07:00
Seth Alves
f91a2403be
merge from upstream
2016-05-20 17:07:34 -07:00
Brad Davis
07562f72af
Doing a pass over the input plugins and controller code
2016-05-20 14:50:23 -07:00
Seth Alves
ff36b39067
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-20 14:38:53 -07:00
Brad Hefta-Gaub
770fab956f
remove dead code
2016-05-20 12:23:06 -07:00
Zach Pomerantz
2026226fe2
Handle vsync without halving fps
2016-05-20 09:04:39 -07:00
Seth Alves
1de9598243
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-19 16:37:40 -07:00
Zach Pomerantz
9a4b30a50b
Fix AvatarInputs phantom movement
2016-05-19 13:19:15 -07:00
Brad Hefta-Gaub
cef4a49c35
Merge pull request #7867 from huffman/fix/query-octree-crash
...
Fix crash in JurisdictionMap
2016-05-19 11:53:54 -07:00
Seth Alves
419c744bd4
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-19 09:49:18 -07:00
Ryan Huffman
ce6ae40432
Replace foreach use with for()
2016-05-18 15:38:54 -07:00
Ryan Huffman
dd093e3fcd
Make AccountManager a DependencyManager singleton
2016-05-18 15:38:54 -07:00
Ryan Huffman
cf49c8e2bf
Add getUserAgent function that includes plugin information
2016-05-18 15:35:29 -07:00
Brad Hefta-Gaub
4df4829280
Merge pull request #7902 from jherico/gpu_breakup
...
moving GL backend out of GPU
2016-05-18 11:35:35 -07:00
Seth Alves
3380b2a668
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-17 19:10:33 -07:00
Ryan Huffman
47d897f669
Fix processOctreeStats recreating JurisdictionMap for every stat packet
2016-05-17 15:12:14 -07:00
Ryan Huffman
ef6d758e7f
Fix JurisdictionMap multithreading issues
...
Make octal code pointers use shared_ptr, add locks around access.
2016-05-17 10:59:51 -07:00
Brad Davis
34e574c148
Merge pull request #7816 from zzmp/perf/idle-event
...
Drive render loop from DisplayPlugin instead of busy wait
2016-05-17 09:36:09 -07:00
Brad Davis
5ba8372c21
Moving GL backend out of GPU
2016-05-16 12:54:17 -07:00
Brad Hefta-Gaub
166fbdece5
Merge pull request #7853 from zzmp/fix/shutdown
...
Fix hang on exit from dying scripts
2016-05-16 10:17:34 -07:00
Seth Alves
3876a8037c
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-16 09:51:20 -07:00
Brad Hefta-Gaub
0d5fdbdb6e
Merge pull request #7879 from howard-stearns/fix-reticle-offset
...
fix reticle position offset
2016-05-13 17:17:23 -07:00
Zach Pomerantz
65e81077cb
Merge branch 'master' of github.com:highfidelity/hifi into perf/idle-event
2016-05-13 16:24:42 -07:00
Zach Pomerantz
59e4b9c356
Merge branch 'master' of github.com:highfidelity/hifi into fix/shutdown
2016-05-13 15:28:12 -07:00
Brad Hefta-Gaub
65aae42714
move firstRun.set() to correct place
2016-05-13 13:28:02 -07:00
howard-stearns
40f7212b1e
Make uses of getReticlePosition consistent with respect to window offset.
2016-05-12 16:37:03 -07:00
Seth Alves
fcd2e45d67
merge from upstream
2016-05-11 18:45:32 -07:00
Zach Pomerantz
25deaf5bda
Repost missed Presents with low priority
2016-05-11 18:27:48 -07:00
Anthony Thibault
8fecb51dde
Merge pull request #7846 from hyperlogic/tony/improved-avatar-debug-draw
...
Eye tracking bug fix and debug rendering improvements
2016-05-11 17:41:49 -07:00
Brad Hefta-Gaub
d656f61c64
Merge pull request #7759 from jherico/app_plugin_type
...
Don't expose raw pointer to the display plugin
2016-05-11 14:49:22 -07:00
Brad Hefta-Gaub
e01681eb52
Merge pull request #7856 from ZappoMan/NUEtweaks
...
don't show help or login on first run
2016-05-11 10:53:09 -07:00
Zach Pomerantz
2d4fd783bd
Rename Paint/Idle events to Present
2016-05-10 16:09:04 -07:00
Brad Hefta-Gaub
a17acc6f6b
rename functions
2016-05-10 15:52:07 -07:00
Anthony J. Thibault
80a349c65b
Merge branch 'master' into tony/improved-avatar-debug-draw
2016-05-10 14:50:13 -07:00
Zach Pomerantz
4711c23d9d
Delay AvatarInputs instantiation to first paint
2016-05-10 14:39:23 -07:00
Zach Pomerantz
783be53125
Trigger Idle from present Paint
2016-05-10 14:39:23 -07:00
Zach Pomerantz
c3f41cdd89
Add PAINT_DELAY_DEBUG log
2016-05-10 14:39:23 -07:00
Seth Alves
f90b9ec65d
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-10 12:08:45 -07:00
Brad Hefta-Gaub
350743454b
Merge pull request #7839 from sethalves/entity-simulation-smart-pointers-1
...
use smart pointers for entity simulations
2016-05-10 11:35:57 -07:00
Brad Hefta-Gaub
33c5cb519a
cleanup firstRun with a common setting
2016-05-10 11:32:29 -07:00
Clément Brisset
c3ce463b6c
Merge pull request #7854 from zzmp/refactor/delayLoad
...
Clean up resource cache's encapsulation of asynchronous loading
2016-05-10 10:47:23 -07:00
Brad Hefta-Gaub
22f4beab1a
on first run, go to home or entry
2016-05-10 10:45:57 -07:00
Seth Alves
4c1f815870
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-10 10:09:40 -07:00
Brad Hefta-Gaub
d7eee98acc
Merge pull request #7827 from AndrewMeadows/threadsafe-viewfrustum
...
resurrection of threadsafe ViewFrustum
2016-05-10 09:06:38 -07:00
Brad Hefta-Gaub
e478b72e67
Merge branch 'master' of https://github.com/highfidelity/hifi into NUEtweaks
2016-05-10 08:36:32 -07:00
Seth Alves
b761ecf44f
merge from upstream
2016-05-10 08:18:45 -07:00
Brad Hefta-Gaub
8b51746788
don't show help or login on first run
2016-05-09 18:49:29 -07:00
Zach Pomerantz
9ac783a88d
Black box asynch resource retrieval
2016-05-09 18:03:19 -07:00
Zach Pomerantz
2d820221dc
Clear queued processing on quit
2016-05-09 17:32:25 -07:00
Zach Pomerantz
694dc1bbf6
Delay Overlays cleanup for scripting
2016-05-09 17:32:25 -07:00
Atlante45
5c196f3df5
Remove Deadlock status
2016-05-09 15:53:45 -07:00
Brad Hefta-Gaub
2c0204b0d6
Merge pull request #7821 from Atlante45/fix/collision-sound
...
Fix avatar/entity collision sound
2016-05-09 14:24:19 -07:00
Anthony J. Thibault
641e152699
Eye tracking bug fix and debug rendering improvement
...
* Bug fix for eye tracking in HMD, the "up" orientation of your eyes now match your head.
* DebugDraw: added drawRay method.
* Application: Renamed preRender to postUpdate
* AvatarManager: added postUpdate method that iterates over all avatars.
* MyAvatar: Renamed preRender to preDisplaySide
* MyAvatar: split preRender code into postUpdate and preDisplaySide.
* Removed "Show who is looking at me", "Render focus indicator" and "Render lookat target" debug draw.
* Split "Show Look At Vectors" into "Show My Look At Vectors" and "Show Other Look At Vectors", to make it easier to debug eye tracking.
* "Show Look at Vectors" now draws the right eye red and the left eye blue.
* Removed Avatar and MyAvatar renderBody
* Removed look at rendering from head.
* GLMHelpers: Bugfix for generateBasisVectors when up primary and secondary axis were orthogonal
2016-05-08 16:20:32 -07:00
Brad Davis
c54d0bc993
Don't expose raw pointer to the display plugin
2016-05-08 10:35:31 -07:00
Seth Alves
0e6d9a1eec
avatar mixer can relay "client-only" entities between interfaces -- the entity server wont know about them.
2016-05-07 14:48:31 -07:00
Seth Alves
a0771f8ee5
use smart pointers for entity simulations
2016-05-07 09:14:33 -07:00
Stephen Birarda
fb09efc0c9
send location updates immediately on mode change and startup
2016-05-06 12:01:03 -07:00
Stephen Birarda
ed1ddc2a8b
remove code to update/store wallet balance
2016-05-06 11:54:49 -07:00
Andrew Meadows
778820edb4
fix broken dupe method implementation
2016-05-06 09:07:03 -07:00
Andrew Meadows
635e2e78e3
minor cleanup
2016-05-05 18:43:08 -07:00
Andrew Meadows
71b2d647e8
add locks and explicitly copy ViewFrustums
2016-05-05 18:28:27 -07:00
Andrew Meadows
bcf2cc8074
use references not pointers for ViewFrustums
...
also unravelling some spaghetti:
(1) split Octree stuff out of ViewFrustum
(2) moved ViewFrustum from octree to shared lib
(3) removed some cruft
2016-05-05 18:28:27 -07:00
Andrew Meadows
60a72c6660
getViewFrustum() provides const pointer
2016-05-05 18:28:27 -07:00
Atlante45
07adef9465
Fix entities collision sounds
2016-05-05 14:55:28 -07:00
Brad Hefta-Gaub
4ab7b660d4
fix a bunch of bugs in qml window placement
2016-04-25 20:19:54 -07:00
Anthony Thibault
d8a32c8329
Avatar eye gaze fix for HMDs
...
When no avatars are chosen for more detailed eye gaze tracking the eyes should look straight ahead.
Before this fix, if you were in room scale or not aligned with the camera sensor your gaze could drift to the left or to the right of your head's forward direction.
Now it should follow your head more closely.
2016-04-24 17:59:51 -07:00
Brad Hefta-Gaub
d87d631871
Merge pull request #7708 from zzmp/feat/render-rates
...
Add renderRates.js to visualize rates over time
2016-04-21 15:59:58 -07:00
Zach Pomerantz
1fe12e7029
Mv Rates to RatesScriptingInterface.h
2016-04-20 13:26:23 -07:00
Howard Stearns
9ff9682b2a
Merge pull request #7692 from ZappoMan/resetScriptEngineOnDomainChange
...
Reset entities script engine on domain change
2016-04-19 11:14:28 -07:00
Brad Hefta-Gaub
0ac9601ea7
Merge pull request #7690 from ZappoMan/improveHMD
...
Introduce "recommended overlay rectangle" to display plugins
2016-04-18 18:04:21 -07:00
Brad Hefta-Gaub
0a79b5dd69
Merge pull request #7707 from huffman/fix/osx-default-script-dir
...
Remove fix for old QT file path bug in OSX
2016-04-18 18:01:47 -07:00
Zach Pomerantz
f48541961d
Expose Rates to JS/QML
2016-04-18 17:43:34 -07:00
Ryan Huffman
4e0ac2a4be
Remove fix for old QT file path bug in OSX
2016-04-18 16:07:53 -07:00
Brad Hefta-Gaub
01907f181f
Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD
2016-04-18 16:01:42 -07:00
Seth Alves
3298883774
Merge pull request #7702 from zzmp/fix/clear-octree-on-exit
...
Clear entities and avatars on exit
2016-04-18 15:48:35 -07:00
samcake
dccf549118
Merge pull request #7676 from jherico/perf_testing
...
Manually generate mipmaps for textures while loading
2016-04-18 15:09:12 -07:00
Zach Pomerantz
790e325248
Clear entities and avatars on exit
2016-04-18 14:31:16 -07:00
Brad Hefta-Gaub
374ba10524
more CR feedback
2016-04-18 12:23:36 -07:00
Brad Hefta-Gaub
0d20f2468e
CR feedback
2016-04-18 12:13:21 -07:00
Brad Hefta-Gaub
0520363da8
cleanup
2016-04-18 10:37:15 -07:00
Brad Hefta-Gaub
d1f6b371c9
cleanup
2016-04-18 10:27:12 -07:00
Brad Davis
f3e5306f90
Working on an automated performance test
2016-04-17 10:20:00 -07:00
Brad Hefta-Gaub
8f3d48190a
switch to QRect instead of vec4
2016-04-16 16:59:47 -07:00
Brad Hefta-Gaub
6b5fd1e807
code review feedback
2016-04-16 16:11:36 -07:00
Brad Hefta-Gaub
87078b1ea2
first cut at resetting entities script engine on domain change
2016-04-16 11:09:23 -07:00
David Rowe
8f6cfb72ea
Fix QML warnings at shutdown
2016-04-16 15:23:41 +12:00
Brad Hefta-Gaub
04df84974c
handle repositioning of qml windows
2016-04-15 19:50:12 -07:00
Brad Hefta-Gaub
c7f58dc17c
first cut at exposing recommend overlay rectangle
2016-04-14 20:47:31 -07:00
Brad Hefta-Gaub
ea4da05cba
Merge pull request #7643 from AndrewMeadows/faster-bullet
...
faster Bullet kinematics
2016-04-14 12:16:54 -07:00
Andrew Meadows
dcf28937cf
cleanup cached Physics::sessionUUID
2016-04-14 11:18:10 -07:00
Zach Pomerantz
e80898f095
Merge branch 'master' of github.com:highfidelity/hifi into fix/model-anim-cache
2016-04-14 10:12:16 -07:00
Brad Hefta-Gaub
7b5075cce5
Merge pull request #7645 from sethalves/dont-run-bullet-too-soon
...
add a heuristic for deciding when it's safe to enable bullet
2016-04-14 09:35:58 -07:00
Brad Hefta-Gaub
37dcfdad8a
Merge pull request #7652 from huffman/feat/crash-menu
...
Move crash menu items to submenu and add new crash types
2016-04-14 09:32:36 -07:00
Seth Alves
ba0549dddd
Merge branch 'master' of github.com:highfidelity/hifi into dont-run-bullet-too-soon
2016-04-14 09:18:58 -07:00
Chris Collins
47522e1774
Merge pull request #7659 from ZappoMan/newLODSettings
...
improve reset settings
2016-04-13 16:49:22 -07:00
Zach Pomerantz
7a15339631
Use AnimationCache for models
2016-04-13 15:44:47 -07:00
Ryan Huffman
47c2a1722b
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/crash-menu
2016-04-13 14:40:46 -07:00
Ryan Huffman
bc247ec058
Remove unused Application::crashApplication()
2016-04-13 14:01:41 -07:00
Brad Hefta-Gaub
67af3917bc
improve reset settings
2016-04-13 13:18:23 -07:00
Brad Hefta-Gaub
4b3b917af6
add support for avatar licenses in FST files
2016-04-13 12:26:09 -07:00
Seth Alves
688de6f100
quiet warning
2016-04-12 14:10:14 -07:00
Seth Alves
e4c91e5064
add a heuristic for deciding when it's safe to enable bullet
2016-04-12 11:46:00 -07:00
Brad Hefta-Gaub
3f05ded932
Merge pull request #7611 from zzmp/guard/amd
...
Disable gradient QML items on AMD
2016-04-12 08:32:57 -07:00
Brad Hefta-Gaub
a1fe6aee6d
Merge pull request #7625 from hyperlogic/tony/third-person-hmd-camera-improvements
...
Improve comfort of third-person HMD camera.
2016-04-12 08:32:23 -07:00
Zach Pomerantz
ab72d8d8fb
Init QML GL from share context
2016-04-11 13:47:45 -07:00
Brad Davis
df8ad57185
Fix FPS counter
2016-04-11 00:25:16 -07:00
Anthony J. Thibault
93a5bdd79a
Prevent avatar rotation due to HMD head turning in third-person camera.
...
Also, fix one frame glitch during snap turning, by updating the sensorToWorld matrix
after the MyAvatar::updateOrientation rotates the avatar, but before we perform IK.
2016-04-08 15:27:43 -07:00
Zach Pomerantz
e08c9db469
Expose GL property to QML
2016-04-07 18:27:07 -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
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
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 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 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
Brad Hefta-Gaub
5f4d6ca1d3
CR feedback
2016-04-06 19:07:26 -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
Brad Hefta-Gaub
51660ab3a8
Merge pull request #7579 from sethalves/log-about-webengine-remote-debugging
...
Log about webengine remote debugging
2016-04-06 08:28:37 -07:00
Brad Hefta-Gaub
699c717828
Merge pull request #7580 from hyperlogic/tony/keyboard-focus-on-web-entity-fix
...
Application: focusOut keyboard device when clicking on web entity.
2016-04-05 18:44:30 -07:00
Brad Hefta-Gaub
70f3a39463
Merge pull request #7593 from hyperlogic/tony/keyboard-focus-improvements
...
Application: change keyboard input focus when using ui overlay.
2016-04-05 18:44:16 -07:00
Anthony J. Thibault
07ff687bfe
Application: change keyboard input focus when using ui overlay.
...
call focusOutEvent on keyboard input plugin when an offscreen ui has activeFocus.
2016-04-05 18:12:02 -07:00
Brad Hefta-Gaub
891cc12d3f
Merge pull request #7549 from zzmp/feat/resource-vis
...
Add a visualization of cacheable resource usage
2016-04-05 15:43:27 -07:00
Seth Alves
bda8761e00
fix how env variable is accessed
2016-04-05 14:30:41 -07:00
Seth Alves
f42e968dda
commit to repush to see if github is working yet
2016-04-05 14:12:46 -07:00
Anthony J. Thibault
4c632cb4c4
Application: focusOut keyboard device when clicking on web entity.
2016-04-05 14:00:43 -07:00
Seth Alves
d8282ae799
log value of QTWEBENGINE_REMOTE_DEBUGGING before exit
2016-04-05 13:56:39 -07:00
Brad Hefta-Gaub
08a19c0471
Merge pull request #7554 from jherico/load_stutter2
...
Addressing stuttering in the frame while loading content - Part 2
2016-04-05 09:45:31 -07:00
Brad Davis
e86066c1ce
Merge pull request #7563 from hyperlogic/tony/jittery-hands-fix
...
Application: fix for jittery hands when moving.
2016-04-04 15:58:22 -07:00
Brad Hefta-Gaub
04471f1c88
Merge branch 'master' of https://github.com/highfidelity/hifi into simpleTestPR
...
Conflicts:
interface/src/Application.cpp
2016-04-04 13:16:39 -07:00
Brad Hefta-Gaub
b3b5c5d1ea
small change to trigger a build
2016-04-04 13:14:52 -07:00
