Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
84184 commits 29 branches 0 tags 1.1 GiB
Commit graph

34512 commits

Author SHA1 Message Date
Kalila L
16eca5d855 Get most 'project-athena' -> 'vircadia' references. 2020-12-13 04:42:34 -05:00
Kalila L
5d4612e400 Update 'kasenvr' -> 'vircadia' 2020-12-10 18:56:57 -05:00
daleglass
70f2866871
Merge pull request #860 from makitsune/fix-alt-on-linux 
Fix alt key on Linux
 2020-12-10 23:45:55 +01:00
kasenvr
86cbcb53a3
Merge pull request #882 from ctrlaltdavid/fix/jsdoc-typo 
Fix JSDoc typo
 2020-12-01 05:58:31 -05:00
Dale Glass
182302c3e7 GL_TEXTURE_FREE_MEMORY_ATI returns 4 values, not just 1 
This should fix a buffer overflow that happens on ATI cards.
 2020-11-28 02:07:08 +01:00
kasenvr
4e1b6838cc
Merge pull request #871 from kasenvr/revert-868-revert-659-scriptEngine 
Revert "Revert "Split Local and owned Avatar Entity scripts into their own ScriptEngine""
 2020-11-24 18:43:33 -05:00
David Rowe
eb70d15f77 Fix JSDoc typo 2020-11-23 19:13:48 +13:00
HifiExperiments
02f7f494fa Merge remote-tracking branch 'upstream/master' into gha 2020-11-16 21:48:46 -08:00
HifiExperiments
b6744588f4 loading fix 2020-11-16 21:25:25 -08:00
HifiExperiments
81940214bb
Revert "Revert "Split Local and owned Avatar Entity scripts into their own ScriptEngine"" 2020-11-16 21:20:25 -08:00
kasenvr
21f8eac936
Revert "Split Local and owned Avatar Entity scripts into their own ScriptEngine" 2020-11-16 22:35:46 -05:00
kasenvr
c3439a8ae7
Merge pull request #659 from HifiExperiments/scriptEngine 
Split Local and owned Avatar Entity scripts into their own ScriptEngine
 2020-11-15 23:12:54 -05:00
Maki
ce8b9d4b24 Deleted old GLWidget code that breaks alt with current Qt on Linux 2020-11-12 22:17:15 +00:00
kasenvr
5080909bb9
Merge pull request #664 from kasenvr/feature/require-redownload 
Feature/require redownload
 2020-11-12 17:10:08 -05:00
kasenvr
8f4f15ba25
Merge pull request #853 from ctrlaltdavid/fix/enter-entity 
Fix enterEntity event not firing in entity script after content reload
 2020-11-12 01:02:55 -05:00
HifiExperiments
3b2c219e53 possibly more robust fix? 2020-11-10 21:39:15 -08:00
HifiExperiments
b3e9c1e8f8 Merge remote-tracking branch 'upstream/master' into scriptEngine 2020-11-09 22:00:11 -08:00
HifiExperiments
696239a97b try to fix android build 2020-11-09 21:27:40 -08: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
David Rowe
c6728be4e8 Fix enterEntity event not firing in entithy script after content reload 2020-11-04 11:23:47 +13: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
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
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
Dale Glass
3284313399 Mark font textures as something that shouldn't be downscaled 2020-10-27 18:24:08 +01: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
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
Kalila L
413c21f482 Append Vircadia to the environment variable for the metadata exporter port. 2020-10-19 01:07:07 -04:00
Dale Glass
7a186bba34 Fix issues with integer overflow in memory pressure calculations 2020-10-18 22:13:28 +02:00
Dale Glass
0d4987878e Review fixes 2020-10-18 20:35:19 +02:00
Dale Glass
482211d6eb Try the MESA pathway always if not ATI or NVIDIA 
This will work fine on non-Linux systems, because the query should
simply fail on systems that don't support it.

This should improve functionality on nouveau
 2020-10-18 20:35:19 +02:00
Dale Glass
991cfdae69 Automatic texture memory based on free memory 2020-10-18 20:35:19 +02:00
Dale Glass
349ba16a3c Review fixes 2020-10-18 20:35:19 +02:00
Dale Glass
8615ec5596 Initial version of automatic texture memory size 2020-10-18 20:35:19 +02:00
Dale Glass
1124590422 Enable color by default on Unix, change to comma separators. 
Also emit a message if an unrecognized log option is used.
 2020-10-16 20:16:44 +02:00
kasenvr
2b3b3fb88f
Merge pull request #788 from kasenvr/fix/hifi-production-migration 
Update hifi-production links
 2020-10-15 17:17:36 -04:00
Dale Glass
8084bd0c5e Initialize flags with default constructor 
Fixes a lot of:

warning: ‘constexpr QFlags<T>::QFlags(QFlags<T>::Zero) [with Enum = QFileDialog::Option; QFlags<T>::Zero = int QFlags<QFileDialog::Option>::Private::*]’ is deprecated: Use default constructor instead [-Wdeprecated-declarations]
 2020-10-15 00:32:24 +02:00
kasenvr
908774ae53
Merge pull request #806 from daleglass/use_legacy_opengl 
Set OpenGL_GL_PREFERENCE to LEGACY
 2020-10-13 19:17:23 -04:00
Dale Glass
895d4d4172 Improve logging: color, ms timestamps, PID, thread id via environment variable 
Set VIRCADIA_LOG_OPTIONS to a string containing these keywords:

	color
	milliseconds
	process_id
	thread_id

The separator doesn't matter. Example:

    $ export VIRCADIA_LOG_OPTIONS="color milliseconds"
 2020-10-13 20:22:01 +02:00
Dale Glass
7b6fbe1f69 Set OpenGL_GL_PREFERENCE to LEGACY 
GLVND appears to break the entire UI on ATI video cards.

It was set to GLVND due to an understanding that this was a no-op setting, but it turns
out the documentation in OpenGL_GL_PREFERENCE is confusing, and it looks like LEGACY
is the setting that was being used after all.

An additional point of interest is that debian/rules contained OpenGL_GL_PREFERENCE=GLVND,
and this was done back in the High Fidelity days. It's uncertain whether this was correct
or not, though.
 2020-10-13 20:13:45 +02:00
kasenvr
3a665c6eac
Merge pull request #773 from ctrlaltdavid/fix/gltf-crash 
Fix handling of missing glTF blendshape target meshes
 2020-10-13 05:25:43 -04:00
kasenvr
36a4ab8c12
Merge pull request #789 from kasenvr/fix/apidocs-find-entities 
Update API docs to specify entity-server-script findEntities caveat.
 2020-10-13 05:20:43 -04:00
kasenvr
d12cd36eb3
Merge pull request #677 from HifiExperiments/mouse 
Add option to capture mouse
 2020-10-12 13:19:36 -04:00
Kalila L
05ad300894 CR. 2020-10-11 00:50:41 -04:00