freezarite
|
136196f6a5
|
Merge remote-tracking branch 'origin/textureManagerChanges' into textureManagerChanges
# Conflicts:
# .gitmodules
# CMakeLists.txt
# include/AssetManager.h
# include/Map.h
# include/TileComponent.h
# src/AssetManager.cpp
# src/Map.cpp
# src/TileComponent.cpp
|
2024-11-19 19:14:20 +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 |
|
freezarite
|
494ff8aa0a
|
magic_enum library stuff and refactored TextureEnum to Textures due to bad naming
|
2024-11-17 16:00:47 +01:00 |
|
|
|
a8052b4bbb
|
Merge branch 'tmxlite' into dev
|
2024-11-17 14:07:42 +01:00 |
|
|
|
92dfbacd9b
|
Fixed templates and const char* for texture
|
2024-11-17 13:07:33 +01:00 |
|
|
|
1fbbb39843
|
Merge branch 'v0-2-0' into dev
|
2024-11-17 12:50:32 +01:00 |
|
|
|
70260c01bb
|
structural improvements & code comments
|
2024-11-17 12:39:14 +01:00 |
|
|
|
7f4b1df833
|
Restructured code
|
2024-11-16 20:02:35 +01:00 |
|
|
|
9e346a719d
|
Reimplemented collision
still missing documentation
|
2024-11-15 22:25:43 +01:00 |
|
|
|
6751b3e12c
|
Merge branch 'dev'
|
2024-11-13 13:12:09 +01:00 |
|
Benedikt Galbavy
|
c19171328d
|
Merge pull request #84 from VEGO-Engine/tmxlite
Added support for .tmx maps
|
2024-11-05 19:50:56 +01:00 |
|
Benedikt Galbavy
|
21f970cb19
|
Merge pull request #85 from VEGO-Engine/remove-assets
Removed assets and startscreen from engine
|
2024-11-05 19:47:22 +01:00 |
|
|
|
23c750c409
|
Implemented requested changes
|
2024-11-05 19:45:24 +01:00 |
|
|
|
7c82ee5beb
|
Removed all assets* from Engine
|
2024-11-05 19:35:31 +01:00 |
|
freezarite
|
549178fc7c
|
removed doxigen (idk how it got in here)
|
2024-11-05 18:45:34 +01:00 |
|
freezarite
|
6bedb08d9b
|
changes to make chickengame work with updated textureManager
future changes regarding the removal of the character selection needed
|
2024-11-05 18:38:53 +01:00 |
|
|
|
d7f11e7ebd
|
Readded animations
|
2024-11-05 16:14:35 +01:00 |
|
|
|
476d24e930
|
Code clean-up
|
2024-11-05 16:14:22 +01:00 |
|
freezarite
|
6de979d794
|
so much happened idk what to write here :c
|
2024-11-05 12:45:26 +01:00 |
|
|
|
ba8dca8abc
|
added loading of tmx files
|
2024-11-04 23:27:26 +01:00 |
|
Benedikt Galbavy
|
0179a27aaf
|
Merge pull request #77 from VEGO-Engine/#69-delete-gameobject
refactor: remove obsolete code
|
2024-10-17 19:21:21 +02:00 |
|
Freezarite
|
a5c3ec3683
|
Merge pull request #82 from VEGO-Engine/#81-zindex
Added z-Index based render order
|
2024-10-16 13:59:55 +02:00 |
|
|
|
074d285aff
|
Adjusted for loop
|
2024-10-16 13:57:23 +02:00 |
|
|
|
686ebbb97f
|
Added documentation
|
2024-10-16 13:38:20 +02: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 |
|
|
|
d3a1daf383
|
refactor: remove obsolete code
|
2024-10-14 20:47:11 +02:00 |
|
freezarite
|
68079d0279
|
made texture_cache map private
|
2024-10-13 13:29:32 +02:00 |
|
Nanogamer7
|
bfa5054755
|
Updated README.md
/ deploy (push) Has been cancelled
|
2024-06-25 15:23:21 +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 |
|
