Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-07 08:19:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
83223 commits 70 branches 57 tags 1.2 GiB
Commit graph

190 commits

Author SHA1 Message Date
motofckr9k
256b466e84 Add vircadia-banner.svg for login dialogs 2020-06-18 09:12:01 +02:00
motofckr9k
3d05cdd61e Merge remote-tracking branch 'refs/remotes/kasen/master' 
Conflicts:
	BUILD_WIN.md
	CODING_STANDARD.md
	LICENSE
	cmake/installer/installer-header.bmp
	cmake/installer/installer.ico
	cmake/installer/uninstaller-header.bmp
	interface/resources/images/about-vircadia.png
	interface/resources/images/vircadia-logo.svg
	interface/resources/qml/LoginDialog.qml
	interface/resources/qml/dialogs/TabletLoginDialog.qml
	interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
	interface/src/Application.cpp
	pkg-scripts/athena-server.spec
	scripts/system/more/app-more.js
	scripts/system/more/css/styles.css
	scripts/system/more/more.html
 2020-06-10 02:49:13 +02:00
motofckr9k
d406b81b47 Big rebrand 2020-05-22 20:35:27 +02:00
Marcus Llewellyn
d19c474d65 Rebrand login screens for Vircadia. 2020-05-17 15:17:26 -05:00
Marcus Llewellyn
187a2749c3 Rebrand the About dialog to Vircadia. 
Also removes trailing whitespace from Menu.cpp.
 2020-05-17 14:26:45 -05:00
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
203c371a01 Re-branding of help dialogs and tablet login 2020-01-14 00:33:29 +00:00
kasenvr
1133f51971
Merge pull request #70 from Nex-Pro/kasen/core 
Rebranding of login dialogs etc. QML
 2020-01-13 09:42:09 -05:00
Marcus Llewellyn
00855cba3d Redo the About menu dialog 
Change project name, remove references to EOS blockchain, add Project Athena copyright, add attribution to Opus.
 2020-01-10 16:09:20 -06:00
NexPro
3944d6e47c added banner svg 2020-01-08 16:24:49 +00:00
David Rowe
748999b8d6 Remove reference to BodyMart in Avatar app 2019-11-19 09:59:59 +13:00
David Rowe
a912e97f1e Remove reference to AvatarIsland in Avatar app 2019-11-19 09:53:58 +13:00
Ryan Huffman
5370e67507 Update logo on login popup 2019-09-12 14:48:21 -07:00
SamGondelman
b92e26722c rebake default skybox 2019-05-21 15:58:46 -07:00
SamGondelman
a672b79cd8 add version to default skybox 2019-05-21 15:35:43 -07:00
Simon Walton
e768beb9b1 Allow for delayed challenges if salt is empty 2019-05-14 15:53:35 -07:00
Simon Walton
de97af5c02 Minimal working version for avatar's client 
Also merge of Wayne's proof-of-concept
 2019-04-24 17:42:51 -07:00
John Conklin II
87556059d3
Merge pull request #13901 from Cristo86/android_handshake 
case 20058: Android - Handshake implementation
 2019-02-20 13:33:52 -08:00
SamGondelman
d988de4a17 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-11 10:27:12 -08:00
danteruiz
76a56c679a making requested changes 2019-02-08 10:03:05 -08:00
SamGondelman
b1e7c3d4fd allow negative dimensions for planar overlays via HACK, set default texture for line overlays to white pixel 2019-02-06 16:04:40 -08:00
Gabriel Calero
6a665835e7 Merge remote-tracking branch 'upstream/master' into android_handshake 2019-01-30 17:06:41 -03:00
Ryan Huffman
1da179dc04 Update avatar packager styling 2018-12-27 00:13:45 -08:00
Wayne Chen
c28f0fd232 updating qml, adding new glyphs font 2018-10-23 16:22:42 -07:00
Wayne Chen
2a0a099397 adding steam svg 2018-10-23 10:04:21 -07:00
Wayne Chen
3bd10716b2 wip 2018-10-19 16:06:28 -07:00
John Conklin II
9f0b4fb437
Merge pull request #14122 from SamGondelman/skybox 
Rebake default skybox for all platforms
 2018-10-17 09:50:00 -07:00
Sam Gondelman
121fc7205c Delete Default-Sky-9-cubemap.texmeta 2018-10-14 22:36:22 -07:00
Wayne Chen
2d85f882b8 adding buttons 2018-10-02 17:47:09 -07:00
SamGondelman
49553e0285 bake default skybox 2018-10-01 14:05:15 -07:00
Wayne Chen
54f800fbda including images/parent buttons to text 2018-09-25 20:21:05 -07:00
Wayne Chen
bf7dd94db7 button was clipped; adding higher res img 2018-09-13 17:25:33 -07:00
Wayne Chen
2b8aebdb6b Revert "Merge branch 'master' into fixGoToButtonInterstitial" 
This reverts commit b4b0c519f3, reversing
changes made to aef3ed3e01.
 2018-09-13 17:21:29 -07:00
Wayne Chen
db1acb87b8 button was clipped; adding higher res img 2018-09-13 15:38:24 -07:00
John Conklin II
f67deb9f65
Merge pull request #13938 from wayne-chen/interstitalMerged 
Interstitial Page with 404 Redirect
 2018-09-12 08:39:52 -07:00
Wayne Chen
78fa52285f adding show password toggle in textfield 2018-09-05 23:48:21 -07:00
Cristian Luis Duarte
4f3a730d6d Android - Handshake implementation - two important notes - IK was disabled on android and this enables it (needs a well thought review) - TouchscreenVirtualPadDevice buttons code does not scale well, it needs a refactor 2018-08-29 18:53:14 -03:00
Dante Ruiz
75cc1c62c0 mostly done interstitial page 2018-08-10 16:53:34 -07:00
Dante Ruiz
353121be7d making some changes 2018-08-09 16:29:37 -07:00
Dante Ruiz
8c5eefcc95 some file and code cleanup 2018-08-07 10:58:45 -07:00
Alexander Ivash
fd7fb424f5 apply updated image from Mukul 2018-07-23 23:48:06 +03:00
Alexander Ivash
46992f04ad replace bodymart & avatarisland images 2018-07-06 21:00:55 +03:00
Alexander Ivash
235b0e9f4d change icon for 'guy-in-circle' 2018-07-06 21:00:53 +03:00
Alexander Ivash
856c95b52a move avatarapp-specific images into appropriate subfolder 2018-07-06 21:00:53 +03:00
Alexander Ivash
0efb5437e8 remove sample avatar thumbnails 2018-07-06 21:00:53 +03:00
Alexander Ivash
1ddfc87396 wip on avatarapp 2018-07-06 21:00:51 +03:00
druiz17
8c83bd29a3 making requested changes 2018-06-07 14:04:39 -07:00
Dante Ruiz
25305ab57f updating texture 2018-06-06 11:31:39 -07:00
Dante Ruiz
995cfeb3c5 cleaning code 2018-06-06 10:42:12 -07:00
Dante Ruiz
59c50b7f26 remove highlight overlay in favor of materialEntity 2018-06-06 08:38:58 -07:00