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

249 Commits

Author SHA1 Message Date
70080681e0 Docs: Formatting and more content
Some checks failed
/ deploy (push) Failing after 33s
2025-05-02 13:45:07 +02:00
4c2ddb7ff4 Docs: add more documentation
Some checks failed
/ deploy (push) Failing after 1m36s
2025-04-17 15:49:13 +02:00
2ff579dd39 Merge branch 'dev'
Some checks failed
/ deploy (push) Has been cancelled
2025-04-09 22:00:12 +02:00
7a3c845c40 Merge branch 'interactions-v2' into dev 2025-04-09 21:33:19 +02:00
0695c6cacb Merge branch 'BA' into dev 2025-04-09 21:11:08 +02:00
3c5d56de6b feat/ref: Interaction and Event management 2025-04-09 21:06:34 +02:00
adaed679af InteractionManager + proof of concept 2025-03-22 14:38:26 +01:00
325f6e8e8d ref: powerup component now pickup component, assetmanager removed
assetmanager was redundant therefore any traces and usages were removed
2025-03-22 12:45:28 +01:00
a9e754dd4f Merge branch 'input2' into interactions-v2 2025-03-21 17:19:59 +01:00
d66d860cdc Implemented event manager 2025-03-21 16:35:03 +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
eba3cdb6c8 doc: add docu
- datacomponent
- stateffectcomponent
- powerupcomponent
2025-01-28 22:33:07 +01:00
freezarite
1dc00408de pr stuff 2025-01-28 21:50:48 +01:00
freezarite
e215fbd5b6 instance changes in constructor and .cpp file for SoundManager 2025-01-28 19:40:14 +01:00
freezarite
007538f760 added getInstance method to soundmanager 2025-01-28 19:31:54 +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
361687f09f
Merge pull request #95 from VEGO-Engine/config-system
Config system
2025-01-25 16:11:30 +01:00
freezarite
9195b19bdb changed default width and height in config.json 2025-01-14 21:40:00 +01:00
freezarite
201b5c8b5d added documentation 2025-01-14 19:27:56 +01:00
ines
2b411c5f6e
Merge pull request #94 from VEGO-Engine/helper-functions
Some checks failed
/ deploy (push) Has been cancelled
Helper functions
2024-12-17 23:04:58 +01:00
ineslelin
29743d11b0 add documentation to calculateSpawnPosition 2024-12-17 22:56:58 +01:00
ineslelin
7e088594ae incorporate requests into code 2024-12-17 22:48:49 +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
freezarite
84cee5e307 removed no longer used variables in Constants.h
updated _Init.cpp to use updated init() function from GameInternal.cpp
2024-12-16 06:21:26 +01:00
freezarite
55b60624c4 added a folder to hold internal assets for the standard config of the engine 2024-12-16 06:10:31 +01:00
freezarite
1f3cf01419 fixed a bug with the implementation of the nlohmann library in the CMakeLists.txt
fixed a bug where the config was not loaded correctly in the GameInternal.cpp
2024-12-16 06:08:52 +01:00
freezarite
691ea06eb0 Added and implemented some more config options in the GameInternal.cpp. Also removed GameInternal::init() parameters as they are no longer needed 2024-12-16 06:02:58 +01:00
freezarite
acdbf29896 Fixed a bug where the custom json was not loaded correctly
Changed base config location to ./engine/config.json to make implementation better for the game-dev
2024-12-16 05:47:28 +01:00
freezarite
5e48f4e34f Config now gets read by the GameInternal.cpp
Made the process of adding a custom Config file work via a Virtual function within Game.h
2024-12-13 14:36:43 +01:00
freezarite
9247b8df8a started work on config-system
added nlohmann_json library as submodule and to CMakeLists.txt
created basic config.json file in root folder
created ConfigLoader.h and added basic functionalities to it
2024-12-03 18:17:31 +01:00
ineslelin
a49753e39a rework calculateSpawnPosition() 2024-12-03 12:06:09 +01:00
7c50c8d1fb Merge branch '80-migrate-to-sdl3' into dev 2024-12-02 23:10:05 +01:00
6a0b5197f9 Implemented suggested changes 2024-12-02 21:47:36 +01:00
Freezarite
ff27a0e55c
Merge pull request #86 from VEGO-Engine/textureManagerChanges
Texture manager changes
2024-12-01 21:09:09 +01:00
freezarite
58be6b05f0 more documentation changes 2024-12-01 21:04:45 +01:00
freezarite
b490e2dc17 removed magic enum and documentation improvements
since getName is no longer used from the TileComponent.h we no longer need magic_enum for the enum to string conversion
also some minor documentation changes
2024-12-01 20:25:31 +01:00
2483b75983 Added config file 2024-12-01 18:41:58 +01:00
freezarite
dadf846470 fixed \todo in TextureManager.h 2024-12-01 14:51:10 +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
7dbcfe876c Added some doxygen documentation to TextureEnumBase.h and TextureManager.h 2024-11-30 15:43:15 +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
b497991975 fixed developer skill issue 2024-11-19 18:47:37 +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
27a80d9766 added new Constructor for SpriteComponent as Tiles wont work with enums 2024-11-17 17:05:26 +01:00
freezarite
ac217e931b added new Map for tile-textures as they wont work with our current enum-class maps. 2024-11-17 16:59:46 +01:00
freezarite
1a8a196e95 merged dev into textureManagerChanges 2024-11-17 16:26:05 +01:00