Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-16 23:48:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41889 commits 26 branches 28 tags 1.2 GiB
Commit graph

16525 commits

Author SHA1 Message Date
Brad Davis
2353daa254 Merge pull request #7614 from ctrlaltdavid/20876 
Disable arrow keys being able to move between HTML form fields
 2016-04-08 13:28:30 -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
e37e46d34a Disable arrow keys being able to move between HTML form fields 
Moving between form fields with arrow keys makes it to easy to make
unintended changes to adjacent fields.
 2016-04-08 10:30:00 +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
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 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
e78b202433 Merge pull request #7602 from ZappoMan/default1PView 
default to first person view
 2016-04-07 09:16:04 -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
1f708ccb57 default to first person view 2016-04-06 13:35:08 -07:00
Brad Hefta-Gaub
2ee5b45ca6 Merge pull request #7583 from zzmp/log/bookmarks-exists 
Do not warn if no bookmarks file
 2016-04-06 11:20:06 -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
Zach Pomerantz
cba866b375 Do not warn if no bookmarks file 2016-04-05 14:59:57 -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
David Rowe
c9c414d5a8 Fix entities editor display of large negative coordinates and angles 2016-04-06 07:45:04 +12: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
Ryan Huffman
ab89e47bba Merge pull request #7562 from hyperlogic/tony/make-debugger-work-again 
Fix for debugging on windows
 2016-04-05 09:08:50 -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
Anthony J. Thibault
d7b13d226f Application: fix for jittery hands when moving. 
The issue was that the hands are sampled in sensor coordinates.
But when the avatar is moved via physics, the sensor to world matrix
must be updated to move the hands in the world by the correct amount.
These new hand positions are then computed before IK is performed.
 2016-04-04 12:36:18 -07:00
Anthony J. Thibault
a9197385b5 Make debug builds work again. 
Only run mt.exe on the manifest in non development builds.
 2016-04-04 12:24:26 -07:00
Brad Davis
d98abbc7df First pass at threaded texture transfers 2016-04-04 10:23:01 -07:00
Thijs Wenker
2be4097bc5 another 3.1.2.1 rollback 2016-04-04 17:36:43 +02:00
Thijs Wenker
142f37da1c fix accidentally violated style rule 3.1.2.1 2016-04-04 17:33:47 +02:00
Thijs Wenker
b2058376ba used "ReSharper C++" to fix some style and spelling in Application.(h|cpp) 2016-04-04 17:03:05 +02:00
Brad Hefta-Gaub
e5f3ec4600 Merge pull request #7545 from birarda/marketplace-to-examples 
renaming of marketplace icon/window to examples
 2016-04-03 14:25:00 -07:00
Brad Hefta-Gaub
ecaaa34576 Merge pull request #7547 from howard-stearns/lock-trees-on-import-export 
Lock trees on import export
 2016-04-03 14:23:54 -07:00
Anthony Thibault
d899d7d696 Merge pull request #7530 from hyperlogic/tony/culling-fixes 
Culling fixes
 2016-04-01 21:29:34 -07:00
Zach Pomerantz
5b9198ed3d Expose tex/model cache to js/qml 2016-04-01 19:52:43 -07:00
Seth Alves
5fa9f662fc Merge pull request #7542 from birarda/refresh-on-asset-connect 
refresh/close the asset browser dialog on domain switch
 2016-04-01 18:08:59 -07:00
Zach Pomerantz
d72c695417 Sanitize ResourceCache to expose to JS/QML 
fix sanitize
 2016-04-01 17:42:36 -07:00
Seth Alves
4788bb453b Merge pull request #7540 from murillodigital/master 
Updating defaultAvatar_full.fbx to fixed version
 2016-04-01 15:53:19 -07:00
Stephen Birarda
6e83ed5ccc use a more generic custom user agent 2016-04-01 15:49:24 -07:00