Kasen IO
d5bf5dfe7d
Fix comma.
2020-07-21 00:38:29 -04:00
Kasen IO
087ede2f91
Address CR comments.
2020-07-20 13:57:28 -04:00
kasenvr
770dd83efc
Apply suggestions from code review
...
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-07-20 13:51:18 -04:00
kasenvr
022be754f1
Apply suggestions from code review
...
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-07-20 13:48:48 -04:00
Kasen IO
6c5dbb5baf
Fix some errors, remove eslint file as eslint is already defined.
2020-07-10 20:19:26 -04:00
Kasen IO
6d981b25b4
Move inventory.js back to system scripts.
2020-07-08 17:26:40 -04:00
Kasen IO
c074f7573c
Move inventory-app to unpublished, folder named for future pkg manager.
2020-07-08 14:31:37 -04:00
Kasen IO
ebc8f7db4c
Merge branch 'master' into feature/inventory-app
2020-07-08 14:27:59 -04:00
Kasen IO
fd2691fa15
Some code cleaning.
2020-07-01 19:54:14 -04:00
Kasen IO
05ceedaa3f
Fix grid chat notification sound.
2020-07-01 19:17:54 -04:00
Kasen IO
f74f0e8a53
Update path reference.
2020-07-01 18:19:13 -04:00
Kasen IO
c99a62b719
Indent + convert emojis to code form.
2020-06-30 19:33:42 -04:00
Kasen IO
16ef73c6f7
Merge branch 'master' into fix/chat-optimizations
2020-06-30 19:06:47 -04:00
kasenvr
c3c6ad47da
Apply suggestions from code review
...
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-06-30 18:57:32 -04:00
kasenvr
555dd8fe98
Update scripts/communityScripts/chat/FloofChat.html
...
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-06-30 03:03:20 -04:00
kasenvr
82638e47c4
Merge pull request #476 from ctrlaltdavid/fix/update-more-app
...
Update More app from community apps repo
2020-06-29 23:18:03 -04:00
Kasen IO
c289434f01
Don't play sound if user sends msg, make localOnly, lower volume.
2020-06-29 22:06:20 -04:00
Kasen IO
baa24c311e
Add notification sound + muting system.
2020-06-29 21:52:58 -04:00
Kasen IO
580d4826e9
Fix line lengths.
2020-06-27 14:25:15 -04:00
Kasen IO
6c3340051e
Add external URL launching.
2020-06-27 01:08:55 -04:00
Kasen IO
dc5418748d
Fix time and date formatting.
2020-06-27 00:43:39 -04:00
Kasen IO
394c9e2175
Chat window resize, shrink text size and boxes, add date to timestamp.
2020-06-26 21:48:58 -04:00
Kasen IO
968fd2b72d
Move chat to correct folder.
2020-06-26 18:46:30 -04:00
Kasen IO
fc418fa9e4
Remove script that no longer exists created by the Vive Pro Eye PR.
2020-06-23 15:57:15 -04:00
David Rowe
84a2fe061f
Update More app from community apps repo
2020-06-23 20:27:08 +12:00
kasenvr
4cc31fc427
Merge pull request #442 from kasenvr/fix/fix-model-scale-create-app
...
Fix models not scaling correctly when loading due to timeout.
2020-06-20 17:09:09 -04:00
kasenvr
13451bd275
Merge pull request #384 from JulianGro/rebrand
...
Rebranding stuff
2020-06-18 17:12:47 -04:00
Julian Groß
18318fdf71
Merge branch 'v2020.2.2-rc' into rebrand
2020-06-18 09:16:47 +02:00
Kasen IO
3e585267e4
Fix gizmo size issue post auto-resize of a new model.
2020-06-18 01:11:07 -04:00
David Rowe
189f6f5440
Code review
2020-06-15 08:04:51 +12:00
David Rowe
4e57d53dde
Merge branch 'master' into feature/vive-pro-eye-tracking
2020-06-14 10:51:25 +12:00
kasenvr
2ae304864e
Merge pull request #439 from kasenvr/fix/remove-goto
...
Remove old goto, update Explore app.
2020-06-11 17:24:48 -04:00
Kasen IO
3910448367
Fix models not scaling correctly when loading due to timeout.
2020-06-11 15:36:13 -04:00
Kasen IO
8a2b6fcb0a
Convert == to === in various places.
2020-06-10 19:18:25 -04:00
kasenvr
1d0cbe04c8
Update scripts/communityScripts/explore/explore.html
...
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
2020-06-10 19:16:49 -04:00
Kasen IO
05837d178a
Update Explore app to latest.
2020-06-10 13:33:33 -04:00
Kasen IO
6e7b3a387d
Remove old goto, update community-apps beta link.
2020-06-10 02:54:42 -04: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
David Rowe
6df34d2a89
Reduce minimum inspect distance
2020-06-08 08:10:19 +12:00
Kasen IO
f1aa7391ec
Fix test data.
2020-06-01 16:43:04 -04:00
Kasen IO
100bf3a91e
Add .glb item type.
2020-06-01 15:41:09 -04:00
kasenvr
079c0c022e
Merge pull request #406 from kasenvr/fix/entity-size-on-create
...
Bugfix: Create app now uses proper dimensions on create
2020-06-01 12:40:50 -04:00
Kasen IO
778276bb43
Adjust how check is performed.
2020-05-30 20:56:28 -04:00
Kasen IO
3c21a4d3f6
Fix Create app using naturalDimensions for all entity types.
2020-05-30 19:58:54 -04:00
kasenvr
8157be5b5a
Merge pull request #405 from kasenvr/v0.86.0-k2.1
...
Merge K2.1 into Master
2020-05-30 18:49:38 -04:00
kasenvr
41c961198c
Merge pull request #369 from AleziaKurdis/feature/zonesSelectorSorted
...
Zones Selector sorted by zone names
2020-05-29 20:44:45 -04:00
Alezia Kurdis
0b330dfcd6
Zone selector sorting vs uppercases
...
This makes the sorting of the Zone in the Zone selector
with the uppercase grouped with the lowercase for a same letter
but uppercase always first.
(Note: Accented char are considered as a different letter. We would need to support exception cases for all the existing charsets. These are only entities descriptors, not really for literature.)
2020-05-28 23:32:44 -04:00
Kasen IO
83bbbbb8b1
Add distance display to share items menu.
2020-05-26 00:50:26 -04:00
David Rowe
b32bdba111
Reinstate controller module priorities per master
2020-05-26 14:58:27 +12:00
David Rowe
c05225ca2f
Reinstate nearParentGrabOverlay controller module
...
Fixes regression where tablet becomes large when grabbed if avatar is
small.
2020-05-26 14:58:13 +12:00
