Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 13:14:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
56777 commits 67 branches 56 tags 1.2 GiB
Commit graph

56777 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dante Ruiz
6f30cb1825 Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop 2017-07-01 00:48:49 +01:00
Dante Ruiz
51792769b5 finished vive in desktop mode 2017-07-01 00:48:36 +01: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
Dante Ruiz
309a03230c Merge branch 'calibration-ui-update' into vive-in-desktop 2017-06-30 23:43:59 +01:00
Dante Ruiz
577969481d head puck working 2017-06-30 23:43:12 +01: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
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
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
utkarshgautamnyu
82597ac424 Update snapshot.js 2017-06-30 10:22:05 -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
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
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
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
Dante Ruiz
f077e40dd3 Merge branch 'master' of github.com:highfidelity/hifi into calibration-ui-update 2017-06-28 23:51:13 +01:00
Dante Ruiz
a7e4dc1473 clean up code 2017-06-28 23:51:00 +01:00
utkarshgautamnyu
e6be838e79 Update snapshot.js 2017-06-28 15:30:49 -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
Seth Alves
5617860fe4 Merge pull request #10841 from sethalves/fix-server-scripts 
fix server scripts AC
 2017-06-28 11:56:32 -07:00
Dante Ruiz
a2df2f8472 added user activity status 2017-06-28 19:52:19 +01:00
Ken Cooke
a7a049434d CR fix: comments instead of ref code 2017-06-28 11:32:41 -07:00
Ken Cooke
0dbb7a71f3 CR fix: comments instead of ref code 2017-06-28 11:32:24 -07:00
Seth Alves
2f3109e4be move the location of Q_DECLARE_METATYPE(std::function<void()>) so that the server-script AC can see it 2017-06-28 11:00:05 -07:00
Clément Brisset
a2c15c9794 Merge pull request #10770 from jherico/fix_deps_1 
Cleanup entity dependencies
 2017-06-28 10:48:58 -07:00
Ken Cooke
0acbdc7755 CR fix: use predefined PI 2017-06-28 10:18:54 -07:00
Chris Collins
f76ec439be Merge pull request #10810 from highfidelity/RC-45 
Beta Release 45 - Includes up to Developer Release 6767
 2017-06-28 09:25:15 -07:00
Andrew Meadows
1e23fa7baa Merge pull request #10822 from hyperlogic/feature/no-toe-wiggle 
Eliminated toe wiggle while pucks are enabled.
 2017-06-28 08:30:27 -07:00
Dante Ruiz
96ae39989e Merge branch 'master' of github.com:highfidelity/hifi into avatar-recording-roomscale 2017-06-28 16:22:41 +01:00
Dante Ruiz
f6ba264de6 avatar recording fix 2017-06-28 16:22:28 +01:00