Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-18 14:28:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
82832 commits 25 branches 0 tags 1.1 GiB
Commit graph

141 commits

Author SHA1 Message Date
David Rowe
ffeb37e7aa Merge remote-tracking branch 'hifi/master' into merge-hifi-master 
# Conflicts:
#	CMakeLists.txt
#	README.md
#	cmake/externals/glad32es/CMakeLists.txt
#	cmake/externals/glad41/CMakeLists.txt
#	cmake/externals/glad45/CMakeLists.txt
#	cmake/externals/polyvox/CMakeLists.txt
#	cmake/externals/quazip/CMakeLists.txt
#	cmake/externals/vhacd/CMakeLists.txt
#	cmake/init.cmake
#	cmake/ports/hifi-deps/CONTROL
#	cmake/ports/sdl2/CONTROL
#	cmake/ports/sdl2/disable-hidapi-for-uwp.patch
#	cmake/ports/sdl2/enable-winrt-cmake.patch
#	cmake/ports/sdl2/fix-arm64-headers.patch
#	cmake/ports/sdl2/fix-x86-windows.patch
#	cmake/ports/sdl2/portfile.cmake
#	cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake
#	cmake/ports/tbb/portfile.cmake
#	hifi_vcpkg.py
#	interface/src/avatar/MyAvatar.h
#	libraries/avatars-renderer/src/avatars-renderer/Avatar.h
#	libraries/avatars/src/AvatarData.h
#	libraries/entities-renderer/src/RenderableEntityItem.h
#	libraries/entities/src/EntityItem.cpp
#	libraries/entities/src/EntityItem.h
#	libraries/fbx/src/GLTFSerializer.cpp
#	libraries/graphics-scripting/src/graphics-scripting/Forward.h
#	libraries/networking/src/AddressManager.cpp
#	libraries/networking/src/DomainHandler.h
#	libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
#	libraries/render-utils/src/HighlightEffect.cpp
#	libraries/render-utils/src/MeshPartPayload.cpp
#	libraries/render-utils/src/Model.cpp
#	libraries/render-utils/src/RenderShadowTask.cpp
#	libraries/script-engine/src/WebSocketClass.cpp
 2020-04-09 16:46:27 +12:00
NexPro
2a8b92e683 Updated interface login page 2020-01-08 16:21:25 +00:00
Brad Hefta-Gaub
69af66195c
Merge pull request #15334 from SaracenOne/screen_name_at_signup_push 
case 22189: Add display name field to the log in screen.
 2019-11-19 12:02:31 -08:00
