0
0
mirror of https://github.com/Nimac0/SDL_Minigame synced 2026-01-12 13:43:41 +00:00

228 Commits

Author SHA1 Message Date
ineslelin
06a603b9d5 throwing projectile makes sound 2024-01-29 20:53:35 +01:00
8c5c216838 added more descriptive error messages 2024-01-29 17:43:22 +01:00
2500b5b01f removed unneeded git submodules - again 2024-01-29 17:41:32 +01:00
ineslelin
d155753840 added ability to load in sound 2024-01-28 20:14:12 +01:00
dfa6768a96 added SDL_mixer 2024-01-28 19:10:19 +01:00
28af8c9389 minor improvements 2024-01-28 18:18:27 +01:00
ines
0a25cab6e8
Merge pull request #18 from Nimac0/Collision
Sliding along collision boxes
2024-01-28 17:55:46 +01:00
ineslelin
00190facab minimal changes in transformcomponent::update 2024-01-28 17:52:18 +01:00
fce7ded0e3 Merge branch 'collision-manager' into powerups 2024-01-28 17:12:01 +01:00
4755076c34 removed debug print 2024-01-28 17:01:18 +01:00
9f2df7c6c5 fixed sliding 2024-01-28 16:59:59 +01:00
ineslelin
c2cb8f9fc6 fixed collision interaction with player 2024-01-28 16:49:08 +01:00
sara
e14c27f84a
Merge pull request #19 from Nimac0/MainMenu
Main menu
2024-01-28 16:03:28 +01:00
ezveee
c146160660 Added 2 new sprites
added wizard and mlady sprite
2024-01-28 15:33:14 +01:00
f538e95623 Hotfix collision to the right
breaks sliding
2024-01-28 15:19:27 +01:00
0c1c9a7f84 Hotfix only calculate for player 2024-01-28 15:10:01 +01:00
8ff81ace72 Rewrite player collisions 2024-01-28 14:59:41 +01:00
fcf14b20c4 framework for randomly spawning items
not collectable yet, dont get destroyed either, WIP
2024-01-28 14:56:09 +01:00
ezveee
93b7262db7 Updated character selection screen
Added a backdrop, and changed the selection from being inline to 2 chickens per row.
+ fine tweaking the positions so they align with the background
2024-01-28 14:08:37 +01:00
ezveee
a9ae4f087e Character selection working
After enter gets pressed on the start screen, a character selection screen gets displayed.
P1 can choose a character via 'a' and 'd' - P2 via 'arrow left' and 'arrow right'.
Selections get locked in upon pressing enter.

Code is currently working, but in need of improvements.
2024-01-28 10:14:10 +01:00
ineslelin
314b58ac4a sliding collision around borders done 2024-01-27 19:36:44 +01:00
fa480f916f Merge branch 'texture-flipping' 2024-01-27 18:34:31 +01:00
ineslelin
fb88128f37 Merge branch 'Collision' of https://github.com/Nimac0/SDL_Minigame into Collision 2024-01-27 18:30:12 +01:00
0095b09357 Merge branch 'main' into Collision 2024-01-27 18:22:10 +01:00
Nanogamer7
42858da5fc
Merge pull request #16 from Nimac0/bounding-box
implemented bounding box
2024-01-27 18:20:50 +01:00
Nanogamer7
679f7ab8c2
Fixed inconsistent indentations in ColliderComponent.cpp 2024-01-27 18:19:58 +01:00
Nanogamer7
7fbcda681c
Fixes inconsistent indentations on KeyboardController.h 2024-01-27 18:19:07 +01:00
ineslelin
8bb1110e0b Merge remote-tracking branch 'origin/bounding-box' into Collision 2024-01-27 18:18:47 +01:00
ineslelin
35a527101b left/right sliding collision possible now 2024-01-27 17:29:14 +01:00
59fc17ec25 refined hitboxes so they are not bigger than the sprite 2024-01-27 16:07:25 +01:00
a51ffe4460 added correct spritesheet 2024-01-27 00:03:17 +01:00
6e23d0d3d8 added bounding box 2024-01-26 23:51:44 +01:00
d9f3b5ceba player sprites look direction they shoot 2024-01-26 23:36:53 +01:00
96418442f0 implemented actual flipping of textures 2024-01-26 23:28:55 +01:00
251d7f6661 Merge branch 'optimised-libs' 2024-01-26 22:09:10 +01:00
cd4c6d7339 Merge remote-tracking branch 'origin/Animations' 2024-01-26 21:49:32 +01:00
94e2107af6 removed zlib and libpng 2024-01-26 21:48:15 +01:00
baf3a206b6 reformatted inconsistent code and optimized imports 2024-01-24 16:28:41 +01:00
f36632c9fd Added diagrams for documentation 2024-01-24 15:04:38 +01:00
78f1b11d01 minor improvements with includes 2024-01-24 14:27:13 +01:00
ineslelin
9351307290 sprites walking directions done 2024-01-24 14:22:25 +01:00
4ae462136e Improved console output 2024-01-24 09:54:20 +01:00
d649a650a3 Updated textures 2024-01-24 09:34:42 +01:00
ezveee
f09a89b9cd added right startscreen image 2024-01-24 09:30:58 +01:00
ezveee
643e312983 startscreen implemented 2024-01-24 07:48:51 +01:00
317dc9d3bc Merge branch 'Animations' into 'main' 2024-01-24 02:07:41 +01:00
3766fefb13 fixed walk/idle animation 2024-01-24 01:50:33 +01:00
06042583f8 added error throwing for texture load
makes runtime error more descriptive
2024-01-23 22:33:08 +01:00
ineslelin
76f4ae79ed spritesheets and correct game.cpp 2024-01-23 22:26:26 +01:00
ineslelin
552168dab3 animation wip 2024-01-23 20:16:17 +01:00