Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 12:57:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
53485 commits 25 branches 0 tags 1.1 GiB
Commit graph

53485 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
c369b1314a Remove countdown overlays 2017-04-13 16:32:03 +12:00
David Rowe
afd82f09c0 Provide instructions on running the AC player script 2017-04-13 15:18:04 +12:00
David Rowe
e21e15c064 Update warning dialog to refer to player "instance" 2017-04-13 14:01:37 +12:00
David Rowe
5ad44b6caf Display empty rows for unused players 2017-04-13 13:50:26 +12:00
David Rowe
24a68ea685 Report the numnber of free players rather than total number 2017-04-13 13:40:52 +12:00
David Rowe
464bc17491 Column heading for "unload" buttons 2017-04-13 13:40:20 +12:00
David Rowe
8bbce53f74 Reset player details when domain restarts or user teleports 2017-04-13 12:23:10 +12:00
David Rowe
7dddd266ba Merge branch 'master' into 21249 2017-04-13 08:39:32 +12: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
David Kelly
9376ac646f offline people sort change 2017-04-12 08:41:36 -07:00
David Rowe
50a06db1b9 Display "REC" indicator when recording 2017-04-12 15:56:59 +12:00
David Rowe
f30dc4b560 Add a "record" button to initiate recording 2017-04-12 15:04:29 +12:00
David Rowe
905560b96d Remove checkbox and record-on-close functionality 2017-04-12 14:48:15 +12: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
David Rowe
3ae388bded Rework auto-playback 2017-04-12 13:32:34 +12: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
David Rowe
0d9e0ebfec Merge branch 'master' into 21249 2017-04-12 08:45:01 +12: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
Stephen Birarda
84a5807ff1 return ScriptAvatarData raw pointer from getAvatar 2017-04-10 22:15:45 -07:00
Zach Fox
54ca8bd89e grab audio loudness from correct avatar 2017-04-10 22:15:45 -07:00
Stephen Birarda
6c49db0f1b add missing include for qScriptRegisterMetaType in Agent 2017-04-10 22:15:45 -07:00
Stephen Birarda
42a406e90a add ScriptAvatar for std::shared_ptr<Avatar> passing to scripts 2017-04-10 22:15:45 -07:00
Zach Fox
0aa1e633fe Fix overrides and warnings (finally?) 2017-04-10 22:15:45 -07:00
Zach Fox
2561d38d93 Fix GCC warning 2017-04-10 22:15:45 -07:00
Zach Fox
04792bf3bc Typo fix. 2017-04-10 22:15:45 -07:00
Zach Fox
16be0ca70c Birarda's CR changes 2017-04-10 22:15:44 -07:00
Zach Fox
1984d5bc0c Cleanup 2017-04-10 22:15:44 -07:00
Zach Fox
3832abffee Almost theregit add -A 2017-04-10 22:15:44 -07:00