0
0
mirror of https://github.com/Nimac0/SDL_Minigame synced 2026-01-12 15:53:42 +00:00

148 Commits

Author SHA1 Message Date
freezarite
68079d0279 made texture_cache map private 2024-10-13 13:29:32 +02:00
e493960fe0 Merge branch 'ref/healthcomponent' into separation-refactor 2024-06-25 12:17:35 +02:00
a5123b866c Merge branch 'ref/remove-teams' into separation-refactor 2024-06-25 11:53:01 +02:00
2ef373dd2c fix(PR) + cleaned up some dead code 2024-06-25 11:42:12 +02:00
Nanogamer7
5a1e7986d3
Merge pull request #65 from VEGO-Engine/ref/sound
Sound
2024-06-24 23:23:17 +02:00
6bf460d483 ref(teams): removed teams from engine 2024-06-24 23:03:18 +02:00
ineslelin
f78cd2c3f1 added some tweaks to playSound 2024-06-24 22:53:13 +02:00
160ba5a2d9 #66 removed UI elements from HealthComponent 2024-06-24 22:38:01 +02:00
ineslelin
24e69b73a2 updated SoundManager to incorporate requested changes 2024-06-24 22:21:18 +02:00
a8e046ce07 #58 added exception for missing game implementation 2024-06-24 18:27:04 +02:00
3d639b89d0 #58 Replaced map based game factory with simpler implementation 2024-06-24 16:03:46 +02:00
ineslelin
247d6cc173 removed stray music test in GameInternal.cpp 2024-06-18 19:39:51 +02:00
ineslelin
c4c8be5829 Merge remote-tracking branch 'origin/separation-refactor' into ref/sound 2024-06-18 19:23:07 +02:00
ineslelin
b321051ac5 added channels to sound 2024-06-16 19:37:07 +02:00
ineslelin
cb1b5af358 finished sound
- implemented fade in + fade out
- implemented pause for sound + music
- implemented unpausing/restarting sound + music
2024-06-16 19:20:39 +02:00
58e2bb0d30 Merge branch 'ref/nicole' into separation-refactor 0.1.1 2024-06-14 00:46:19 +02:00
7ffda89c9d Merge branch 'ref/beni' into separation-refactor 2024-06-14 00:00:48 +02:00
8c5c5c7215 removed define marco 2024-06-13 23:22:21 +02:00
5182312887 implemented GameFactory to instance an implementation of game 2024-05-29 10:02:14 +02:00
68a3e48131 rename Game->GameInternal 2024-05-29 09:07:54 +02:00
Sara Varga
5dfe42195f Merge branch 'ref/sara' into separation-refactor 2024-05-27 18:31:25 +02:00
ineslelin
6373afe3a2 working volume control 2024-05-27 12:40:51 +02:00
ineslelin
70c4d3c030 added ability to play music 2024-05-27 12:04:09 +02:00
ineslelin
db44d4d619 updated SoundManager
- created constexpr for the options to play a sound once or loop it infinitely
- removed SoundTypes enum, changed playSound() to accept a string and a bool => allows for playSound() to be used more universally
2024-05-27 11:36:02 +02:00
Sara Varga
aa83280b6a #32 KeyboardController: movement working
projectiles need adjustments
2024-05-26 22:54:50 +02:00
ineslelin
cb01c54968 updated SoundManager
- loading music from sound file now possible
- looping sound effects is possible now
2024-05-26 19:06:52 +02:00
31d7f42a31 ref(Animations, ECS impl):
dehardcoded Animations and moved ECS implementation + moved select screen function to chickengame
2024-05-20 21:05:20 +02:00
1f27d24de3 ref(Healthcomp, Stateffects) 2024-05-02 23:50:28 +02:00
737fd70851 ref(addTile): adding tiles for the tilemap is now on the dev side 2024-05-02 21:50:22 +02:00
Sara Varga
2e7a1b45cf refactor: removed Components.h file
consisted of includes of all components -> components included when not necessary
TODO: had to add 3 component includes in Entity.h because of template function; move if possible
2024-05-01 13:47:42 +02:00
Sara Varga
5dc61e6230 refactor: moved input polling from KeyboardController to input class 2024-05-01 13:07:48 +02:00
e3852379e4 ref(Powerups): move powerup adding functionality to gamedev side 2024-04-30 01:20:40 +02:00
cffe1bdc31 ref(TransformComponent): extracted entity move collision function 2024-04-29 23:46:25 +02:00
6744f519c5 ref(popup window): remove popup window code from main.cpp and game.cpp 2024-04-29 23:00:20 +02:00
8e0c76457e fix(CMakeLists.txt): fix MinGW compilation issues 2024-04-29 22:15:38 +02:00
1b571a6a46 MOVE: Game::update 2024-04-13 17:14:04 +02:00
b031e74756 Added compile commands copy function to CMake 2024-04-13 15:58:15 +02:00
b6854c79ec Added interface for game functions 0.1 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
3e9d81b2a5 Merged duplicate Direction enums 2024-02-02 15:11:10 +01:00
11a206fe0a updated diagrams INNO1-done 2024-01-30 20:19:05 +01:00
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
4c6eef36d1 Added doxygen file
still needs .gitignore configured to not bloat project
2024-01-30 19:10:48 +01:00
6c0fccbb9f Fixed selected character sheets not getting used 2024-01-30 16:27:45 +01:00
3b18b05e78 fixed error detection in map 2024-01-30 16:13:48 +01:00
325da0eb4c Merge branch 'powerups' 2024-01-30 16:09:25 +01:00
53019aa979 added missing textures 2024-01-30 15:52:27 +01:00