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

41 Commits

Author SHA1 Message Date
adaed679af InteractionManager + proof of concept 2025-03-22 14:38:26 +01:00
e0c35aa690 Merge branch 'UpdateSoundMaps' into dev 2025-01-28 23:01:45 +01:00
1b795c3732 Merge branch 'data' into dev 2025-01-28 22:43:29 +01:00
freezarite
9bb9d0fbcc removed maps regarding music and sound effects from the AssetManager
reworked SoundManager to use enum classes as keys in its maps and to no longer use the AssetManager
added possibility to set sound effect of projectiles when creating them (was hard coded)
2025-01-28 19:08:05 +01:00
044d957106 feat: data and stats
- reimplemented/unhardcoded stateffects
- reimplemented/unhardcoded pickupables
- implemented datacomponent
- some minor cleanup
2025-01-28 17:31:03 +01:00
freezarite
91f15671c0 fixed pull request issues 2024-12-17 16:08:28 +01:00
freezarite
abe018f99b fixed some issues stemming from the removal of the window-size constant variables 2024-12-16 13:12:53 +01:00
7c50c8d1fb Merge branch '80-migrate-to-sdl3' into dev 2024-12-02 23:10:05 +01:00
freezarite
4ead20ecb7 Cleanup of documentation and refactoring
renamed TextureEnumBase.h to Textures.h
improved some of the doxygen documentation
2024-12-01 14:39:45 +01:00
freezarite
cbd1993c20 Extra map for MapTiles generated by TMX file now works like intended.
removed textures map from AssetManager as it is no longer used.
Updated SpriteComponent to now check if it is a normal Texture or a MapTileTexture.
Added if condition in TextureManager::LoadMapTileTexture to check if the texture was able to be loaded by SDL
2024-11-30 15:42:56 +01:00
25414524a0 new main logic & new time keeping 2024-11-18 16:20:41 +01:00
625ac98a57 first pass - changed function names etc. 2024-11-18 13:37:10 +01:00
freezarite
1a8a196e95 merged dev into textureManagerChanges 2024-11-17 16:26:05 +01:00
freezarite
494ff8aa0a magic_enum library stuff and refactored TextureEnum to Textures due to bad naming 2024-11-17 16:00:47 +01:00
b48d5d7183 Added z-Index base render order 2024-10-15 23:42:32 +02:00
freezarite
65e00c2314 changed texture_cache map to use enums instead of string for keys and functions using said map 2024-10-15 13:24:56 +02:00
a5123b866c Merge branch 'ref/remove-teams' into separation-refactor 2024-06-25 11:53:01 +02:00
6bf460d483 ref(teams): removed teams from engine 2024-06-24 23:03:18 +02:00
ineslelin
c4c8be5829 Merge remote-tracking branch 'origin/separation-refactor' into ref/sound 2024-06-18 19:23:07 +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
70c4d3c030 added ability to play music 2024-05-27 12:04:09 +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
e3852379e4 ref(Powerups): move powerup adding functionality to gamedev side 2024-04-30 01:20:40 +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
325da0eb4c Merge branch 'powerups' 2024-01-30 16:09:25 +01:00
6a2e8289f6 fixed memory leaks
managers are no singletons anymore
2024-01-30 15:17:58 +01:00
c49ce18ed0 Implemented powerups 2024-01-30 05:05:42 +01: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
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
ineslelin
d155753840 added ability to load in sound 2024-01-28 20:14:12 +01:00
fcf14b20c4 framework for randomly spawning items
not collectable yet, dont get destroyed either, WIP
2024-01-28 14:56:09 +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
7bc17eb8b9 Merge branch 'origin/Projectiles' into 'main' 2024-01-23 19:45:28 +01: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