Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:54:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
53466 commits 71 branches 56 tags 1.2 GiB
Commit graph

53466 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
David Rowe
3ae388bded Rework auto-playback 2017-04-12 13:32:34 +12: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
Zach Fox
4489c34e84 I'm on fire 2017-04-10 22:15:44 -07:00
Zach Fox
5edd5d2b30 It's working...it's workinggit add -A! 2017-04-10 22:15:44 -07:00
Zach Fox
a16e261735 Checkpoint before a number of confusing changes 2017-04-10 22:15:44 -07:00
Zach Fox
297da90118 Semicolons lol 2017-04-10 22:15:44 -07:00
Zach Fox
bc75ff4462 Checkpoint 2017-04-10 22:15:44 -07:00
Zach Fox
177445c371 Does this work? 2017-04-10 22:15:44 -07:00
Stephen Birarda
4ed22ad7ac move audio loudness to AvatarData, change AvatarData to ScriptOwnership 2017-04-10 22:15:44 -07:00
Zach Fox
1ed53113a9 Commit for birarda - testing QSharedPointer instead; doesn't work right now 2017-04-10 22:15:44 -07:00
Zach Fox
6ddd7a612c Initial pass at fix looks promising 2017-04-10 22:15:44 -07:00
Ryan Huffman
af11f5f327 Update avatar mixer packet version for stick+ball avatar 2017-04-10 21:27:47 -07:00
David Rowe
86baf785aa Add "Load" button 2017-04-11 15:23:09 +12:00
Dante Ruiz
daf25c1fe8 fix crashes when clicking in the homebutton 2017-04-11 00:25:08 +01:00
Chris Collins
d8581c1026 Merge pull request #10176 from vladest/snaps_hover 
Added hover to Snaps and Places
 2017-04-10 16:09:43 -07:00
Stephen Birarda
602d65a71a Merge pull request #10001 from birarda/cleanup-ebp 
cleanup EncodeBitstreamParams to use nodeData when possible
 2017-04-10 15:54:30 -07:00
Howard Stearns
7ad185ddfe Merge pull request #10186 from sethalves/fix-all-places 
fix includeActions so places show up in All
 2017-04-10 15:35:17 -07:00
Ryan Huffman
8463fffc8c Merge pull request #10185 from highfidelity/revert-10116-bug/rel-ext-textures 
Revert "fix relative/absolute path handling for external FBX textures"
 2017-04-10 15:30:40 -07:00
Seth Alves
b9afcd3f0a Merge pull request #10178 from sethalves/fix-compound-collision-hulls 
Fix compound collision hulls
 2017-04-10 15:28:48 -07:00
David Rowe
559fba39ab Remove avatar after stopping recording 2017-04-11 10:17:52 +12:00
Seth Alves
eb281389f5 fix includeActions so places show up in All 2017-04-10 14:46:31 -07:00