Commit graph

33780 commits

Author SHA1 Message Date
6ac090dea5 Quick fix for the metaverse API
We did have the dfault metaverse API as metaverse.projectathena.io, but that doesn't not yet exist, and it turns out we can't just do a redirect. So for now changing it to metaverse.highfidelity.com
2020-01-14 20:33:39 -06:00
0fbaada57b
Merge pull request #54 from sethalves/fix-linux-build-0
fix linux build
2020-01-14 18:44:01 -06:00
e5dd23b922
Merge pull request #33 from kasenvr/feature/metaverse-url-switching
Ability to change Metaverse API from setting
2020-01-14 18:40:04 -06:00
Kasen IO
336b5e275b Removed obsolete default scripts + more branding changes. 2020-01-12 23:13:01 -05:00
kasenvr
5fdd563bfa
Merge pull request #65 from kasenvr/fix/whitelist-server
Whitelist Quality of Life Updates
2020-01-09 17:55:45 -05:00
Kasen IO
2c7911acb8 more housekeeping 2020-01-09 16:15:41 -05:00
kasenvr
dc46d581b0
Merge pull request #66 from FluffyJenkins/feature/websocketArrayBuffer
Added ArrayBuffer support to websockets
2020-01-08 09:09:17 -05:00
Fluffy Jenkins
672ac8066b Made changes 2020-01-08 04:38:33 +00:00
Kasen IO
a6dc494d7c housekeeping 2020-01-07 19:40:42 -05:00
Kasen IO
13d79fec8b Fixes bools and tab. 2020-01-07 13:04:28 -05:00
Kasen IO
d87cd01129 Adds major QOL updates to whitelist 2020-01-07 03:03:08 -05:00
Fluffy Jenkins
3c4d56bc50 Fixed whitespace 2020-01-07 04:10:15 +00:00
Fluffy Jenkins
b33ad80992 Init push 2020-01-07 04:00:13 +00:00
Kasen IO
20f5439fa8 Hard tabs converted to 4 length soft tabs. 2020-01-06 08:58:09 -05:00
Kasen IO
8124b7d4a1 Fixed tabs and spaces. 2020-01-06 08:29:01 -05:00
Kasen IO
fb5dbfc52a Disable whitelist on entity_server scripts. 2020-01-05 23:32:28 -05:00
Seth Alves
82bddeb5a7 fix linux build 2020-01-03 10:27:43 -08:00
3bb8498067
Merge pull request #39 from daleglass/fix_invoke_method_crash
Don't bind action if QML menu can't be added.
2019-12-30 18:23:08 -06:00
Dale Glass
dabda684b8 Don't bind action if QML menu can't be added.
Otherwise eventually methods will be called on a NULL pointer.
Fixes crash related to QMetaObject::invokeMethod.
2019-12-26 01:04:53 +01:00
Thijs Wenker
0ac8c178db
fix spacing 2019-12-20 12:43:43 +01:00
Kasen IO
c34cd996df change Metaverse API from setting 2019-12-20 11:39:05 +01:00
Fluffy Jenkins
83e9b891d8 Workaround for Secondary camera crash 2019-12-19 23:31:10 +00:00
Kasen IO
1f01beba70 Fixed patch issues 2019-12-13 12:29:08 -05:00
Kasen IO
9839b23061 Made Sam's graphics patches work with 86 K2. 2019-12-13 02:38:14 -05:00
HifiExperiments
0bd5e15b47 fix non-procedural material entity crash
Signed-off-by: Kasen IO <kasenvr@gmail.com>
2019-12-13 02:17:52 -05:00
Maki
a7851c9205 Fixed type conversions for environmental domain ports
Signed-off-by: Kasen IO <kasenvr@gmail.com>
2019-12-12 23:09:18 -05:00
Maki
1ef45b703c Added environment variables to change domain server ports
Signed-off-by: Kasen IO <kasenvr@gmail.com>
2019-12-12 23:09:18 -05:00
HifiExperiments
204c7a7391 fix shadows!! 2019-12-12 23:04:55 -05:00
HifiExperiments
6156495345 stupid, shadows still broken 2019-12-12 23:04:47 -05:00
SamGondelman
1736252f0d trying and failing to fix models 2019-12-12 23:04:47 -05:00
SamGondelman
398562321d fix wearables not disappearing with avatar 2019-12-12 23:02:57 -05:00
HifiExperiments
e0a29d9367 material entities support cullFaceMode and support gltf doubleSided 2019-12-12 23:01:57 -05:00
HifiExperiments
59c67e5590 put back stepping in translucent case 2019-12-12 23:01:57 -05:00
HifiExperiments
3fe395ca32 properly implement alphaModes 2019-12-12 23:01:57 -05:00
HifiExperiments
b66fa1d57a put back stepping in translucent case 2019-12-12 22:58:36 -05:00
HifiExperiments
d54ca43554 properly implement alphaModes 2019-12-12 22:58:36 -05:00
HifiExperiments
6e961b9f2f procedural vertex shaders
Signed-off-by: Kasen IO <kasenvr@gmail.com>
2019-12-12 22:49:48 -05:00
af4c0ea0d1 Removes the environment variable requirement for procedural material shaders.
Signed-off-by: Marcus Llewellyn <marcus.llewellyn@gmail.com>
2019-12-10 16:52:19 -06:00
Kasen IO
3e6660b633 Updated whitelist debugs for clarity in dev log 2019-12-09 08:30:02 -05:00
Kasen IO
2de388ab3b Fixes bug where empty "" whitespace allows all scripts. 2019-12-09 01:20:04 -05:00
Kasen IO
fe66dc82f3 scriptengine pulls from inferface.json correctly, removed extra debug, fixed QML to load to textarea correctly. 2019-12-08 23:11:21 -05:00
Kasen IO
f49e64b99f Cleaned out extra commented code. 2019-12-08 21:12:20 -05:00
Kasen IO
2e36c40912 added QML + C++ system for whitelists 2019-12-07 21:37:23 -05:00
Kasen IO
edfce861a8 Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-01 22:56:19 -05:00
Kasen IO
07d706d681 Removed all hardcoded whitelist rules 2019-12-01 22:55:51 -05:00
Kasen IO
0b46c53df1 Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-01 19:59:59 -05:00
DouglasWilcox
a3de25618a Handle HMD in input vars and remove/fix json transitions in/out of HMD strafe states.
(cherry picked from commit f9f28fc286)
2019-11-13 09:52:56 -08:00
Kalila R
7c1b9e79ae Setting ModelBaker.cpp back to main. 2019-11-11 20:28:16 -05:00
Kalila R
fd7ac223b0 activitylogger still disabled but does not output to console 2019-11-11 20:08:03 -05:00
Sam Gateau
269289412e Same fix for highlight effects 2019-11-08 09:11:58 -08:00