Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 14:31:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
57107 commits 75 branches 59 tags 1.2 GiB
Commit graph

57107 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Fox
36dfff78e2 Emit qDebug() error when trying to change position or orientation while attachedEntityId is defined 2017-06-30 15:13:31 -07:00
Ryan Downe Karpf
ddce264dd9 Merge pull request #10819 from Menithal/21387 
WL21387 - Avatar Bookmarks now save Attachment Data and scale PR#2
 2017-06-30 14:57:04 -07:00
Brad Davis
31d2c9980e Merge pull request #10797 from ctrlaltdavid/21396 
Make Leap Motion a plugin
 2017-06-30 14:37:23 -07:00
Atlante45
85601669e1 Prevent thrashing by limiting to 10 restarts every 10 minutes 2017-06-30 14:34:49 -07:00
David Kelly
09d959bdeb Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview 2017-06-30 14:16:01 -07:00
Zach Fox
9bd80ec2bf Improve naming and API 2017-06-30 14:07:00 -07:00
Zach Fox
e85b6c870c Merge pull request #10863 from zfox23/spectatorCamera_clarifySetDisplay 
Clarify setDisplayTexture() cases, also fixing crash bug
 2017-06-30 14:05:21 -07:00
Brad Davis
3f48c7aef5 Merge pull request #10855 from jherico/snapshot 
Fix snapshot connection errors
 2017-06-30 12:58:48 -07:00
David Kelly
133af0b522 jittery, still not working in tablet 2017-06-30 12:55:11 -07:00
utkarshgautamnyu
c81211edef Merge pull request #10848 from highfidelity/snapshot.js_modify 
Update snapshot.js
 2017-06-30 12:40:08 -07:00
Zach Fox
947a3bf8a8 Pull in crash fix from other branch 2017-06-30 11:43:48 -07:00
Zach Fox
3c9291062d Clarify setDisplayTexture cases, also fixing crash bug 2017-06-30 11:43:11 -07:00
Brad Davis
6fc82bb351 Switch to preprocessor macro for blocking invokes to capture function information 2017-06-30 11:36:24 -07:00
Zach Fox
f78903eead Clarify setDisplayTexture cases, also fixing crash bug 2017-06-30 11:31:48 -07:00
Dante Ruiz
a749fa19ad made requested changes 2017-06-30 19:14:22 +01:00
Dante Ruiz
3e1aee4d8a saving work 2017-06-30 19:07:34 +01:00
Brad Davis
9c37b28ba0 Remove tool window logic 2017-06-30 10:58:19 -07:00
utkarshgautamnyu
82597ac424 Update snapshot.js 2017-06-30 10:22:05 -07:00
Zach Fox
f765b4136d Cleanup 2017-06-30 10:12:47 -07:00
Zach Fox
57692d263d Remove dead code 2017-06-30 10:12:47 -07:00
Zach Fox
5ceb80b3e7 It's working! 2017-06-30 10:12:46 -07:00
Zach Fox
8d89ea75f5 Initial commit 2017-06-30 10:12:46 -07:00
Zach Fox
e66b4f1761 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-30 10:12:24 -07:00
Zach Fox
0f9c917965 Merge pull request #10853 from samcake/brown 
Fix projection & lighting issues identified with 2nd rendering pipeline In Master
 2017-06-30 10:05:54 -07:00
Brad Davis
8372d73fec Additional thread safety 2017-06-30 09:15:06 -07:00
Cain Kilgore
a3db9ae726 Begin Rocket Hands branch 2017-06-30 15:40:42 +01:00
Brad Davis
b52dd7b822 Don't use blocking connections on the main thread 2017-06-29 20:45:17 -07:00
Atlante45
22099a14a8 Go Home spawns interface detached 2017-06-29 13:50:40 -07:00
Atlante45
ec7fe81b87 Sandbox doesn't restart Interface. 2017-06-29 13:22:11 -07:00
Menithal
bf0a8e0f91 Updated Comment 2017-06-29 23:18:52 +03:00
Brad Davis
8ec20ef042 Additional tracing of CPU cores 2017-06-29 13:16:15 -07:00
anshuman64
b22daa9a6f Merge pull request #10838 from druiz17/avatar-recording-roomscale 
Fix loading of incorrect joint data for the avatar recording
 2017-06-29 12:24:37 -07:00
Atlante45
5c731636b1 Sandbox restarts crashed processes 2017-06-29 12:13:52 -07:00
utkarshgautamnyu
7353014968 Merge pull request #10857 from highfidelity/agent_bug 
Update DomainMetadata.cpp
 2017-06-29 11:30:43 -07:00
David Kelly
02b712716b testing some rendering issues... 2017-06-29 11:12:10 -07:00
Atlante45
76e39a3ebd Make code windows specific 2017-06-29 10:54:44 -07:00
utkarshgautamnyu
5f123018a4 Update DomainMetadata.cpp 2017-06-29 10:38:33 -07:00
Seth Alves
c4667aa1a7 Merge pull request #10839 from vladest/file_dialog_crash_qt59 
File dialog crash qt59
 2017-06-29 10:34:26 -07:00
Zach Fox
00966966df Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-29 10:13:11 -07:00
Zach Fox
3170bdd08c Merge pull request #10837 from samcake/flash 
Fix projection & lighting issues identified with 2nd rendering pipeline
 2017-06-29 10:12:03 -07:00
Brad Davis
6e5eff9407 Fix snapshot connection errors 2017-06-29 10:01:48 -07:00
Chris Collins
52f16323e9 Merge pull request #10852 from highfidelity/RC-45-HOTFIX 
Build 45.1 Hotfix for Entity Server Scripts
 2017-06-29 09:34:29 -07:00
Sam Gateau
f7a3b3a411 Experimenting faster getters on Avatar for scripts 2017-06-29 15:55:47 +02:00
Sam Gateau
ca7e782566 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-29 10:54:27 +02:00
Sam Gateau
b766c256db Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-29 10:29:05 +02:00
Atlante45
a66e1148ba Preliminary work on AC auto cleanup 2017-06-28 19:20:18 -07:00
Thijs Wenker
6c487ec0af I need to setup my code-editor, spaces. 2017-06-28 17:47:34 -07:00
Thijs Wenker
f59a94d401 move the ResourceManager init back to where it was, to prevent problems 2017-06-28 17:47:34 -07:00
Seth Alves
3fa7d026a7 make ResourceManager be owned by DependencyManager 2017-06-28 17:47:32 -07:00
Seth Alves
9d002d6f6b move the location of Q_DECLARE_METATYPE(std::function<void()>) so that the server-script AC can see it 2017-06-28 17:32:53 -07:00