Commit Graph

78 Commits

Author SHA1 Message Date
Victor Turgeon
5e3255bfc9 menu ui scaling 2023-06-11 14:38:44 -04:00
MarcEricMartel
a24d9169e1 WMD 2023-06-11 14:26:43 -04:00
Victor Turgeon
3cd26abcf6 screen scale of hud 2023-06-11 14:21:33 -04:00
Victor Turgeon
3ddacb0983 Merge branch 'main' of https://github.com/MarcEricMartel/MAD 2023-06-11 14:12:54 -04:00
Victor Turgeon
b6a6230d83 cancel key 2023-06-11 14:12:48 -04:00
MarcEricMartel
888c681b4c argh 2023-06-11 14:12:22 -04:00
MarcEricMartel
3a81a3c68b !!! 2023-06-11 14:08:44 -04:00
MarcEricMartel
441d033f53 Merge branch 'main' of https://github.com/marcericmartel/MAD 2023-06-11 14:06:43 -04:00
MarcEricMartel
11564bb073 ! 2023-06-11 14:02:32 -04:00
Victor Turgeon
9986cd0f19 Nuke boom buoom 2023-06-11 14:02:05 -04:00
Victor Turgeon
891647905e radio tower fixes 2023-06-11 13:38:58 -04:00
Victor Turgeon
0f330b3a6c radiotower scene 2023-06-11 13:36:55 -04:00
Victor Turgeon
bf28b50a83 building rotation 2023-06-11 13:15:53 -04:00
Victor Turgeon
828016be6a slower water 2023-06-11 13:00:56 -04:00
Victor Turgeon
e929b2500e Merge branch 'main' of https://github.com/MarcEricMartel/MAD 2023-06-11 12:57:34 -04:00
Victor Turgeon
5ccf6a12ea Come collision stuff and stuff aand stuff hahahah 2023-06-11 12:54:09 -04:00
MarcEricMartel
3b9bcefd3f Mennu kinda done 2023-06-11 12:15:56 -04:00
MarcEricMartel
73804ee4bc Update start_game_menu.cs 2023-06-11 12:02:08 -04:00
MarcEricMartel
0445d79eac Update start_game_menu.cs 2023-06-11 12:00:59 -04:00
MarcEricMartel
788964b128 zappa 2023-06-11 11:59:19 -04:00
MarcEricMartel
166966df54 Mushroom! 2023-06-11 11:32:56 -04:00
MarcEricMartel
cc68a0137b Merge branch 'main' of https://github.com/marcericmartel/MAD 2023-06-11 11:23:43 -04:00
MarcEricMartel
7250ee17c8 MENNU 2023-06-11 11:23:38 -04:00
Victor Turgeon
004ba54cc0 Merge branch 'main' of https://github.com/MarcEricMartel/MAD 2023-06-11 11:12:31 -04:00
Victor Turgeon
cea7c99c3d minor cursor changes 2023-06-11 11:12:28 -04:00
MarcEricMartel
979172f0e2 Merge branch 'main' of https://github.com/marcericmartel/MAD 2023-06-11 10:51:07 -04:00
MarcEricMartel
ad5bb7542a sons 2023-06-11 10:51:01 -04:00
Victor Turgeon
c3c13089c1 Merge branch 'main' of https://github.com/MarcEricMartel/MAD 2023-06-11 10:49:22 -04:00
Victor Turgeon
19b5075a3a Merge branch 'main' of https://github.com/MarcEricMartel/MAD 2023-06-11 10:49:16 -04:00
MarcEricMartel
4412d5bbd8 Chatter 2023-06-11 10:45:58 -04:00
Victor Turgeon
19847bd56c some environnement and water stuff 2023-06-11 10:44:54 -04:00
MarcEricMartel
d83ea3c6fc ? 2023-06-11 09:51:41 -04:00
MarcEricMartel
85f79ab5f2 Merge branch 'main' of https://github.com/marcericmartel/MAD 2023-06-11 09:49:01 -04:00
MarcEricMartel
7db945eb07 music 2023-06-11 09:47:15 -04:00
Victor Turgeon
5614495e12 water texture 2023-06-11 09:46:59 -04:00
Victor Turgeon
e59fb05a96 monke 2023-06-11 09:38:52 -04:00
Victor Turgeon
fd0294f8ae Merge branch 'main' of https://github.com/MarcEricMartel/MAD 2023-06-11 09:38:48 -04:00
Victor Turgeon
e7d5747a7c Kinda can put buildings 2023-06-11 09:10:21 -04:00
MarcEricMartel
82a2d84dc7 pray 2023-06-10 19:44:27 -04:00
MarcEricMartel
0bb76b9893 Merge branch 'main' of https://github.com/marcericmartel/MAD 2023-06-10 18:41:59 -04:00
MarcEricMartel
69393115af esfsfs 2023-06-10 18:41:49 -04:00
Victor Turgeon
eaee26025c Merge branch 'main' of https://github.com/MarcEricMartel/MAD 2023-06-10 18:36:43 -04:00
Victor Turgeon
fb1d8ea190 basic factory and capitol scenes 2023-06-10 18:36:39 -04:00
MarcEricMartel
9749b1ca22 Update player.cs 2023-06-10 17:18:55 -04:00
MarcEricMartel
a11b661a01 Merge branch 'main' of https://github.com/marcericmartel/MAD 2023-06-10 17:18:28 -04:00
MarcEricMartel
8f177ffa0e Les fleches c'est pour les noobs. 2023-06-10 17:18:19 -04:00
Victor Turgeon
b5201b3c16 Merge branch 'main' of https://github.com/MarcEricMartel/MAD 2023-06-10 17:14:58 -04:00
Victor Turgeon
3f3e39a40f basic building structures 2023-06-10 17:14:55 -04:00
MarcEricMartel
25fe5ee634 Danger mouse 2023-06-10 17:10:23 -04:00
MarcEricMartel
b982ffb7c4 No more KSP 2023-06-10 17:00:08 -04:00