Commit graph

83001 commits

Author SHA1 Message Date
David Rowe
ce96fc61d6 Remove unused code 2020-05-24 13:16:26 +12:00
David Rowe
1ac184bd22 Fix further type errors 2020-05-24 13:16:15 +12:00
David Rowe
6981937697 Fix path to header file 2020-05-23 20:42:22 +12:00
David Rowe
343c6a4027 Fix Linux targeting 2020-05-23 19:46:26 +12:00
David Rowe
33a77a5dbd Fix further Linux errors 2020-05-23 19:08:16 +12:00
David Rowe
f2232b89f0 Address Linux build warnings and errors 2020-05-23 17:18:03 +12:00
David Rowe
74f50ce079 Fix Linux build error 2020-05-23 15:48:48 +12:00
David Rowe
b72d5bf80c Build OpenVR plugin on Linux 2020-05-23 14:53:43 +12:00
kasenvr
a9b56b5f3a
Merge pull request #335 from kasenvr/feature/openvr-update
Update to latest OpenVR SDK
2020-05-20 14:03:05 -04:00
daleglass
cd3eec4192
Merge pull request #346 from daleglass/remove_qstring_null
Remove all uses of QString::null
2020-05-19 22:36:55 +02: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
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
daleglass
9c96136312
Merge pull request #344 from jug007/grabbable
Disable "grabbable" property by default
2020-05-16 20:55:50 +02: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 and causes an assertion (#337)
2020-05-10 18:41:03 +02: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
Kasen IO
430d748b29 Bump packet version size up. 2020-05-07 21:33:20 -04:00
Thijs Wenker
b9d4791af2
fix CR style error 2020-05-08 00:55:43 +02:00
kasenvr
c6f47eca23
Merge pull request #78 from HifiExperiments/zoneOcclusion
Zone occlusion
2020-05-07 16:30:28 -04:00
HifiExperiments
91e177f68b add spaces after fors 2020-05-07 13:23:22 -07:00
HifiExperiments
3bf690571c
Merge branch 'master' into zoneOcclusion 2020-05-07 13:13:20 -07:00
kasenvr
fa6d40f81c
Merge pull request #193 from AleziaKurdis/kasen/core
Create app: Properties editor: tabs
2020-05-07 15:46:45 -04:00
Thijs Wenker
8a76753135 Merge branch 'master' of https://github.com/kasenvr/project-athena into feature/gha_vircadia 2020-05-07 11:07:28 +02:00
David Rowe
be8d97cbf7 Use new audio setting API values 2020-05-07 16:05:49 +12:00
David Rowe
f83ea58a10 Fix erroneous hard-coded audio setting string 2020-05-07 15:42:30 +12:00
Alezia Kurdis
91d234589e
Minor Code Adjustment
Minor Code Adjustment
and uncommented the new property renderWithZones
2020-05-06 23:39:11 -04:00
Alezia Kurdis
a94ed7f6c1
Minor Code Adjustments
Minor Code Adjustments
2020-05-06 23:37:36 -04:00