Dale Glass
|
96e864e4e9
|
Fix incorrectly resolved merge conflict, left too much code.
|
2024-10-18 18:59:23 -07:00 |
|
|
|
ac01435c37
|
Insert placeholder to not break protocol yet.
|
2024-10-18 18:59:23 -07:00 |
|
Maki
|
5e35f76668
|
Remove hifi-screenshare
Cherry picked and updated from Tivoli dd5b6ea6ee5597a06603e16509640e7ed18106bb
Co-authored-by: Julian Groß <julian.g@posteo.de>
|
2024-10-18 18:59:18 -07:00 |
|
HifiExperiments
|
e7f7314b37
|
Merge branch 'master' into protocol_changes
|
2024-10-02 12:11:39 -07:00 |
|
HifiExperiments
|
0ab050ff3b
|
Merge pull request #1111 from HifiExperiments/textSize
Text verticalAlignment, send entity property enums as uint8_t, fix text recalculating too often, fix textSize
|
2024-10-02 10:15:56 -07:00 |
|
|
|
2824067ecb
|
Merge pull request #1141 from Armored-Dragon/update/avatarAppIcons
Update Avatar App icons
|
2024-10-02 17:03:34 +02:00 |
|
|
|
18d713d3e3
|
Merge pull request #1152 from AleziaKurdis/createAppHighlightAvatarEntities
Create app: highlight avatar entities
|
2024-10-02 07:27:07 +02:00 |
|
HifiExperiments
|
0f5b0b5e34
|
Merge pull request #1098 from HifiExperiments/entityProps
Automated entity property serialization
|
2024-09-30 15:56:22 -07:00 |
|
Alezia Kurdis
|
1deab129d2
|
Add Avatar and Local Entities Highlighting
Add Avatar and Local Entities Highlighting for Name and ID properties
|
2024-09-29 23:00:03 -04:00 |
|
Alezia Kurdis
|
652bb6f6da
|
Adding Avatar Entity Highlighting
Adding Avatar Entity Highlighting
|
2024-09-29 20:52:07 -04:00 |
|
Alezia Kurdis
|
151546619d
|
Adding Avatar Entity Highlighting
Adding Avatar Entity Highlighting
|
2024-09-29 20:51:43 -04:00 |
|
Alezia Kurdis
|
b2137adde0
|
Adding Avatar Entity Highlighting
Adding Avatar Entity Highlighting
|
2024-09-29 20:51:04 -04:00 |
|
HifiExperiments
|
470cd776cc
|
fix copyright
|
2024-09-29 16:10:44 -07:00 |
|
HifiExperiments
|
4e97090f96
|
comment cmake script
|
2024-09-29 15:38:59 -07:00 |
|
HifiExperiments
|
474026b9e1
|
fix PolyLineEntityItem::getEntityProperties
|
2024-09-29 15:04:07 -07:00 |
|
HifiExperiments
|
b88b187c07
|
fix KeyLightPropertyGroup legacy properties
|
2024-09-29 15:01:49 -07:00 |
|
HifiExperiments
|
ed4c5f23cf
|
fix PROP_GRAB_EQUIPPABLE_INDICATOR_URL missing urlPermission
|
2024-09-29 14:56:35 -07:00 |
|
HifiExperiments
|
6a3a47bfc4
|
fix ADD_GROUP_PROPERTY_TO_MAP
|
2024-09-29 14:50:46 -07:00 |
|
|
|
542b231107
|
Merge pull request #1138 from HifiExperiments/emptyField
fix accidentally clearing url fields when you don't have view permission
|
2024-09-22 18:15:16 +02:00 |
|
armored-dragon
|
9442559f9d
|
Say less, JulianGro.
|
2024-09-19 07:27:52 -05:00 |
|
armored-dragon
|
637968eceb
|
Update icons.
|
2024-09-19 06:20:44 -05:00 |
|
HifiExperiments
|
1533f6a268
|
missed some enums
|
2024-09-12 19:33:31 -07:00 |
|
|
|
808135b6c4
|
Merge pull request #1135 from overte-org/clion-ignore
Add CLion-style build directories to .gitignore
|
2024-09-11 14:06:22 +02:00 |
|
HifiExperiments
|
79cfa68edf
|
fix accidentally clearing url fields when you don't have view permission
|
2024-09-09 14:58:41 -07:00 |
|
HifiExperiments
|
0dd0d07466
|
fix text debug assert on invalid or unloaded font
|
2024-09-09 13:38:55 -07:00 |
|
HifiExperiments
|
729b85062d
|
fix component mode serialization
|
2024-09-09 12:37:35 -07:00 |
|
HifiExperiments
|
356ccc8b15
|
fix text size
|
2024-09-08 21:12:29 -07:00 |
|
HifiExperiments
|
74fa1d1291
|
text vertical alignment, use uint8_t for entity property enums, fix text recalculating too often
|
2024-09-08 21:12:25 -07:00 |
|
HifiExperiments
|
926cbef606
|
cleanup + automate EntityPropertyFlags
|
2024-09-08 21:09:08 -07:00 |
|
HifiExperiments
|
ff50d6c2cc
|
automated entity property serialization
|
2024-09-08 21:09:00 -07:00 |
|
|
|
ff130095b9
|
Add CLion-style build directories to .gitignore
|
2024-09-07 22:53:38 +02:00 |
|
HifiExperiments
|
3c4c860ef9
|
Merge pull request #1085 from HifiExperiments/loadPriority
Improve model load priority
|
2024-09-07 12:31:39 -07:00 |
|
|
|
a142f7de72
|
Try fixing master build uploads.
|
2024-09-02 17:15:49 +02:00 |
|
|
|
82ac56d147
|
Merge pull request #1078 from Armored-Dragon/fix/xss_notificationCore
Sanitize notificationCore text to prevent XSS
|
2024-09-02 13:21:45 +02:00 |
|
|
|
433e2c0234
|
Merge pull request #1084 from Armored-Dragon/fix/Tofu-inArmored-Chat
[Armored Chat] Change the 'open in new window' character.
|
2024-09-02 13:17:24 +02:00 |
|
|
|
c28424ebe8
|
Merge branch 'master' into fix/Tofu-inArmored-Chat
|
2024-09-02 13:16:59 +02:00 |
|
|
|
23c58d5c95
|
Merge pull request #1089 from Armored-Dragon/Delete/onFirstRun
Remove unused onFirstRun.js
|
2024-09-02 13:15:08 +02:00 |
|
|
|
0f123d7d95
|
Fix Windows master build uploads.
|
2024-09-02 12:38:46 +02:00 |
|
Armored-Dragon
|
5155ac3163
|
Merge branch 'overte-org:master' into fix/xss_notificationCore
|
2024-08-31 21:52:34 +00:00 |
|
Armored-Dragon
|
e8dae14a02
|
Merge branch 'overte-org:master' into Delete/onFirstRun
|
2024-08-31 20:48:38 +00:00 |
|
HifiExperiments
|
3d97f7845b
|
fix stats + waitForWearables
|
2024-08-19 14:17:20 -07:00 |
|
HifiExperiments
|
e9831d9f22
|
try to fix isServer assert
|
2024-08-18 21:09:06 -07:00 |
|
HifiExperiments
|
86f3ca8918
|
fix build error
|
2024-08-18 20:56:11 -07:00 |
|
HifiExperiments
|
7c3498bf9d
|
add loadPriority to model entities, working on other avatars waitForWearables
|
2024-08-18 20:56:08 -07:00 |
|
HifiExperiments
|
fe61d92a09
|
model loading priority updates over time, takes into account out of bounds, avatar entities have higher priority, and fsts can specify to wait for wearables to load before rendering
|
2024-08-18 20:55:22 -07:00 |
|
|
|
eb168e4e5d
|
Merge pull request #1106 from Armored-Dragon/fix/ArmoredChat-Scrolling
[ArmoredChat] Alleviate scrolling issue
|
2024-08-18 16:15:39 +02:00 |
|
|
|
a97b892338
|
Merge pull request #1094 from AleziaKurdis/createApp_Paste_Url_In_Create_ui
Create App: Revolutionary "Paste" Url buttons for the "Create Model", "Create Material" and "Create Voxels" UI
|
2024-08-18 16:12:27 +02:00 |
|
HifiExperiments
|
93c1ed6446
|
Merge pull request #1108 from HifiExperiments/master_to_protocol_changes4
merge master to protocol_changes
|
2024-08-17 12:32:31 -07:00 |
|
HifiExperiments
|
093f8b7cb0
|
Merge remote-tracking branch 'overte/master' into master_to_protocol_changes4
|
2024-08-17 12:30:15 -07:00 |
|
Dale Glass
|
fb81ad6c83
|
Merge pull request #1105 from HifiExperiments/colorspace
add a setting to workaround the GLES colorspace conversion issue
|
2024-08-17 21:13:24 +02:00 |
|
