Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 13:40:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
60268 commits 25 branches 0 tags 1.1 GiB
Commit graph

60268 commits

This branch
This branch
All branches
Author SHA1 Message Date
vladest
07ba2cce5b Merge branch 'master' into login_dialog_rework 2017-10-02 18:24:12 +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
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
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
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
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
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
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
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
SamGondelman
b8ea6c22fa no tpose when switching avatars 
(cherry picked from commit fcfac9efc0)
 2017-09-29 13:47:09 -07:00
Zach Fox
5509be7d33 Merge branch 'RC-56' of https://github.com/highfidelity/hifi into RC-56 2017-09-29 13:42:37 -07:00
Zach Fox
63396a2fc3 WalletScriptingInterface; wallet status refactor 2017-09-29 13:42:04 -07:00
Sam Gateau
fb5fd346ff Merge pull request #11492 from SamGondelman/tPose 
Fix getting stuck in T-Pose on avatar switch
 2017-09-29 13:37:31 -07:00
Sam Gateau
332fb86a9f Merge pull request #11141 from AndrewMeadows/prioritized-entity-streaming 
entity-server uses differential Octree traversal and priority-queued EntityItems
 2017-09-29 13:34:58 -07:00
David Rowe
75365847a1 Merge branch 'master' into vr-edit-a 2017-09-30 09:30:38 +13:00
Anthony J. Thibault
4fd4479497 Oculus: Bug fix for head offset on large/small scaled avatars. 
(cherry picked from commit d8e2cbf871)
 2017-09-29 13:28:40 -07:00
Zach Fox
96b6a2f013 Fix entity add after incomplete rezCertified implementation 
(cherry picked from commit 0f66fb41fd)
 2017-09-29 13:27:21 -07:00
vladest
7f6773b1f4 Added semicolons 2017-09-29 21:12:21 +02:00
humbletim
fd917917c4 include the source basename in Script.print() && QML/Script console.*() debug output 2017-09-29 14:48:01 -04:00
Andrew Meadows
ad9a239b45 remove unused cruft 2017-09-29 11:34:36 -07:00
Andrew Meadows
8134e2b7f9 fix const violation 2017-09-29 11:34:36 -07:00
Andrew Meadows
86cbea73c8 less magic 2017-09-29 11:34:36 -07:00