Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-17 22:42:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
56875 commits 6 branches 1 tag 1.1 GiB
Commit graph

56875 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Stephen Birarda
86eb5b14ca disable the user activity logger in DS/AC/ac-client 2017-06-28 13:19:58 -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
Vladyslav Stelmakhovskyi
51b44d9021 Implement same for HMD mode 2017-06-28 16:36:25 +02:00
Vladyslav Stelmakhovskyi
6acf426b1e Merge branch 'master' into file_dialog_crash_qt59 2017-06-28 16:01:18 +02:00
Vladyslav Stelmakhovskyi
d3282a4ed0 Cleanup 2017-06-28 15:56:35 +02:00
Vladyslav Stelmakhovskyi
0d4328fa51 Merge branch 'master' into file_dialog_crash_qt59 2017-06-28 15:54:53 +02:00
Sam Gateau
93963b3257 Apply the projection and deferred transform fixes found while working on spectator camera 2017-06-28 15:44:17 +02:00
Menithal
ffd9ee2908 More appeasement of GNU C Compiler warnings 2017-06-28 07:09:15 +03:00
Seth Alves
e4a9674614 Merge pull request #10824 from sethalves/fix-script-sleep-busyloop 
use QEventLoop and a timer for a less CPU using sleep + event-processing
 2017-06-27 21:00:40 -07:00
Brad Davis
28d727153b PR feedback 2017-06-27 19:22:07 -07:00
Brad Davis
8130a91b8c Cleanup entity dependencies 2017-06-27 19:15:49 -07:00
David Kelly
9417a176a1 make scripts tree show scripts in directory passed in with --scripts 2017-06-27 18:10:54 -07:00
Menithal
24616f150f Appeasing the Linux gods 2017-06-28 00:37:18 +03:00
Stephen Birarda
e6cf7cf106 flag last broadcast for identity in right place 2017-06-27 14:25:53 -07:00
Brad Davis
827fa98baa Fix toolbar button activation states 2017-06-27 14:06:19 -07:00
Ken Cooke
a00cd42566 fast compute of HRTF gain 2017-06-27 14:01:28 -07:00
Ken Cooke
ad970c9f5c fast compute of HRTF azimuth 2017-06-27 13:45:18 -07:00
Vladyslav Stelmakhovskyi
241231c00c file lists works, but not initial yet 2017-06-27 22:14:58 +02:00
Howard Stearns
20f713a241 Merge pull request #10803 from davidkelly/dk/cacheSwitch 
new --cache switch for interface
 2017-06-27 12:23:23 -07:00
Stephen Birarda
af79555e4b make sure nodeData exists before using it 2017-06-27 12:05:35 -07:00
Stephen Birarda
089a2bb362 do not manage identity data without identity data received 2017-06-27 11:58:03 -07:00
Ken Cooke
dcdf07191b Fast acosf() using polynomial approximation 2017-06-27 11:29:44 -07:00
Anthony J. Thibault
d4122cff5a warning fix 2017-06-27 11:29:08 -07:00
David Kelly
01155ba4e3 this handles redirecting ktx_cache, data8, prepared 2017-06-27 08:47:54 -07:00
Seth Alves
f1db0e9e53 Merge pull request #10795 from samcake/brown 
Adding trace profiling feature Script
 2017-06-27 08:25:56 -07:00
Sam Gateau
1fbaac12ec Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-27 15:54:12 +02:00
Seth Alves
722dc46f60 Merge branch 'master' of github.com:highfidelity/hifi into fix-script-sleep-busyloop 2017-06-27 06:44:31 -07:00
Seth Alves
588f1aefd9 Merge pull request #10827 from jherico/fix_toolbar_activation_state 
Fix toolbar button activation states
 2017-06-27 06:44:18 -07:00