Zach Fox
|
9411c2e732
|
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
|
2017-07-03 10:24:02 -07:00 |
|
Seth Alves
|
70a7b302fc
|
Merge pull request #10860 from jherico/deadlock_guards
Don't use blocking connections on the main thread
|
2017-07-03 09:05:56 -07:00 |
|
Chris Collins
|
19bbe307b2
|
Merge pull request #9927 from Patterntrick/21210
Xylophone scripts
|
2017-07-03 05:57:36 -07:00 |
|
Clément Brisset
|
8744b8e58d
|
Merge pull request #10859 from Atlante45/fix/ac-cleanup
Fix AC cleanup
|
2017-06-30 16:42:15 -07:00 |
|
Stephen Birarda
|
f6fe3f91fd
|
Merge pull request #10829 from birarda/bug/sequence-skips
fix avatar mixer sending empty avatar identities
|
2017-06-30 15:28:29 -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 |
|
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 |
|
utkarshgautamnyu
|
c81211edef
|
Merge pull request #10848 from highfidelity/snapshot.js_modify
Update snapshot.js
|
2017-06-30 12:40:08 -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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Chris Collins
|
3a096381ce
|
Merge pull request #10851 from Atlante45/master
Stable => Master
|
2017-06-28 17:28:54 -07:00 |
|
Atlante45
|
fbe1518d1f
|
Merge branch 'stable' of https://github.com/highfidelity/hifi
|
2017-06-28 17:26:16 -07:00 |
|
Thijs Wenker
|
e781f97ddc
|
Merge pull request #10846 from sethalves/fix-server-scripts-more
make ResourceManager be owned by DependencyManager
|
2017-06-28 17:05:30 -07:00 |
|
Zach Fox
|
36e350cf1b
|
Merge pull request #10842 from zfox23/spectatorCamera_setInterval
Use setInterval() for cam position; Update model/registration; SPECTATOR button protections
|
2017-06-28 16:20:02 -07:00 |
|
Howard Stearns
|
3606418a22
|
Merge pull request #10836 from davidkelly/dk/scriptsSwitchBug
minor fix for --scripts switch
|
2017-06-28 16:11:18 -07:00 |
|
Thijs Wenker
|
d5289d357b
|
I need to setup my code-editor, spaces.
|
2017-06-29 01:01:59 +02:00 |
|
Thijs Wenker
|
93679f7c3b
|
move the ResourceManager init back to where it was, to prevent problems
|
2017-06-29 00:52:51 +02:00 |
|
utkarshgautamnyu
|
e6be838e79
|
Update snapshot.js
|
2017-06-28 15:30:49 -07:00 |
|
Zach Fox
|
218b32e9fb
|
Fix cameraUpdateInterval
|
2017-06-28 15:12:57 -07:00 |
|
Zach Fox
|
9f8a6c63cc
|
Fixup after merge
|
2017-06-28 14:44:26 -07:00 |
|
Zach Fox
|
fc5da7b4f0
|
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectatorCamera_setInterval
|
2017-06-28 14:18:58 -07:00 |
|
Seth Alves
|
794495c197
|
make ResourceManager be owned by DependencyManager
|
2017-06-28 14:18:14 -07:00 |
|
Andrew Meadows
|
e9edf01a34
|
Merge pull request #10831 from kencooke/audio-hrtf-optimize
More HRTF optimizations
|
2017-06-28 14:17:00 -07:00 |
|
David Kelly
|
48de8011b2
|
cr feedback
|
2017-06-28 14:15:29 -07:00 |
|
Zach Fox
|
604bb58987
|
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectatorCamera_setInterval
|
2017-06-28 14:12:25 -07:00 |
|
Howard Stearns
|
4fd4865f96
|
Merge pull request #10844 from howard-stearns/merge-from-master-6-28-2pm
Merge from master 6 28 2pm
|
2017-06-28 14:07:36 -07:00 |
|
howard-stearns
|
3293b4c898
|
Merge branch 'master' of https://github.com/highfidelity/hifi into merge-from-master-6-28-2pm
|
2017-06-28 13:53:32 -07:00 |
|