HifiExperiments
|
0f9f95f716
|
possible fix for physics
|
2020-12-28 23:46:37 -08:00 |
|
daleglass
|
f894a0a141
|
Merge pull request #877 from vircadia/feature/domain-server-reporting-socket
Send address and port with each metaverse heartbeat.
|
2020-12-26 20:40:58 +01:00 |
|
Kalila
|
89d1346644
|
Merge pull request #919 from ArcadeFever/fix/upgrade-android-oculus-sdk-23.0.0.1-and-1.37.0
Upgraded Oculus Mobile and Platform SDKs to latest (1.37.0 and 23.0.0)
|
2020-12-17 20:24:37 -05:00 |
|
Kalila
|
f1c9614076
|
Merge pull request #917 from JulianGro/gles
Fix building with GLES 3.2 on Linux
|
2020-12-17 20:23:26 -05:00 |
|
ArcadeFever
|
65fb1320cc
|
Upgraded Oculus SDKs to latest
|
2020-12-15 00:04:59 -08:00 |
|
Kalila
|
633c642d4a
|
Merge pull request #906 from vircadia/fix/update-references
Fix/update references
|
2020-12-15 01:29:47 -05:00 |
|
Julian Groß
|
0cebb700fb
|
Change conditionals according to review
|
2020-12-15 04:15:44 +01:00 |
|
Kalila
|
0f87e4cd86
|
Merge pull request #838 from ctrlaltdavid/fix/hud-recentering
HUD overlay fixes and improvements
|
2020-12-14 20:46:02 -05:00 |
|
Julian Groß
|
5e17639bed
|
Fix building with GLES
|
2020-12-15 02:43:39 +01:00 |
|
Kalila
|
8c4ce96c63
|
Merge pull request #830 from HifiExperiments/update
Entity update improvements 2
|
2020-12-14 17:56:01 -05:00 |
|
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 |
|
HifiExperiments
|
9a5b956968
|
Apply suggestions from code review
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
|
2020-11-27 15:11:18 -08:00 |
|
HifiExperiments
|
c510a8fa3e
|
add comment about material sphere scale
|
2020-11-27 15:10:14 -08:00 |
|
HifiExperiments
|
2ece568f09
|
fixing up simple-compound logic
|
2020-11-27 15:04:56 -08:00 |
|
Kalila L
|
97681786cd
|
Potentially fix STUN IP+Port init for heartbeat issue?
|
2020-11-25 04:54:47 -05:00 |
|
HifiExperiments
|
2e780c34d1
|
Merge remote-tracking branch 'upstream/master' into update
|
2020-11-24 16:34:30 -08: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
|
2222f8f4f6
|
Fix collision hull not necessarily being updated when model URL changed
|
2020-11-25 11:54:19 +13: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 |
|
HifiExperiments
|
06f7624512
|
some more small improvements
|
2020-11-14 22:34:03 -08: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 |
|
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 |
|
David Rowe
|
2cfd2c8d32
|
Merge branch 'master' into fix/hud-recentering
|
2020-11-10 09:27:05 +13: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 |
|
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 |
|
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 |
|