Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-18 03:45:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
75511 commits 76 branches 59 tags 1.2 GiB
Commit graph

75511 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony Thibault
286f23d512 Updated protocol version and fixed bugs 2019-01-17 15:19:54 -08:00
Wayne Chen
238f020392
remove trailing whitespace 2019-01-17 14:20:47 -08:00
Wayne Chen
2859784e17
Merge branch 'master' into oculusLoginFeature 2019-01-17 14:20:00 -08:00
Andrew Meadows
74f9a415d3 move _cauterizationNeedsUpdate back to MyAvatar 2019-01-17 13:58:34 -08:00
Andrew Meadows
e22024b0dd revert attempted fix for non-zero velocity for hats 2019-01-17 13:34:36 -08:00
Seth Alves
4fbc257be0 don't cauterize head-children when they are grabbed 2019-01-17 13:34:36 -08:00
Seth Alves
c8e9bff03a fix releaseGrab call on grabbed entity when a nearGrab ends 2019-01-17 13:34:36 -08:00
Seth Alves
2bf7ac2745 fix bug that was introducing a local velocity to an entity when it was parented to a moving avatar 2019-01-17 13:34:36 -08:00
John Conklin II
d64858b1c7
Merge pull request #14724 from sethalves/fix-excessive-cauterization-update 
case 15942: fix bug that caused avatar cauterization code to run constantly
 2019-01-17 12:59:57 -08:00
John Conklin II
19e4a7389b
Merge pull request #14676 from wayne-chen/updateLoginUserLogging 
case 20654: Updating user activity logging for login experience
 2019-01-17 12:59:12 -08:00
NissimHadar
d6f2a0ebe3 Merge branch 'master' of https://github.com/highfidelity/hifi into 20550-installOnMac 2019-01-17 12:19:04 -08:00
SamGondelman
59fafa1f5c only do entitlements check once 2019-01-17 11:47:12 -08:00
Wayne Chen
123f2d71e5 dismissing login dialog on popup if bad linking 2019-01-17 11:38:42 -08:00
John Conklin II
45ec44423b
Merge pull request #14694 from danteruiz/delete-only-domain-entities 
case 20595: case 20563: Do not delete local entities when switching domains.
 2019-01-17 11:25:58 -08:00
Adam Smith
f955313afc
Merge pull request #14687 from SamGondelman/cancel 
Case 20580: Trying to fix wearables and avatar app
 2019-01-17 11:25:30 -08:00
NissimHadar
21bad12b4c Merge branch '20550-installOnMac' of https://github.com/NissimHadar/hifi into 20550-installOnMac 2019-01-17 11:17:46 -08:00
NissimHadar
c0519c5a64 Corrected back to interface 2019-01-17 11:15:45 -08:00
Brad Davis
1879cd3b3c Fixing repository order 2019-01-17 11:11:07 -08:00
SamGondelman
8d2e81a13b Merge remote-tracking branch 'upstream/master' into matFallthrough 2019-01-17 10:27:43 -08:00
Wayne Chen
79ffc311e1 code cleanup + adding password error 2019-01-17 10:19:40 -08:00
NissimHadar
5e5374ebdd DEBUG 2019-01-17 09:47:53 -08:00
Anthony Thibault
39cf50def0 Merge branch 'master' into feature/hmd-avatar-alignment-type 2019-01-17 09:36:26 -08:00
NissimHadar
77f381b558 DEBUG 2019-01-17 09:29:47 -08:00
NissimHadar
88078d168f DEBUG 2019-01-17 08:26:18 -08:00
NissimHadar
9593b0e764 Removed debug code. 2019-01-17 08:23:49 -08:00
NissimHadar
20c52e4104 Merge branch 'master' of https://github.com/highfidelity/hifi into 20550-installOnMac 2019-01-16 23:55:57 -08:00
Wayne Chen
ef63213d28 fixing linking account problems on oculus/steam, changing callback 2019-01-16 21:07:54 -08:00
NissimHadar
74b8937004 Copy folder only in DEV builds. 2019-01-16 18:38:03 -08:00
NissimHadar
84dd4c4e1d Fixed Linux compilation error. 2019-01-16 18:37:38 -08:00
NissimHadar
c6529ae86d Minor clean-up. 2019-01-16 17:44:48 -08:00
NissimHadar
bfe7742e97 Use the `applicationDirPath on Mac 2019-01-16 17:30:55 -08:00
NissimHadar
2307be2785 Corrections. 2019-01-16 17:30:13 -08:00
Wayne Chen
bb61334c0d
Merge branch 'master' into oculusLoginFeature 2019-01-16 17:24:22 -08:00
Wayne Chen
673c4ad434 fixing error message spacing 2019-01-16 17:22:00 -08:00
Wayne Chen
3ad0f60dd5 fixing error message spacing 2019-01-16 17:20:01 -08:00
Wayne Chen
116a15afe8 removing oculus userID to server - no need 2019-01-16 17:15:40 -08:00
Wayne Chen
6d10d9d043 Merge branch 'oculusLoginFeature' of https://github.com/wayne-chen/hifi into oculusLoginFeature 2019-01-16 17:08:24 -08:00
Wayne Chen
8e916ea41b linking oculus acct creation to spinner 2019-01-16 17:05:59 -08:00
Wayne Chen
f4d4220e58 adding final create failure message handling, ui improvements 2019-01-16 17:05:56 -08:00
Wayne Chen
c54bce3953 fixing desktop login page crash 2019-01-16 17:05:55 -08:00
Wayne Chen
d38a657c54 filling username with oculus username, checking create error 2019-01-16 17:05:54 -08:00
Wayne Chen
671f15b63c removing isLogIn 2019-01-16 17:05:53 -08:00
Wayne Chen
3b3b86888e adding blur to login bg 2019-01-16 17:05:53 -08:00
Wayne Chen
fbc2dc5103 adding changes to forms 2019-01-16 17:05:52 -08:00
Wayne Chen
5c54930910 adding tablet close upon login 2019-01-16 17:05:52 -08:00
Wayne Chen
2d16e71e74 adding sending oculus ID including username 2019-01-16 17:05:52 -08:00
Wayne Chen
7e674ba3c4 better check for if oculus is running 2019-01-16 17:05:51 -08:00
Wayne Chen
ca0916886a adding more qml for oculus login 2019-01-16 17:05:51 -08:00
Wayne Chen
39a68a88f0 fixing typos in callback implementation 2019-01-16 17:05:51 -08:00
Wayne Chen
ed39b43d3b changing request to have a callback function passed 2019-01-16 17:05:51 -08:00