Kasen IO
fa5f19ed2c
Merge branch 'fix/other-renamings' of https://github.com/kasenvr/project-athena into fix/other-renamings
2020-05-18 15:17:53 -04:00
Kasen IO
44933f0cc7
Update CONTRIBUTING.md and README.md
2020-05-18 15:17:40 -04:00
kasenvr
7996698c8f
Merge branch 'master' into fix/other-renamings
2020-05-18 15:10:32 -04:00
Thijs Wenker
a105a423e0
Merge pull request #364 from thoys/fix/gha_linux_python
...
Fix linux PR builds
2020-05-18 16:46:00 +02:00
Thijs Wenker
eb1bf12494
Fix linux PR builds
2020-05-18 14:07:38 +02:00
Kasen IO
7633361bb4
Update build docs.
2020-05-17 22:38:22 -04:00
Kasen IO
f908d5bb0a
Undo logo change.
2020-05-17 22:20:02 -04:00
Kasen IO
335f0c86dd
Reduce scope of PR.
2020-05-17 22:13:57 -04:00
e6505baf9d
Update help dialogs for Vircadia branding.
2020-05-17 15:37:58 -05:00
d19c474d65
Rebrand login screens for Vircadia.
2020-05-17 15:17:26 -05:00
0228c35d79
Update JSDOC in EntityItemPropeties.cpp to vircadia.com
...
Also strips trailing whitespaces from EntityItemProperties.cpp.
2020-05-17 14:46:33 -05:00
383bb11a40
Change default web entity URL to vircadia.com.
2020-05-17 14:43:09 -05:00
ce4aa67506
Change Window Titles to Vircadia
...
Also strips trailing whitespaces from interface's Applicaction.cpp.
2020-05-17 14:30:36 -05:00
187a2749c3
Rebrand the About dialog to Vircadia.
...
Also removes trailing whitespace from Menu.cpp.
2020-05-17 14:26:45 -05:00
5b6d57eb14
Update CMakeLists.txt
...
Change Visual Studio solution name to `vircadia`
2020-05-17 14:13:38 -05:00
445ebbd861
Replace KasenVR icons with Vircadia icons.
2020-05-17 14:10:07 -05:00
Dale Glass
407b2a4f22
Remove all uses of QString::null
...
It's deprecated and produces a warning on Qt 5.14
2020-05-17 18:00:02 +02:00
Kasen IO
3c43207b0f
Fix general folder movement.
2020-05-17 01:16:57 -04:00
Kasen IO
1b965dfc14
Latest not-working-state.
2020-05-16 23:35:24 -04:00
kasenvr
8b410c662e
Removed unused variable.
2020-05-16 16:35:16 -04:00
daleglass
9c96136312
Merge pull request #344 from jug007/grabbable
...
Disable "grabbable" property by default
2020-05-16 20:55:50 +02:00
Kasen IO
f4bcc82dd6
Corrections.
2020-05-16 02:27:45 -04:00
David Rowe
c0e36b7960
Address code review comments
2020-05-16 14:37:40 +12:00
David Rowe
63ba8400f7
Merge branch 'master' into feature/vive-pro-eye-tracking
2020-05-16 11:23:38 +12:00
MotoFufu9k
dd9728a09f
Change standard grabbable setting to false
2020-05-13 23:06:36 +02:00
daleglass
96905d0341
Merge pull request #343 from jug007/hifi-log
...
Change log file name to "vircadia-.."
2020-05-13 23:01:50 +02:00
motofckr9k
95a64b2f2c
Change standard log file names from "hifi-.." to "vircadia-.."
2020-05-13 22:59:51 +02:00
daleglass
8846e0e517
Merge pull request #317 from sethalves/fix-glm-warning
...
Don't let Linux build of glm with clang-9 fail due to stray semicolon
2020-05-13 22:37:41 +02:00
kasenvr
200289841b
Merge pull request #274 from AleziaKurdis/feature/renderWithZones-Create-UI
...
Feature: property "renderWithZones" in Create UI
2020-05-13 16:07:57 -04:00
kasenvr
c5fdacf975
Merge pull request #301 from HifiExperiments/modelBackface
...
Models support flipped normals on double sided geometry
2020-05-13 16:06:26 -04:00
daleglass
766bac7bd4
Merge pull request #340 from daleglass/fix_entity_is_dead_assertion
...
Fix #337 by ensuring the object is marked as dead.
2020-05-11 01:42:54 +02:00
Dale Glass
95570d5abc
Kill the entity in processRemovedEntities before calling prepareEntityForDelete
...
This was removed back in 9d92546a#337 )
2020-05-10 18:41:03 +02:00
kasenvr
a089a55284
Merge pull request #336 from odysseus654/pr/dump
...
Improve information sent to Sentry on crashes
2020-05-09 20:49:48 -04:00
Alezia Kurdis
5d00341662
Correct value to ENTIRE_DOMAIN_SCAN_RADIUS
...
Set the correct value to constant: ENTIRE_DOMAIN_SCAN_RADIUS
var ENTIRE_DOMAIN_SCAN_RADIUS = 27713;
to reach all the entities of a domain from the center,(including in the corners) the radius must be:
sqr((16000 ^2) + (16000) ^2 + (16000 ^2))
which is once rounded = to 27713.
2020-05-09 15:24:18 -04:00
Alezia Kurdis
d575616a6d
Code Adjustments.
...
Constant used for ENTIRE_DOMAIN_SCAN_RADIUS instead of 17000
Missing spaces,
and line too long being adjusted.
2020-05-09 15:08:38 -04:00
Alezia Kurdis
6357dd91f5
Fix EOL from Windows to Unix
...
Fix EOL from Windows to Unix
2020-05-09 02:50:16 -04:00
Alezia Kurdis
c96591367b
Fix the wrong merge
2020-05-08 23:41:52 -04:00
Alezia Kurdis
74f7b324b8
Reconvert EOL to Unix style.
...
Reconvert EOL to Unix style.
2020-05-08 23:36:05 -04:00
kasenvr
ac38455d13
Merge pull request #215 from AleziaKurdis/feature/shape-alpha
...
Feature/shape alpha
2020-05-08 16:32:05 -04:00
David Rowe
42036b2746
Merge branch 'master' into feature/openvr-update
2020-05-09 07:25:40 +12:00
Alezia Kurdis
637352052b
Merge branch 'master' into feature/renderWithZones-Create-UI
2020-05-08 15:20:31 -04:00
Alezia Kurdis
096bc40aa3
Merge the "screenshare" modifs
...
Merge the "screenshare" modifs with renderWithZones update
2020-05-08 15:16:38 -04:00
daleglass
affcc6f918
Merge pull request #300 from thoys/feature/gha_vircadia
...
GitHub Actions (with artifact uploading)
2020-05-08 17:17:45 +02:00
kasenvr
69eb3e11f5
Merge pull request #339 from ctrlaltdavid/fix/tabs-css
...
Fix whitespace and line endings in tabs.css
2020-05-07 23:24:54 -04:00
David Rowe
c6774016b5
Further fixes
2020-05-08 15:12:09 +12:00
Alezia Kurdis
309f330af8
Merge branch 'master' into feature/shape-alpha
2020-05-07 22:59:59 -04:00
David Rowe
395f950cb3
Fix whitespace and line endings in tabs.css
2020-05-08 14:59:01 +12:00
Alezia Kurdis
95562f7e23
Merged of "screenshare" and requested changes.
...
1- Update some tooltips (changed "Set the" for "The")
for Lines: 9, 18, 24, 215, 325, 329, 332, 335, 611
2- Include merge for conflict (not detected by Github) for "screenshare" attribute
2020-05-07 22:46:35 -04:00
Alezia Kurdis
67578a361e
Merged of "screenshare" and requested changes.
...
1- Update some tooltips (changed "Set the" for "The")
for Lines: 9, 18, 24, 215, 325, 329, 332, 335, 611
2- Include merge for conflict (not detected by Github) for "screenshare" attribute
3- Include tooltip for "renderWithZones" attribute (to avoid another rework on this file for PR#274) This includes some additional tooltip update done after PR215 for PR274 (no impact on functional)
2020-05-07 22:44:35 -04:00
David Rowe
5e08b96655
Merge pull request #338 from kasenvr/fix/packet-version-size
...
Bump packet version size up.
2020-05-08 14:34:23 +12:00
