Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 08:36:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
84073 commits 71 branches 56 tags 1.2 GiB
Commit graph

84073 commits

This branch
This branch
All branches
Author SHA1 Message Date
HifiExperiments
7bfbf3c99c Merge remote-tracking branch 'upstream/master' into update 2020-11-09 19:33:38 -08:00
HifiExperiments
ccd5ef80b3 remove isActive, fix contains, maybe fix green box issue 2020-11-09 19:14:30 -08:00
kasenvr
66ccfab9c9
Merge pull request #846 from kasenvr/fix/domain-server-create-id 
Fix domain-server settings "Create new domain ID" dialog.
 2020-11-06 20:07:37 -05:00
kasenvr
b091557cb5
Merge pull request #848 from humbletim/smarter-scriptcache 
ScriptCache: add local file change detection
 2020-11-05 17:20:04 -05:00
kasenvr
97b7aa18e4
Merge pull request #719 from kasenvr/gha-master-ci 
GHA builds for merges to master
 2020-11-05 17:10:05 -05:00
HifiExperiments
c8532a1ac5 another unused variable 2020-11-04 22:21:24 -08:00
HifiExperiments
a7e6332c0e fix alpha material bug 2020-11-04 22:09:11 -08:00
HifiExperiments
a3c85bd438 possible fix for collisions again 2020-11-04 19:41:01 -08:00
kasenvr
a123a2171b
Merge pull request #833 from AleziaKurdis/CreataAppOCT2020 
Create Application: Improvements October 2020
 2020-11-04 17:08:18 -05:00
humbletim
f41ef31ef5 changes per CR 2020-10-31 13:50:47 -04:00
humbletim
a7fb294a1b
Update libraries/networking/src/ResourceRequest.cpp 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-10-31 13:39:29 -04:00
kasenvr
82a0815964
Merge pull request #599 from daleglass/fix-auto-texture-memory 
Initial version of automatic texture memory size
 2020-10-29 20:36:43 -04:00
kasenvr
5bb0c9bffc
Merge pull request #804 from daleglass/logging_improvements 
Improve logging: color, ms timestamps, PID, thread id via environment variable
 2020-10-29 20:12:18 -04:00
kasenvr
4cb3287764
Merge pull request #842 from ctrlaltdavid/fix/hide-wallet-mention 
Hide "Secure Transactions" section in Settings > Security
 2020-10-29 20:10:32 -04:00
kasenvr
09f18a7d66
Merge pull request #791 from daleglass/fix-build-warnings-on-qt-5.15 
Qt 5.15 fixes: Initialize flags with default constructor
 2020-10-29 17:39:06 -04:00
Kalila L
90a7c6cdac Merge branch 'master' into gha-master-ci 2020-10-29 17:32:53 -04:00
kasenvr
2b511d8c45
Merge pull request #613 from odysseus654/pr/registerListener 
[enhancement] transition listener registration from member string name to member string pointer
 2020-10-29 17:13:05 -04:00
daleglass
6c25b9470d
Update libraries/shared/src/LogHandler.cpp 
Co-authored-by: kasenvr <52365539+kasenvr@users.noreply.github.com>
 2020-10-29 19:20:18 +01:00
humbletim
ae7aa3eb88 update ScriptCache to detect local script modifications 2020-10-29 11:30:33 -04:00
humbletim
f012772fa3 add toHttpDateString helper method 2020-10-29 11:29:26 -04:00
kasenvr
bb35521d29
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-10-28 02:05:17 -04:00
Dale Glass
3284313399 Mark font textures as something that shouldn't be downscaled 2020-10-27 18:24:08 +01:00
kasenvr
1aac970996
Merge pull request #844 from ctrlaltdavid/fix/auto-threading-option 
Fix wrapping of "Enable Automatic Threading" in server setup wizard
 2020-10-27 02:17:15 -04:00
Kalila L
6232aba63e Fix domain-server settings "Create new domain ID" dialog. 2020-10-27 01:22:47 -04:00
David Rowe
e0d965e1c5 Fix wrapping of "Enable Automatic Threading" in server setup wizard 2020-10-27 09:44:43 +13:00
kasenvr
c2570c2ae7
Merge pull request #841 from kasenvr/fix/authorship-credits 
Housekeeping for attribution
 2020-10-25 23:10:01 -04:00
kasenvr
5c945c1524
Merge pull request #840 from kasenvr/fix/ess-logging-crash 
Prevent crash on entity-script-server due to logging interface.
 2020-10-25 23:09:05 -04:00
