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 |
|
kasenvr
|
e3d4856415
|
Update README.md
|
2020-04-03 15:46:06 -04:00 |
|
kasenvr
|
922a34f88a
|
Merge pull request #255 from kasenvr/v0.86.0-k2
V0.86.0 k2 -> kasen/core
|
2020-04-02 17:28:35 -04:00 |
|
kasenvr
|
76aff7a70f
|
Merge pull request #253 from MarcusLlewellyn/fix/console-rebrand
Rebrand server console to Vircadia with Kasen icon.
|
2020-04-02 17:27:09 -04:00 |
|
|
|
05f4bfc1ca
|
Replace hifi branded images amd icons with Vircadia
|
2020-04-01 18:13:36 -05:00 |
|
|
|
96047d7536
|
Attempt find/replace all "High Fidleity" strings with "Vircadia"
Also updates most URLs to point to Vircadia resources with the exception of the serverless domain tutorial.
Branched from `v0.86.0-k2`
|
2020-03-31 14:33:08 -05:00 |
|
kasenvr
|
243309fdc4
|
Merge pull request #247 from FluffyJenkins/feature/chat
Added license
|
2020-03-30 18:50:53 -04:00 |
|
Fluffy Jenkins
|
f5b287b084
|
Added license
|
2020-03-30 22:10:53 +01:00 |
|
kasenvr
|
439ff4b843
|
Merge pull request #242 from kasenvr/fix/install-docs
Update install.md
|
2020-03-29 18:18:05 -04:00 |
|
Kasen IO
|
35793dcad5
|
Update install.md
|
2020-03-29 15:37:10 -04:00 |
|
kasenvr
|
cd452bcc14
|
Merge pull request #241 from kasenvr/fix/update-build-docs
Update build docs.
|
2020-03-29 02:44:18 -04:00 |
|
Kasen IO
|
cb13363f0e
|
Update build docs.
|
2020-03-28 22:38:28 -04:00 |
|
kasenvr
|
fc1a19f6eb
|
Merge pull request #240 from ctrlaltdavid/feature/relabel-goto
Relabel "GOTO" app's button to "OLD GOTO"
|
2020-03-28 21:05:55 -04:00 |
|
David Rowe
|
0bef98fd96
|
Relabel "GOTO" app's button to "OLD GOTO"
|
2020-03-29 13:34:26 +13:00 |
|
kasenvr
|
a0e23580f8
|
Merge pull request #101 from odysseus654/rpm-pr
RPM & Deb build scripts for server
|
2020-03-28 19:56:49 -04:00 |
|
Heather Anderson
|
183c966453
|
Tweaks done in response to Kalila's smoketest of ubuntu packaging
|
2020-03-28 23:52:40 +00:00 |
|
kasenvr
|
13f3ef20a2
|
Merge pull request #236 from kasenvr/fix/explore-app
Update to explore app.
|
2020-03-28 17:23:18 -04:00 |
|
kasenvr
|
4de4be0cbd
|
Merge pull request #237 from kasenvr/fix/api-docs-menu
Fix sidebar not showing on first load for API Docs
|
2020-03-27 21:26:00 -04:00 |
|
Kasen IO
|
fff819f56c
|
Fix sidebar not showing on first load.
|
2020-03-27 16:07:59 -04:00 |
|
Kasen IO
|
46bd7e6001
|
Update title.
|
2020-03-27 14:44:33 -04:00 |
|
Kasen IO
|
3a4fbbc0b9
|
Update to explore app.
|
2020-03-26 22:28:39 -04:00 |
|
Heather Anderson
|
6126133b58
|
bumping up version to K3
making adjustments to DEB construction for (hopefully) cleaner output
|
2020-03-22 23:19:10 +00:00 |
|
David Rowe
|
b4391f8218
|
Merge pull request #222 from MarcusLlewellyn/fix/vcpkg-tbb-hash
Fix updated TBB library hash in vcpkg portfile
|
2020-03-21 21:40:14 +13:00 |
|
David Rowe
|
54151c301b
|
Merge pull request #219 from ctrlaltdavid/fix/update-license
Update license notice
|
2020-03-20 08:42:43 +13:00 |
|
David Rowe
|
498bde3962
|
Fix spaces
|
2020-03-19 19:52:02 +13:00 |
|
David Rowe
|
fa83e44095
|
Update copyright date to match Help > About dialog's
|
2020-03-19 19:49:36 +13:00 |
|
|
|
acbc8a889f
|
Fix updated TBB library hash in vcpkg portfile
|
2020-03-18 19:15:33 -05:00 |
|
David Rowe
|
a61ffa83c6
|
Update license notice
|
2020-03-19 10:20:12 +13:00 |
|
kasenvr
|
c793007de9
|
Merge pull request #218 from kasenvr/docs/entity-types-link
Add link to top of Entities API docs for the list of entity types.
|
2020-03-18 15:26:21 -04:00 |
|
Kasen IO
|
e101535106
|
Add link to top of Entites API docs for the list of entity types.
|
2020-03-18 14:58:32 -04:00 |
|
kasenvr
|
c3ef4037a1
|
Merge pull request #187 from kasenvr/feature/default-moreapp
Add app-more.js to default scripts.
|
2020-03-17 16:44:59 -04:00 |
|
kasenvr
|
d0cea34269
|
Merge branch 'kasen/core' into feature/default-moreapp
|
2020-03-16 17:58:58 -04:00 |
|
kasenvr
|
474770f0f2
|
Merge pull request #190 from kasenvr/feature/interim-goto
Adds interim decentralizedGoTo as a default script, adds beta channel as well.
|
2020-03-16 17:52:47 -04:00 |
|
kasenvr
|
f7e2b277bc
|
Merge pull request #192 from kasenvr/feature/toggle-beta-defaults
Adds menu toggle for beta default scripts
|
2020-03-16 17:51:28 -04:00 |
|
Kasen IO
|
5c4078320b
|
Undo var -> const in more.html because it doesn't work, because reasons.
|
2020-03-16 00:39:29 -04:00 |
|
Kasen IO
|
3731b64b37
|
DisplayApp -> displayApp function name.
|
2020-03-16 00:28:32 -04:00 |
|
Kasen IO
|
391c4975fa
|
var -> const in more.html
Co-Authored-By: Keb Helion <60008426+KebHelion@users.noreply.github.com>
|
2020-03-16 00:25:08 -04:00 |
|
kasenvr
|
c78f7a9596
|
Apply suggestions from code review
Co-Authored-By: David Rowe <david@ctrlaltstudio.com>
|
2020-03-16 00:22:04 -04:00 |
|
Kasen IO
|
6420752db1
|
Update code formatting and add search optimization features.
Co-Authored-By: Keb Helion <60008426+KebHelion@users.noreply.github.com>
|
2020-03-15 23:15:20 -04:00 |
|
Kasen IO
|
f70a9ec4c0
|
Bugfixing. - authored by Keb Hellion.
|
2020-03-13 13:34:32 -04:00 |
|
Kasen IO
|
cb4407532d
|
Type check for metadataScript.src.
|
2020-03-13 10:09:33 -04:00 |
|
Kasen IO
|
bb3da99856
|
Undo overwritten previous fixes to type checking.
|
2020-03-12 15:29:11 -04:00 |
|
Kasen IO
|
1f67adc6dd
|
Fix menu unsubscribing.
|
2020-03-12 03:46:09 -04:00 |
|
Kasen IO
|
4eea4980fd
|
Lint + fix default apps per page + fix script list loading bug.
|
2020-03-11 14:59:35 -04:00 |
|
kasenvr
|
0622be55e6
|
Merge pull request #205 from ctrlaltdavid/feature/fix-interim-goto
Fix button icons
|
2020-03-11 01:23:25 -04:00 |
|
David Rowe
|
0839d15c5a
|
Fix button icons
|
2020-03-11 16:31:02 +13:00 |
|
kasenvr
|
db0bcb9b19
|
Merge pull request #184 from kasenvr/fix/chat-goto-json
Updates the var name and URL for the goto JSON for use in chat
|
2020-03-09 15:18:38 -04:00 |
|
kasenvr
|
3e0fa35a2a
|
Merge pull request #199 from ctrlaltdavid/feature/fix-interim-goto
Fix button label and icon
|
2020-03-09 12:13:33 -04:00 |
|
Heather Anderson
|
3e378a4131
|
Updating AWS Linux rpm builder
- improved external dependency detector
- fixed (minimal) documentation in README
|
2020-03-08 07:46:08 +00:00 |
|
Heather Anderson
|
4f55e6c220
|
Merge branch 'rpm-pr' of github.com:odysseus654/project-athena into rpm-pr
|
2020-03-08 07:41:36 +00:00 |
|
