097889004d
Merge into 'main'
2024-01-30 19:58:09 +01:00
037a7f7611
fixed uint->int conversion issues and buff duration
2024-01-30 19:49:54 +01:00
93bbd83d37
Merge pull request #25 from Nimca0/menu
2024-01-30 19:42:31 +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
b814fa3298
powerups work + sprites for each powerup added
2024-01-30 15:29:02 +01:00
ae54dd3158
Removed debug print, added TODO comment
2024-01-30 15:22:23 +01:00
6a2e8289f6
fixed memory leaks
...
managers are no singletons anymore
2024-01-30 15:17:58 +01:00
807ff4b0d0
Fixed a memory leak
2024-01-30 14:19:51 +01:00
8735edb3ad
Rewrote map loader
2024-01-30 14:10:26 +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
e979b4aa88
Cleanup of legacy code booleans
2024-01-30 03:27:11 +01:00
9a01a19385
Merge branch 'collision-manager'
2024-01-30 00:36:39 +01:00
fee39adebc
Hotfix proper SDL_mixer include
2024-01-30 00:21:45 +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
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
fce7ded0e3
Merge branch 'collision-manager' into powerups
2024-01-28 17:12:01 +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
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
fa480f916f
Merge branch 'texture-flipping'
2024-01-27 18:34:31 +01:00
0095b09357
Merge branch 'main' into Collision
2024-01-27 18:22:10 +01:00
Nanogamer7
7fbcda681c
Fixes inconsistent indentations on KeyboardController.h
2024-01-27 18:19:07 +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
6e23d0d3d8
added bounding box
2024-01-26 23:51:44 +01:00
96418442f0
implemented actual flipping of textures
2024-01-26 23:28:55 +01:00
cd4c6d7339
Merge remote-tracking branch 'origin/Animations'
2024-01-26 21:49:32 +01:00
baf3a206b6
reformatted inconsistent code and optimized imports
2024-01-24 16:28:41 +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
d649a650a3
Updated textures
2024-01-24 09:34:42 +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
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
5c730a6369
refactor done
2024-01-23 19:13:02 +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
