From c030fec442cad9164a1de2d393cf1e0010fc7559 Mon Sep 17 00:00:00 2001 From: Chateauvision <89737965+Chateauvisionn@users.noreply.github.com> Date: Mon, 2 May 2022 17:39:34 +0200 Subject: [PATCH 1/2] removed useless thing in notification.py --- vitrix/lib/UI/inventory.py | 2 +- vitrix/lib/UI/notification.py | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/vitrix/lib/UI/inventory.py b/vitrix/lib/UI/inventory.py index 88cb24f..4716243 100644 --- a/vitrix/lib/UI/inventory.py +++ b/vitrix/lib/UI/inventory.py @@ -3,7 +3,7 @@ -# inventory hotbar/ +# inventory hotbar def inventory(): hotbar = Entity( model='quad', diff --git a/vitrix/lib/UI/notification.py b/vitrix/lib/UI/notification.py index e9ebe59..28d2885 100644 --- a/vitrix/lib/UI/notification.py +++ b/vitrix/lib/UI/notification.py @@ -19,6 +19,3 @@ def notify(title: str, msg: str,): B1.pack(pady=10) popup.protocol("WM_DELETE_WINDOW", on_closing) popup.mainloop() - -if __name__ == '__main__': - notify("hello", "this is a test.") \ No newline at end of file From 45ea0e52bc9709273c1a6d81f747bc4b668d35f3 Mon Sep 17 00:00:00 2001 From: Chateauvision <89737965+Chateauvisionn@users.noreply.github.com> Date: Mon, 2 May 2022 17:48:01 +0200 Subject: [PATCH 2/2] removed __pycache__ folders --- .gitignore | 3 ++- .../lib/UI/__pycache__/inventory.cpython-39.pyc | Bin 563 -> 0 bytes .../entities/__pycache__/bullet.cpython-39.pyc | Bin 1590 -> 0 bytes .../entities/__pycache__/crate.cpython-39.pyc | Bin 1013 -> 0 bytes .../entities/__pycache__/enemy.cpython-39.pyc | Bin 2962 -> 0 bytes .../entities/__pycache__/floor.cpython-39.pyc | Bin 1212 -> 0 bytes .../lib/entities/__pycache__/map.cpython-39.pyc | Bin 1348 -> 0 bytes .../entities/__pycache__/player.cpython-39.pyc | Bin 5842 -> 0 bytes vitrix/lib/entities/player.py | 2 +- 9 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 vitrix/lib/UI/__pycache__/inventory.cpython-39.pyc delete mode 100644 vitrix/lib/entities/__pycache__/bullet.cpython-39.pyc delete mode 100644 vitrix/lib/entities/__pycache__/crate.cpython-39.pyc delete mode 100644 vitrix/lib/entities/__pycache__/enemy.cpython-39.pyc delete mode 100644 vitrix/lib/entities/__pycache__/floor.cpython-39.pyc delete mode 100644 vitrix/lib/entities/__pycache__/map.cpython-39.pyc delete mode 100644 vitrix/lib/entities/__pycache__/player.cpython-39.pyc diff --git a/.gitignore b/.gitignore index dcee4cf..4617ab1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,9 @@ vitrix/__pycache__/ vitrix/lib/__pycache__/ vitrix/lib/weapons/__pycache__/ vitrix/lib/items/__pycache__/ +vitrix/lib/UI/__pycache__/ +vitrix/lib/entities/__pycache__/ vitrix/test.py -*/*/*/__pycache__/ venvs-config/ data.txt build/ diff --git a/vitrix/lib/UI/__pycache__/inventory.cpython-39.pyc b/vitrix/lib/UI/__pycache__/inventory.cpython-39.pyc deleted file mode 100644 index 2c746f156ac99af01cbba7744cdfe2b4c20da4e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 563 zcmYjOy=ojW5SFyN+B;)I;y9!Wt_*9;ZIL#%115nqCJ-mZHH&s7ulKBz)+3#{1*c1! z2T0mfd4yDch!n=ELQ>@w0tU~XIpa^vH#5@wp%H6qD+KX;)s$xgLjLy7Lojq+p}0*X zNhHDH}6NWF+IyWE{!lJ<0e#j3OBgbQ|gEn+BYJr@&crV2uZ>wSuY-S%RXG zpd6sMJtU7UJe@GfWb`HaL}YwH3M`HsOMXEnkxVzpGlG612gux~lU}Ei-~hwJ5TDJ2 zJj$YwOs!Np@K%5_K5%73sa5@AfnWRex34{}m&VV_8v7%D@7KF4SKr&+KbP4s@YlvS zz6-n(Qw1WhSrbxM39X85Y0Lxd0-cAXvf4rzN&%-u4Wi5Fn4ef*3iv_bG1mUSlb_hB z%1?!vx>4JO;k}n)vfJp#qYO_>*$q!Q<@6Ed5j?^B z!z>Pb2Cgw8Y~ATm3+h;uZgku)qG%VJD60EaK!kaVH^!sL-o~P=o~PgC%77yqlaIpMBlk z3%SUVkW#5n`~VOScaQxA@E7{*u{m5YzJyml0U?N>C5gK)jVaiyWK$=0rf%#~oOeoZ%41H+Ga_8!y(Geur0}nt zI1u!E67g%uLyjV5y{DC&E-a7h={T1Wwc)dLD!)t3L}$2WbMUpHKLte++&N||U2)*aA8LzixA zdrh#St;U;hMfb^i7WDP(|NJYb@%IVj_f2p`im;&#VA}ZalDmMi=@nbcz8MtT!do%u zoC#k9zrYzZ9>nZ4SlMplfV|akkb8n4B1fYit`DID%k^v`mAvSUTZ9f~)rob+_4&zf zzvB4oi-;@4zl{7!q>a>e`zYCa2DS$z_ zN}$3xY#D*-YoKV7WM!&#lDsBwhQmocmBZ7tDu&N~#D+xB(-hm}NbX zjtItA@amsIG+-7W3u;&a*JPi3Mi>yZAxm#XE@?vxt{S9~R-gx8lOG>nG7~n;^sbox zrq#Btm^y42Wa`7p!RMF(we6PjhoJ2&cai9nyf`#$d8;9)xAbC1qiC3r4~QX5q-B1e6IF#%);{v6kqx7io!BMfZC$GCvcXCgK75$GDLB=jB&7-HU|`*auN zHoF+C(eKtq&Pd@uX#~Uqc2@A?0(SP21TM%Nu0dk^N%CTzmYt_m8SMYODk8 zw|r0!adxogRVK?aNj3_60A7VvDh~wGTH`SX?EYap6NO#w_h8cQ0q+iO5CjE&uN&Bf l=*7FEyKBRrB10E#nvEUb;u1XSx_OL5)3|p)1GWo%{SPeUl3xG- diff --git a/vitrix/lib/entities/__pycache__/crate.cpython-39.pyc b/vitrix/lib/entities/__pycache__/crate.cpython-39.pyc deleted file mode 100644 index 0bafd48a253139e6d6f1059ee0ffb84041a3d4fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1013 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 kR40>}uC6M#%T-@}T@HtR0`g+mPWB^0UZQhV zVsL(jWgml*L{d$P^_vzHe5TnfDk6%pNXN6JNGQ2aWGs`XL?((h=}A=dAd<=+M0%SD zm-H8s^9#sI9_7?$_sf}jT)IOGPIA|jPF1*fRj?Km`z=w=7CcFNT4)Taw$>$dbece3T9&t%JUl9nZ@7Xnt%yf(*zwy9bKUl(O*bQuZq4oGynrsnNEXJj2FXpawM77Xm<8 zXtW1H{JtplddFZc^D(MVP<@IDFY?1pp_S5F2y+WJg1U*;7pM>(9J>t$-K8P&4)>51 zC>Bp{xfj?5>;Se!fo(BNJMz)Pa$ez>wt{vFD^TkW7;9=>Ar%EuF&UjQN?h-ZugEzC z`ed#T-VV}jLn@4JNwwsF>Gz{<(oFY*{QXnT%nqbCi0}m}vy0ZN%gf80hUw))^C89& zp8w;9BrW=Zcs6k5GYI&>LuC)Q%rH0b9QI+ZwQ!E1~#xdi#2m<(9g4VLl`eIAm0f8 y0&7BBd+2Y;I0{vVHhg*y8G0P19@1R7?@b$?|FEXsk2p$;$a2crfDWR)4_*VPLo3Sw diff --git a/vitrix/lib/entities/__pycache__/player.cpython-39.pyc b/vitrix/lib/entities/__pycache__/player.cpython-39.pyc deleted file mode 100644 index d54d3230ccc5b465746ca3987d9a57587b840666..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5842 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 Fe*x^{nj-)J diff --git a/vitrix/lib/entities/player.py b/vitrix/lib/entities/player.py index c57235e..0b6b0b9 100644 --- a/vitrix/lib/entities/player.py +++ b/vitrix/lib/entities/player.py @@ -29,7 +29,7 @@ def __init__(self, position: ursina.Vec3): self.thirdperson = False - self.cursor.color = ursina.color.rgb(255, 0, 0, 255) + self.cursor.color = ursina.color.rgb(255, 0, 0) self.pew = ursina.Audio("pew", autoplay=False) self.pew.volume = 0.2