SamGondelman
31b3f0e8f1 possible fix for openUrl exploit 2019-04-24 16:39:31 -07:00
Saracen
36af2c8e62 Change 'displayName' to 'displayNameField'. 2019-04-16 13:56:02 +01:00
Saracen
282fcf20ec Add display name field to the log in screen. 2019-04-16 13:34:44 +01:00
Wayne Chen
e6426cb680
fixing bug with cancel button 2019-01-23 10:26:51 -08:00
Wayne Chen
2859784e17
Merge branch 'master' into oculusLoginFeature 2019-01-17 14:20:00 -08:00
Wayne Chen
ef63213d28 fixing linking account problems on oculus/steam, changing callback 2019-01-16 21:07:54 -08:00
Wayne Chen
671f15b63c removing isLogIn 2019-01-16 17:05:53 -08:00
Wayne Chen
fbc2dc5103 adding changes to forms 2019-01-16 17:05:52 -08:00
Wayne Chen
ca0916886a adding more qml for oculus login 2019-01-16 17:05:51 -08:00
Wayne Chen
6bc1164d58 more wip on oculus login 2019-01-16 17:05:50 -08:00
Wayne Chen
970798705c improving flow from Oculus API to login dialog wip 2019-01-16 17:05:48 -08:00
Wayne Chen
db06533018 adding more staging 2019-01-16 17:05:48 -08:00
Wayne Chen
1fc51445d0 adding files for staging login 2019-01-16 17:05:47 -08:00
Wayne Chen
ba8620b644 updating user activity logging 2019-01-09 13:51:40 -08:00
Wayne Chen
302e314787 keep me logged in by default 2018-12-17 15:21:41 -08:00
Wayne Chen
1ce7d8a31c dev feedback 2018-12-13 13:47:07 -08:00
Wayne Chen
b4e2b74f3d adding text wrapping/fixing keep me logged in setting 2018-12-12 15:27:42 -08:00
Wayne Chen
941df8bc35 attempting fix on losing logged in setting 2018-12-12 10:08:50 -08:00
Wayne Chen
3c4382773a fixing code for max height/width 2018-12-09 07:56:09 -08:00
Wayne Chen
23d3b96446 add spinner/design updates/fix steam link 2018-12-07 15:17:33 -08:00
Wayne Chen
2f4805dc04 adding focus disable signal to fix focus 2018-12-06 16:38:10 -08:00
Wayne Chen
1a86b8d172 50% opacity/bold shortcut text 2018-12-06 14:58:39 -08:00
Wayne Chen
4f0e23ed69 changing link steam flow/height of error message 2018-12-06 11:26:33 -08:00
Wayne Chen
9f894ae977 fixing case with KB pw prop./bolding error msg 2018-12-06 10:52:10 -08:00
Wayne Chen
89a216a5ec Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-12-06 09:05:07 -08:00
Wayne Chen
ce65e557bc cleaning up commented code 2018-12-06 09:04:57 -08:00
Wayne Chen
f8a55a9196 25% opacity from PM req/fixing error message in profile body 2018-12-05 19:42:44 -08:00
Wayne Chen
037abd9b5e don't allow PC keyboard in HMD login/fix sign up password 2018-12-05 18:14:59 -08:00
Wayne Chen
27e4e1c245 pitch updates login pos/fix signup errors 2018-12-05 11:24:27 -08:00
Wayne Chen
eb51a5b7b6 changing opacity to 0.5 2018-12-05 10:16:48 -08:00
Wayne Chen
3d99ffc459 outing oculus login 2018-12-05 08:25:01 -08:00
Wayne Chen
a24cd41367 getting textfield into focus 2018-12-04 14:19:09 -08:00
Wayne Chen
e7e42e3430 adding steam linking 2018-12-04 10:03:40 -08:00
Wayne Chen
dc3381d4a9 updating artwork 2018-12-03 17:28:10 -08:00
Wayne Chen
5beb810604 adding more steam login flow 2018-12-03 16:09:10 -08:00
Wayne Chen
224ad28ed7 lowering banner/adding space btwn cancel/signup 2018-11-30 13:09:54 -08:00
Wayne Chen
c8783776fe removing mousearea, fixing continue button 2018-11-30 13:02:29 -08:00
Wayne Chen
707339dd2a allowing clicking any mousearea back to the textfield/disable movement ctrls 2018-11-29 17:18:40 -08:00
Wayne Chen
b0fb7778cf fixing some text, turning off lasers until they intersect login overlay 2018-11-28 19:17:30 -08:00
Wayne Chen
527f8a2b59 UI feedback + new overlay position update 2018-11-28 15:38:37 -08:00
Wayne Chen
d8a1c4e956 reverting header in qml 2018-11-27 14:34:58 -08:00
Wayne Chen
94789d0170 standardizing font of text fields 2018-11-26 21:06:42 -08:00
Wayne Chen
1258676d56 fixing text height/toolbar coming back 2018-11-26 21:01:34 -08:00
Wayne Chen
c53febceac adding oculus to login dialog/adding focus wip 2018-11-26 15:10:04 -08:00
Wayne Chen
d12655ed7b sfx to login mousearea/hiding desktop toolbar 2018-11-21 12:21:19 -08:00
Wayne Chen
cdee10d0b8 getting dominant hand laser + sign up working 2018-11-20 16:54:16 -08:00
Wayne Chen
d55c9467e7 fixing keyboard offset 2018-11-20 10:37:30 -08:00