Commit graph

58095 commits

Author SHA1 Message Date
Zach Fox
61526256bc Remove personalized comment 2017-08-09 09:30:18 -07:00
Zach Fox
9d60d5153f Clarifying comment and turn setting off first 2017-08-08 18:00:17 -07:00
Zach Fox
4f85923517 Tons of fixes and improvements! 2017-08-08 17:58:41 -07:00
Zach Fox
b2c5a1f899 Fancy MutationObserver! 2017-08-08 17:12:06 -07:00
Zach Fox
03729bf165 Actually fix context menu 2017-08-08 16:38:12 -07:00
Zach Fox
871a5ff1ab Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_CheckoutQMLInvestigation 2017-08-08 15:53:22 -07:00
Zach Fox
69fc69cffb Comment fix and overlay click fix 2017-08-08 15:52:59 -07:00
Andrew Meadows
71ba6ba10a Merge pull request #10807 from jmo7/21356
21356 - Reorder Edit.js
2017-08-08 15:15:37 -07:00
Andrew Meadows
23c3715e8f Merge pull request #10902 from jmo7/21391
Worklist #21391 Implement a Parenting Tool
2017-08-08 14:56:24 -07:00
Chris Collins
995ee60aa5 Merge pull request #11129 from highfidelity/RC-50
Beta Release 50 - Includes up to Developer Release 6961
2017-08-08 14:39:17 -07:00
Zach Fox
7d26d2d88b Switch and fix overlay clicks 2017-08-08 14:29:44 -07:00
utkarshgautamnyu
aa6b97f91a Update NSIS.template.in 2017-08-08 10:33:27 -07:00
utkarshgautamnyu
99b0da9336 Update NSIS.template.in 2017-08-08 10:33:21 -07:00
utkarshgautamnyu
dfc570b2db Update NSIS.template.in 2017-08-08 10:33:09 -07:00
utkarshgautamnyu
47937d85d5 indentation fixes 2017-08-08 10:33:02 -07:00
utkarshgautamnyu
5e706e84ce bug fixes for express installer 2017-08-08 10:32:54 -07:00
Chris Collins
153b5cb065 Merge pull request #11137 from highfidelity/bug/6834
Fixed bugs related to express installer
2017-08-08 10:11:11 -07:00
utkarshgautamnyu
56c695acbb Update NSIS.template.in 2017-08-07 18:34:20 -07:00
utkarshgautamnyu
dc4121f9d1 Update NSIS.template.in 2017-08-07 17:55:45 -07:00
utkarshgautamnyu
b80def995f Update NSIS.template.in 2017-08-07 17:53:39 -07:00
utkarshgautamnyu
c9c36bb19e indentation fixes 2017-08-07 17:50:53 -07:00
utkarshgautamnyu
3ee5f78c40 bug fixes for express installer 2017-08-07 17:44:07 -07:00
Zach Fox
1493a310af Beginning of stack stuff 2017-08-07 17:02:24 -07:00
Zach Fox
45424f0cfe Prototype V1 2017-08-07 16:25:42 -07:00
Zach Fox
7e922cb2c2 Layout 2017-08-07 16:16:17 -07:00
Zach Fox
517128a939 More steps 2017-08-07 16:03:42 -07:00
Seth Alves
e0daa92757 Merge pull request #11133 from druiz17/bug-create-spinner
Fixed this issue of the spinner not displaying in create mode
2017-08-07 14:48:27 -07:00
Zach Fox
d7dd331685 Bugfixes 2017-08-07 14:39:31 -07:00
Zach Fox
7d4fd995f2 First steps 2017-08-07 14:29:47 -07:00
Seth Alves
60895872ca Merge pull request #11123 from vladest/attachment_speedup
Remove snap to item. Add caching for scrolling speedup
2017-08-07 13:18:50 -07:00
VRCat\VRKitten
41c8c5da99 Order of multiplication of quaternions for rotation reversed
Per AndrewMeadows comments and up = yAxis not necessarily always being true in the future, the ROT_Y_180 has been moved to be the second quaternion in the multiplcation to determine rotation
2017-08-07 14:17:32 -06:00
Seth Alves
af1e27dc36 Merge pull request #11053 from hyperlogic/feature/secondary-pose-support
Improved support for Vive Trackers on biceps
2017-08-07 13:11:48 -07:00
howard-stearns
9bad26c2db stub files 2017-08-07 12:51:30 -07:00
Dante Ruiz
38db4a6f47 fixed create spinner not appearing 2017-08-07 20:03:55 +01:00
mukulHF
780644fa38 Update TabletRunningScripts.qml 2017-08-07 11:37:27 -07:00
mukulHF
fadc19d8bb Update RunningScripts.qml 2017-08-07 11:36:37 -07:00
mukulHF
cf7b2ba547 Update LetterboxMessage.qml 2017-08-07 11:35:42 -07:00
mukulHF
3ca2bc0571 Update DesktopLetterboxMessage.qml 2017-08-07 11:35:27 -07:00
Zach Fox
36453644e0 Merge pull request #11130 from zfox23/contextOverlays_fixCrash1
Fix crash in Context Overlays code
2017-08-07 11:29:30 -07:00
Zach Fox
07a4beac73 Fix the crash 2017-08-07 10:28:36 -07:00
mukulHF
e9f268ff26 Update LetterboxMessage.qml 2017-08-07 10:01:50 -07:00
mukulHF
4382f22622 Update DesktopLetterboxMessage.qml 2017-08-07 10:01:26 -07:00
Chris Collins
4acccb6ace Merge pull request #11118 from cain-kilgore/chat-char-limit
WL 21493 - Update the Chat.js to indicate when a message is too long
2017-08-07 09:52:57 -07:00
Seth Alves
c570d483d8 Merge pull request #11113 from elisa-lj11/zip_drag
Zip drag (needs review)
2017-08-07 03:17:31 -07:00
Seth Alves
f898a05014 Merge pull request #11122 from ElderOrb/case6760
fix for 6760: Create Mode turns to Portrait when Reopening tablet
2017-08-06 19:02:47 -07:00
Seth Alves
8798e47f99 Merge pull request #11117 from hyperlogic/bug-fix/misc-crash-fixes
Crash fixes for avatars without Hips, and web overlays
2017-08-06 18:48:07 -07:00
Brad Davis
959499eab8 Merge pull request #11128 from sethalves/fix-some-crash-on-exit
Fix some crash on exit
2017-08-06 17:27:22 -07:00
Seth Alves
931369ae00 Merge pull request #11127 from vladest/fix_mouse_release_lost
fixed typo leads to lost touch or mouse release events
2017-08-06 13:17:50 -07:00
Seth Alves
83a30e2f35 missed some statics 2017-08-06 13:12:27 -07:00
Seth Alves
6f9460162d avoid calling a pure virtual function from GLBackend dtor 2017-08-06 12:47:45 -07:00