David Rowe
d31d7f0a18 Hide "secure transactions" section in Settings > Security 2020-10-26 14:36:36 +13:00
kasenvr
f1194eec18
Merge pull request #826 from kasenvr/fix/metadata-exp-port 
Append 'Vircadia' to the environment variable for the metadata exporter port
 2020-10-25 19:57:36 -04:00
kasenvr
4b2c71cf61
Update libraries/script-engine/src/ScriptEngine.cpp 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-10-25 19:49:59 -04:00
Kalila L
50067e3361 Prevent crash on entity-script-server for due to logging interface. 2020-10-25 18:36:20 -04:00
Alezia Kurdis
1e51df0843
Minor adjustments 
Minor adjustments
 2020-10-25 14:25:19 -04:00
Alezia Kurdis
a264fc358e
Expose 2 new columns: Creation and Modif. Date 
Expose 2 new optional columns: 
- Creation Date
- Modification Date

To address Issue #673
 2020-10-25 00:00:44 -04:00
Alezia Kurdis
7c4115c4cf
Expose 2 new columns: Creation and Modification Date 
Expose 2 new optional columns: 
- Creation Date
- Modification Date
To address Issue #673
 2020-10-24 23:59:26 -04:00
Alezia Kurdis
8cc9c19b40
Set the shortkey CTRL-A and CTRL-I only 
Set the shortkeys for Select All and Inverse Selection to respond to CTRL-A and CTRL-I only.
(Previously it was also responding to Ctrl-Shift-A, Ctrl-Alt-A, Ctrl-Shift-Alt-A and Ctrl-Shift-I, Ctrl-Alt-I, Ctrl-Shift-Alt-I)
 2020-10-24 22:37:35 -04:00
Alezia Kurdis
bcebf36261
Minor Code Adjustments 
Minor Code Adjustments
 2020-10-24 13:19:09 -04:00
Kalila L
96877db43a Re-apply 0dadb100b1 w/ authorship. 
Co-Authored-By: Humbletim <humbletim@gmail.com>
 2020-10-24 05:02:45 -04:00
Kalila L
0dadb100b1 Revert 0b46c53df1 2020-10-24 04:49:01 -04:00
Kalila L
b3ab7e05d3 Add missing authorship comment. 2020-10-24 04:20:02 -04:00
Alezia Kurdis
15924f9547
Adjust a button caption 
Adjust a button caption
 2020-10-23 23:48:06 -04:00
Alezia Kurdis
a68590e68a
Add Parent-Children Selector group 
Add Parent-Children Selector group
"Inverse Selection" is now responding to Ctrl-I
Code Adjustments
 2020-10-23 23:26:34 -04:00
Alezia Kurdis
bfc216ab00
Add Parent-Children Selector group 
Add Parent-Children Selector group
"Inverse Selection" is now responding to Ctrl-I
Code Adjustments
 2020-10-23 23:25:51 -04:00
Alezia Kurdis
ba371613ba
Add Parent-Children Selector group 
Add Parent-Children Selector group
Prevent action to happen when some entities are Locked in the Selection 
Code Adjustments
 2020-10-23 23:24:06 -04:00
Alezia Kurdis
6da472b7e3
Add Parent-Children Selector group 
Add Parent-Children Selector group
Prevent action to happen when some entities are Locked in the Selection 
Code Adjustments
 2020-10-23 23:22:37 -04:00
Alezia Kurdis
5b0a00a81a
Add Parent-Children Selector group 
Add Parent-Children Selector group
Prevent action to happen when some entities are Locked in the Selection 
Code Adjustments
 2020-10-23 23:21:32 -04:00
Alezia Kurdis
6f6e41658c
Code Adjustments 
Code Adjustments
 2020-10-23 23:17:22 -04:00
kasenvr
22aa9f2065
Merge pull request #803 from kasenvr/fix/domain-server-metaverse 
Hide temp place name button, hide places table, hide places wizard step.
 2020-10-22 17:06:08 -04:00
Alezia Kurdis
affad6741c
Better icons for Hierarchy 
Better icons for Hierarchy
 2020-10-21 22:44:55 -04:00
HifiExperiments
f413ad3312 small fixes 2020-10-21 16:05:30 -07:00
kasenvr
70b04b1226
Update wizard.js 2020-10-21 16:42:10 -04:00