0
0
mirror of https://github.com/Nimac0/SDL_Minigame synced 2026-01-13 17:03:42 +00:00

48 Commits

Author SHA1 Message Date
6744f519c5 ref(popup window): remove popup window code from main.cpp and game.cpp 2024-04-29 23:00:20 +02:00
1b571a6a46 MOVE: Game::update 2024-04-13 17:14:04 +02:00
b6854c79ec Added interface for game functions 2024-04-11 15:23:19 +02:00
efd8cc6616 Removed all instances of static data in Game class
see Issue #27
2024-04-10 11:15:23 +02:00
d10afe1e07 refactored labels to be within Entity class 2024-02-02 22:20:08 +01:00
93bbd83d37 Merge pull request #25 from Nimca0/menu 2024-01-30 19:42:31 +01:00
6c0fccbb9f Fixed selected character sheets not getting used 2024-01-30 16:27:45 +01:00
325da0eb4c Merge branch 'powerups' 2024-01-30 16:09:25 +01:00
c79ba00b20 minor balancing to powerups and shooting speed 2024-01-30 15:40:53 +01:00
6a2e8289f6 fixed memory leaks
managers are no singletons anymore
2024-01-30 15:17:58 +01:00
64dc4dd0a9 Better error handling 2024-01-30 14:10:40 +01:00
c49ce18ed0 Implemented powerups 2024-01-30 05:05:42 +01:00
Markus
1dfdc2ed20 code cleanup after peer2peer 2024-01-29 20:55:50 -06:00
9a01a19385 Merge branch 'collision-manager' 2024-01-30 00:36:39 +01:00
Nanogamer7
30807aa9bf
Merge pull request #20 from Nimac0/sound-effects
Sound effects
2024-01-30 00:06:55 +01:00
a9f9931101 Merge branch 'collision-manager' into powerups 2024-01-30 00:02:39 +01:00
fa4586f1db Rewrote collision detection 2024-01-29 23:49:58 +01:00
Markus
0a1747d651 replayability added,
popup window for victory added,
png files for new skins and popups added
2024-01-29 15:04:44 -06:00
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
ineslelin
d155753840 added ability to load in sound 2024-01-28 20:14:12 +01:00
ines
0a25cab6e8
Merge pull request #18 from Nimac0/Collision
Sliding along collision boxes
2024-01-28 17:55:46 +01:00
fce7ded0e3 Merge branch 'collision-manager' into powerups 2024-01-28 17:12:01 +01:00
ineslelin
c2cb8f9fc6 fixed collision interaction with player 2024-01-28 16:49:08 +01:00
ezveee
c146160660 Added 2 new sprites
added wizard and mlady sprite
2024-01-28 15:33:14 +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
0095b09357 Merge branch 'main' into Collision 2024-01-27 18:22:10 +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
baf3a206b6 reformatted inconsistent code and optimized imports 2024-01-24 16:28:41 +01:00
d649a650a3 Updated textures 2024-01-24 09:34:42 +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
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
7bc17eb8b9 Merge branch 'origin/Projectiles' into 'main' 2024-01-23 19:45:28 +01:00
sara
5d4512133c refactor (working version) 2024-01-23 18:50:21 +01:00
Markus
02cbc58d0b added some comments for clarity 2024-01-22 17:54:36 -06:00
Markus
7c87ccc42b added health, getting damage and visual
representation of it
2024-01-22 17:39:47 -06:00
Markus
acbea34632 code documentation in form of comments added 2024-01-21 22:13:21 -06:00
Markus
98f8cbc221 worst tutorial, but projectiles added 2024-01-21 13:28:58 -06:00
587b40ce43 added comments 2024-01-11 18:38:08 +01:00
146079232c Merge branch 'CMake' 2024-01-11 15:53:51 +01:00
f59059860a restructured project to compile with CMake 2024-01-08 19:32:50 +01:00