Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 22:40:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
53462 commits 76 branches 59 tags 1.2 GiB
Commit graph

53462 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
7695d2ac05 put the protocol version back to what's in master, for now 2017-04-13 11:29:40 -07:00
Seth Alves
1ab3a1eb60 bump entity-protocol version 2017-04-12 16:36:04 -07:00
Seth Alves
0dab94fada Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0 2017-04-12 16:34:46 -07:00
Seth Alves
9b12956909 formatting 2017-04-12 16:34:34 -07:00
Zach Fox
f23f9ec698 Merge pull request #10207 from zfox23/gifShareImprovements 
Snapshot sharing improvements
 2017-04-12 16:33:44 -07:00
Zach Fox
631033dcb5 Merge pull request #10209 from zfox23/fixUserInfoViewerButton 
Make userInfoViewer button always clickable for myCard
 2017-04-12 16:33:05 -07:00
Seth Alves
0eb9507a10 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0 2017-04-12 16:25:50 -07:00
Zach Fox
71caf85a27 Quick fix! 2017-04-12 14:57:44 -07:00
Zach Fox
3f91fb8e55 Remove unnecessary comment 2017-04-12 14:45:57 -07:00
Zach Fox
c724c2e50b New loading icon 2017-04-12 14:45:57 -07:00
Zach Fox
87b2d5bf8a New loading icon 2017-04-12 14:45:57 -07:00
Zach Fox
75f1168b19 Clearer function names 2017-04-12 14:45:57 -07:00
Zach Fox
7b92989b1d Fix it 2017-04-12 14:45:57 -07:00
Zach Fox
2579ac1baa It's working! 2017-04-12 14:45:57 -07:00
Zach Fox
e296383b1b Checkpoint! 2017-04-12 14:45:56 -07:00
Andrew Meadows
e64e2614e3 Merge pull request #10147 from alhighfidelity/Kinect-Hand-Filter 
Kinect hand filter
 2017-04-12 14:27:05 -07:00
Chris Collins
c545558b8a Merge pull request #10199 from AndrewMeadows/avatar-should-vanish 
Avatar should vanish when teleporting far away
 2017-04-12 12:28:46 -07:00
Chris Collins
36797d08fe Merge pull request #10200 from thoys/fix/TeleportCoolIn 
Fix teleport coolIn
 2017-04-12 11:57:08 -07:00
Zach Fox
ef2cea0d63 Merge pull request #10203 from zfox23/fix/avatarMouthsMoving 
Make avatar's mouths move again
 2017-04-12 11:36:03 -07:00
Zach Fox
39587d5308 lol 2017-04-12 10:54:28 -07:00
David Kelly
a12407ddda Merge pull request #10202 from davidkelly/dk/3934 
Connection sort change
 2017-04-12 10:42:04 -07:00
David Kelly
058a5b14a4 damn linter didn't run - vimrc work ahead... 2017-04-12 10:22:40 -07:00
Seth Alves
026dde2e68 allow kinematic near-grab to be turned on or off for a given entity 2017-04-12 10:14:16 -07:00
David Kelly
9376ac646f offline people sort change 2017-04-12 08:41:36 -07:00
Seth Alves
507f658a5f update comment 2017-04-12 07:37:41 -07:00
Seth Alves
9f252f04e7 cleanups 2017-04-12 07:25:23 -07:00
Seth Alves
53cb192af1 fixed names of pivot and axis 2017-04-12 07:22:27 -07:00
Seth Alves
cc77fce95f hinge is sort-of working 2017-04-12 07:12:05 -07:00
Seth Alves
2b0315645c actions work again 2017-04-11 21:11:03 -07:00
Seth Alves
74c0a70cb0 rename base action classes to dynamics, start on constraints 2017-04-11 20:39:13 -07:00
Thijs Wenker
695c55bc3d fix teleport cool-in, added missing TARGETTING state and some ESLINT style fixes 2017-04-12 03:44:24 +02:00
Andrew Meadows
b8a3c856be update model transform even when out of view 2017-04-11 15:03:11 -07:00
Andrew Meadows
d25c0ace44 AvatarMixer sends min updates for out-of-view avatars 2017-04-11 15:02:27 -07:00
Chris Collins
b07ed13023 Merge pull request #10184 from druiz17/snapshot-fix 
snapshot bug fixes
 2017-04-11 13:00:46 -07:00
Chris Collins
c86acfafef Merge pull request #10120 from huffman/feat/stick-default-avatar 
Change default avatar to ball and stick avatar
 2017-04-11 12:56:25 -07:00
Seth Alves
f555ae253f Merge pull request #10192 from druiz17/tablet-webview-fix 
webview go back to previous page fix
 2017-04-11 12:11:43 -07:00
Chris Collins
3a603e7ced Merge pull request #10193 from sethalves/fix-dont-delete-tablet-qobject 
change handling of life-time of TabletProxy QObjects
 2017-04-11 11:53:47 -07:00
Zach Fox
6569de697d Merge pull request #10187 from zfox23/fix/getAvatar_Fix 
Fix FB3999; Fix crashes caused by getAvatar() design bug
 2017-04-11 11:17:48 -07:00
Seth Alves
077a4fe4ae change handling of life-time of TabletProxy QObjects 2017-04-11 10:56:47 -07:00
Dante Ruiz
9c79e62004 webview-fix 2017-04-11 18:49:40 +01:00
druiz17
b7daf8c80b Merge pull request #10191 from sethalves/fix-collision-hull-munging 
fix -- munge collision-hull at last minute rather than store munged url as a property
 2017-04-11 09:09:54 -07:00
Chris Collins
836b4993cc Merge pull request #10188 from druiz17/homebutton-fix-crash 
fix crashes when clicking in the homebutton
 2017-04-11 09:00:35 -07:00
Dante Ruiz
d823093ddb fixed merge conflict 2017-04-11 16:58:25 +01:00
Seth Alves
d5f5192954 Merge pull request #10174 from vladest/fix-snapshot-login-cancel 
Check if dialog was opened from StackView and then pop or just go to …
 2017-04-11 07:07:29 -07:00
Seth Alves
bf16309917 Merge pull request #10146 from AndrewMeadows/avoid-invisible-avatars-002 
avoid invisible avatars redux
 2017-04-11 07:07:03 -07:00
Seth Alves
938fab6f59 Merge pull request #10061 from humbletim/fix-cached-ResourceCache 
Fix cached ResourceCache::prefetch() state updates
 2017-04-11 07:04:06 -07:00
Seth Alves
b99959c73d munge collision-hull at last minute rather than store munged url as a property 2017-04-11 07:00:22 -07:00
Stephen Birarda
db6fc40277 fix ScriptAvatar promotion of AvatarData 2017-04-10 22:15:45 -07:00
Stephen Birarda
b8620f6919 make getAvatar in AvatarManager Q_INVOKABLE 2017-04-10 22:15:45 -07:00
Stephen Birarda
e7299a5435 add missing include for ScriptAvatar in AvatarManager 2017-04-10 22:15:45 -07:00