Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-15 12:48:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
81116 commits 69 branches 56 tags 1.2 GiB
Commit graph

8143 commits

Author SHA1 Message Date
Zach Fox
222b1fbd20 Fix bug with debugFTUE === 1 2019-10-11 12:26:12 -07:00
Zach Fox
19acd76854 Modify InteractiveWindow positions in C++ instead of JS, resulting in huge speedup 2019-10-10 15:48:40 -07:00
Zach Fox
609f6f9a25 Fix minimize bug; fix bug where FTUE window appears behind Interface window 2019-10-09 15:46:50 -07:00
Zach Fox
bed1192d70 A bunch of fixes, plus added a debug mode Settings switch 2019-10-09 14:18:36 -07:00
Zach Fox
601f7ac5e9 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-09 13:26:21 -07:00
Maia Hansen
ad863a1cef
Merge pull request #16313 from RebeccaStankus/controllerSignals 
Added flag to ensure mouse event signals are not connected twice
 2019-10-08 15:58:24 -07:00
Zach Fox
17478af32d Remove debug code 2019-10-08 17:31:35 -04:00
Zach Fox
753a61ed2c More iteration with Joshua 2019-10-08 17:31:10 -04:00
RebeccaStankus
092424569d Added flag to ensure mouse event signals are not connected twice 2019-10-08 12:01:47 -07:00
Zach Fox
9feab869ad DEV-2350: Prevent duplicate default scripts from running 2019-10-08 14:48:19 -04:00
Zach Fox
42bf2bf30e All windows 'done' except for final tweaks; debug mode still ON 2019-10-08 13:17:04 -04:00
Zach Fox
b0adf1ef02 Almost done with init screen 2019-10-07 20:29:18 -04:00
Zach Fox
a23bee19e8 Controls screen done 2019-10-07 19:52:22 -04:00
Zach Fox
643dd21f86 Merge branch 'master' of github.com:highfidelity/hifi into frictionIteration 2019-10-07 13:22:08 -04:00
Shannon Romano
921cec872b
Merge pull request #16300 from hyperlogic/bug-fix/mat4-forward-right-up-fixes 
Fix for Mat4.getForward, getRight and getUp
 2019-10-04 17:00:43 -07:00
Anthony J. Thibault
e3f799d039 Fix for Mat4.getForward, getRight and getUp 
It should match the results from the same methods on the Quat class.
 2019-10-04 13:59:38 -07:00
RebeccaStankus
31dcbf532f Missed a Capital letter in a function name 2019-10-04 10:10:54 -07:00
RebeccaStankus
8089653784 CR Feedback changes 2019-10-04 09:43:47 -07:00
RebeccaStankus
2f2b7b0306 Ready for CR Thank you Zach 2019-10-03 17:30:47 -07:00
Zach Fox
0e7dff05fb Wrap Items in Flickables so scrollbars will work - contents of flickable not showing up rn 2019-10-03 12:55:02 -07:00
RebeccaStankus
1dd6aebede Handle minimized window 2019-10-03 12:16:39 -07:00
Zach Fox
b23aecf6c5 Merge branch 'friction' of github.com:RebeccaStankus/hifi into friction 2019-10-03 10:12:58 -07:00
Zach Fox
33b8942ffd Changes to Avatar/Profile App complete 2019-10-03 09:41:30 -07:00
RebeccaStankus
94e71e1bdd Still trying get QML gridLayouts to work 2019-10-02 17:14:50 -07:00
RebeccaStankus
b1fd6050c7 Merged Zach's work 2019-10-02 12:55:51 -07:00
RebeccaStankus
47841d9bcd Merge branch 'friction' of github.com:RebeccaStankus/hifi into friction 2019-10-02 12:42:53 -07:00
RebeccaStankus
dc15b55aa5 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-02 12:05:34 -07:00
Zach Fox
6bfca4e587 DEV-2275: Move 'input device muted' banner and make it slightly smaller 2019-10-02 11:48:50 -07:00
Zach Fox
50b06a40d7 Improved random avatar selection logic, plus local avatars 2019-10-01 17:22:24 -07:00
RebeccaStankus
d2e62749c7 Ready for Zach to add default avatar changes 2019-10-01 16:36:06 -07:00
Shannon Romano
38574cd66b
Merge pull request #16245 from luiscuenca/implementPointAt 
DEV-442: Implement directional blending node for point reaction
 2019-10-01 11:46:30 -07:00
RebeccaStankus
3167dc9a35 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-01 09:59:14 -07:00
RebeccaStankus
0dfb234089 Finished UI, ready for CR 2019-10-01 09:58:44 -07:00
RebeccaStankus
6658e6377c Adding 1 simplifiedUI constant import 2019-09-30 15:06:31 -07:00
RebeccaStankus
0f1190df8b Trying to make QML UI work second launch 2019-09-30 15:03:58 -07:00
RebeccaStankus
9a03058e88 Trying to make QML UI work 2019-09-30 12:09:22 -07:00
luiscuenca
02d889ba6e
account for point target validity 2019-09-30 11:35:00 -07:00
RebeccaStankus
b98d106a3b mend 2019-09-30 10:39:35 -07:00
RebeccaStankus
b25c874e5f More work on second launch UI 2019-09-30 10:38:11 -07:00
RebeccaStankus
44d9610048 Working on UI 2019-09-30 09:17:51 -07:00
Sam Gateau
57f8095506 Pass 4 on cleaning up that pr, put the SortFIlterModel.qml in the new skit/qml lib, setting the opacityMappMode correctly from script 2019-09-27 12:00:45 -07:00
RebeccaStankus
f4ecd3dcd8 Working on initial/second launch 2019-09-27 09:15:39 -07:00
Sam Gateau
24cc302a8b second pass of cleaning on the code to make it ready for merge 2019-09-26 16:56:00 -07:00
Sam Gateau
dc40c530a3 INstrumenting the code more... 2019-09-25 17:53:59 -07:00
luiscuenca
0aab2ed07f
Disable head look at when pointing 2019-09-25 12:37:24 -07:00
Sam Gateau
3e3c4c2e70 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2019-09-24 18:58:29 -07:00
Sam Gateau
0d9cd69d94 SImplifying Page.js, and adding a REsourceInspector 2019-09-24 18:10:57 -07:00
luiscuenca
ad79393e1f
Implement point at directional blend and API 2019-09-24 17:55:38 -07:00
Sam Gateau
2a78fc7b38 Remove the auto refresh list of resource because it takes too much time, instead user has to press refresh button 2019-09-24 14:29:09 -07:00
Sam Gateau
8aaa5deb11 Clean up the sort and filter system 2019-09-24 12:37:01 -07:00