Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-19 03:40:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61951 commits 72 branches 59 tags 1.2 GiB
Commit graph

61951 commits

This branch
This branch
All branches
Author SHA1 Message Date
LaShonda Hopper
dbf8d19095 [Case 6491] eslint pass: fixes issues with equality checks. 
* Also adds some paren grouping to help with readability of some statements.
* eslint pass on script using .eslintrc.js

Changes to be committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-02 12:26:00 -04:00
vladest
07ba2cce5b Merge branch 'master' into login_dialog_rework 2017-10-02 18:24:12 +02:00
Nissim Hadar
5dd4624904 Merge branch 'master' into hazeZone 2017-10-02 09:11:00 -07:00
Nissim Hadar
97756146b1 Attempt to add qml configuration 2017-10-02 09:09:36 -07:00
vladest
e360c1363e Merge branch 'master' into tablet_extended_sounds 2017-10-02 18:03:49 +02:00
Zach Fox
2783293d24 Merge pull request #11490 from vladest/fix_walletsetup_focus 
Remove mouse area for text fields. use activeFocusOnPress property in…
 2017-10-02 08:38:04 -07:00
David Rowe
0bd67d494d Fix UI sometimes turning off/on/off as hand enters entity 2017-10-02 19:27:26 +13:00
Sam Gateau
ec10d38983 more cleaning 2017-10-01 22:28:04 -07:00
Nissim Hadar
bdd469cec4 Integrated haze shader into this branch. 2017-10-01 21:52:34 -07:00
Nissim Hadar
ffecf42ebb Some clean-up. 2017-10-01 21:12:29 -07:00
David Rowe
829cc8e5e6 Merge branch 'master' into vr-edit-a 2017-10-02 17:08:27 +13:00
Sam Gateau
6c510bc18f fine tuning the changes to respect clean up 2017-10-01 20:05:48 -07:00
Nissim Hadar
449d7ae988 Merge branch 'master' into hazeZone 2017-10-01 19:18:16 -07:00
Anthony J. Thibault
7dfa80f666 Bug fix for offset of animated parts of oculus touch controller display 
Ensure position/rotations are updated with a consistent scale and
are animated correctly as the controller values change.
 2017-10-01 17:52:59 -07:00
samcake
0cbf19bcf1 Removing comments 2017-10-01 17:47:35 -07:00
samcake
aa10c29609 Cleaning up the changed code 2017-10-01 17:16:10 -07:00
Seth Alves
0d010d0cf4 Merge pull request #11493 from hyperlogic/bug-fix/oculus-controller-rendering 
Bug fix for offset of animated parts of oculus touch controller display
 2017-10-01 16:54:05 -07:00
samcake
da4de38e91 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-01 15:01:18 -07:00
SamGondelman
572986bfad fix modeloverlay visible change 
(cherry picked from commit 0bb27a7165)
 2017-10-01 13:40:00 -07:00
Sam Gateau
59225ae8ac Merge pull request #11497 from SamGondelman/modelOverlays 
Fix ModelOverlay visible change
 2017-10-01 12:56:27 -07:00
Sam Gateau
44cc6deac2 moving render specific code from Application.cpp to Application_render.cpp 2017-10-01 12:55:44 -07:00
vladest
ad32e7bdf5 Merge branch 'master' into login_dialog_rework 2017-10-01 19:27:23 +02:00
vladest
9a00468ea9 semicolons, yes 2017-10-01 19:21:30 +02:00
vladest
feafd441b1 Make sure keyboard will be rised after lowering on another click 2017-10-01 18:54:07 +02:00
vladest
c3bc67b72d Merge branch 'master' into fix_walletsetup_focus 2017-10-01 18:24:38 +02:00
David Rowe
680235a7b1 += 1 ==> ++ 2017-10-01 13:22:48 +13:00
David Rowe
03e0e21ce0 JSLint ==> ESLint 2017-10-01 13:19:54 +13:00
Sam Gateau
c8c14445b9 Merge branch 'blue' of https://github.com/samcake/hifi into blue 2017-09-30 09:09:52 -07:00
Nissim Hadar
5a7fed022c Merging haze branch. 2017-09-30 00:04:28 -07:00
David Rowe
659b2d8a99 Disable debug log info 2017-09-30 15:14:07 +13:00
David Rowe
229c186901 Rename script from vr-edit.js to shapes.js 2017-09-30 15:09:35 +13:00
David Rowe
b56b3a2e61 Change app name from "VR EDIT" to "SHAPES" and use new icon 2017-09-30 15:01:21 +13:00
David Rowe
0daa5012ca Enable toolbar and tablet icons to load from local script directory 2017-09-30 15:00:15 +13:00
Nissim Hadar
95f8f1ffc5 Added Varying8 2017-09-29 18:05:48 -07:00
SamGondelman
0bb27a7165 fix modeloverlay visible change 2017-09-29 17:48:59 -07:00
samcake
577378f539 Adding stuff that seems to break? 2017-09-29 17:45:10 -07:00
Nissim Hadar
951ce247a2 Working on adding zone to haze. 2017-09-29 17:36:14 -07:00
druiz17
20918641f4 saving work 2017-09-29 16:48:25 -07:00
Howard Stearns
73c8da99dc Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties 2017-09-29 16:46:43 -07:00
Zach Fox
1e52e7824b Fix injection 2017-09-29 16:39:07 -07:00
Howard Stearns
58255abe12 animation url and computing certificateID 2017-09-29 16:32:25 -07:00
Zach Fox
255cede808 Correctly determine if we're on a marketplace screen 2017-09-29 16:05:26 -07:00
LaShonda Hopper
6571aef997 [Case 6491] makeStretchTool: Fix z undefined issue (details below). 
z:z appears to have been a typo, as there's no var z.  Should likely be z:1.

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-29 18:52:39 -04:00
Zach Fox
e6ea76eefe Tiny language fix - Thanks Cain! 2017-09-29 15:44:44 -07:00
Zach Fox
4668294389 Fix login flow regression 2017-09-29 15:25:24 -07:00
Nissim Hadar
2e1919eba5 Merge branch 'master' into hazeZone 2017-09-29 15:16:46 -07:00
Nissim Hadar
f26345a3f0 Working on adding zone to haze. 2017-09-29 15:15:49 -07:00
Zach Fox
bbbce96407 Fix gray securityimage 2017-09-29 14:30:02 -07:00
Anthony J. Thibault
9273e02497 Bug fix for offset of animated parts of oculus touch controller display 
Ensure position/rotations are updated with a consistent scale and
are animated correctly as the controller values change.
 2017-09-29 14:01:50 -07:00
samcake
225d2bbbb4 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-29 13:47:37 -07:00