Commit Graph

Select branches

Hide Pull Requests

17-projectiles-dont-spawn-centered

action-lint-format

dev

dialog-handler

game-registration-fix

gamepad-test

gh-pages

input2

interaction-component

main

ref/inputSystem

revert-94-helper-functions

scene-management

tmxlite

unittest

#100

#15

#16

#18

#19

#20

#21

#24

#25

#3

#43

#47

#48

#49

#50

#51

#52

#55

#65

#67

#68

#7

#77

#8

#82

#84

#85

#86

#88

#89

#90

#92

#94

#95

#97

#97

#98

0.1

0.1.1

0.2

INNO1-done

Mono Color

• 75189645d0 Documented entity Benedikt Galbavy 2024-02-03 16:53:40 +01:00
• fcb79bc2a3 fixed redundant references Benedikt Galbavy 2024-02-02 22:30:09 +01:00
• 705fe069cf fixes to enums Benedikt Galbavy 2024-02-02 22:29:28 +01:00
• d10afe1e07 refactored labels to be within Entity class Benedikt Galbavy 2024-02-02 22:17:21 +01:00
• 57a0bead6a refactored labels to be within Entity class Benedikt Galbavy 2024-02-02 22:17:21 +01:00
• 66a59d9666 adjusted theme Benedikt Galbavy 2024-02-02 20:13:06 +01:00
• f2d7601480 Updated doxygen file to 1.10 Benedikt Galbavy 2024-02-02 20:03:49 +01:00
• cebe343e4c extended collision handler docs Benedikt Galbavy 2024-02-02 15:12:51 +01:00
• 3e9d81b2a5 Merged duplicate Direction enums Benedikt Galbavy 2024-02-02 15:10:38 +01:00
• 680f66270f Merged duplicate Direction enums Benedikt Galbavy 2024-02-02 15:10:38 +01:00
• 04c4e19413 working controller input gamepad-test Benedikt Galbavy 2024-02-02 00:35:27 +01:00
• b2a001e24d first draft collision handler get any Benedikt Galbavy 2024-01-31 02:32:21 +01:00
• 11a206fe0a updated diagrams INNO1-done Benedikt Galbavy 2024-01-30 20:19:05 +01:00
• 097889004d Merge into 'main' Benedikt Galbavy 2024-01-30 19:57:04 +01:00
• 037a7f7611 fixed uint->int conversion issues and buff duration Nimac0 2024-01-30 19:49:54 +01:00
• 93bbd83d37 Merge pull request #25 from Nimca0/menu Benedikt Galbavy 2024-01-30 19:41:19 +01:00
• 4c6eef36d1 Added doxygen file Benedikt Galbavy 2024-01-30 19:10:26 +01:00
• 6c0fccbb9f Fixed selected character sheets not getting used Benedikt Galbavy 2024-01-30 16:27:45 +01:00
• 3b18b05e78 fixed error detection in map Benedikt Galbavy 2024-01-30 16:13:48 +01:00
• 325da0eb4c Merge branch 'powerups' Benedikt Galbavy 2024-01-30 16:09:25 +01:00
• 53019aa979 added missing textures Nimac0 2024-01-30 15:52:27 +01:00
• c79ba00b20 minor balancing to powerups and shooting speed Nimac0 2024-01-30 15:40:53 +01:00
• b814fa3298 powerups work + sprites for each powerup added Nimac0 2024-01-30 15:29:02 +01:00
• ae54dd3158 Removed debug print, added TODO comment Benedikt Galbavy 2024-01-30 15:22:23 +01:00
• 6a2e8289f6 fixed memory leaks Benedikt Galbavy 2024-01-30 15:17:58 +01:00
• 807ff4b0d0 Fixed a memory leak Benedikt Galbavy 2024-01-30 14:19:51 +01:00
• cf02eef8fd Hotfix missing semicolon Benedikt Galbavy 2024-01-30 14:14:20 +01:00
• 64dc4dd0a9 Better error handling Benedikt Galbavy 2024-01-30 14:10:40 +01:00
• 8735edb3ad Rewrote map loader Benedikt Galbavy 2024-01-30 14:10:26 +01:00
• c49ce18ed0 Implemented powerups Nimac0 2024-01-30 05:05:42 +01:00
• 1dfdc2ed20 code cleanup after peer2peer Markus 2024-01-29 20:55:50 -06:00
• 2be05e8b9c
  Merge pull request #21 from Nimac0/collision-manager Freezarite 2024-01-30 03:28:45 +01:00
• e979b4aa88 Cleanup of legacy code booleans Benedikt Galbavy 2024-01-30 03:27:11 +01:00
• 9a01a19385 Merge branch 'collision-manager' Benedikt Galbavy 2024-01-30 00:36:10 +01:00
• fee39adebc Hotfix proper SDL_mixer include Benedikt Galbavy 2024-01-30 00:21:45 +01:00
• 30807aa9bf
  Merge pull request #20 from Nimac0/sound-effects Nanogamer7 2024-01-30 00:06:55 +01:00
• a9f9931101 Merge branch 'collision-manager' into powerups Nimac0 2024-01-30 00:02:39 +01:00
• fa4586f1db Rewrote collision detection Benedikt Galbavy 2024-01-29 23:49:58 +01:00
• 973114f351 Added debug type to CMake Benedikt Galbavy 2024-01-29 23:49:09 +01:00
• 0a1747d651 replayability added, popup window for victory added, png files for new skins and popups added Markus 2024-01-29 15:04:44 -06:00
• 3bd9f8d9e2 walking sounds implemented ineslelin 2024-01-29 21:19:05 +01:00
• 06a603b9d5 throwing projectile makes sound ineslelin 2024-01-29 20:53:35 +01:00
• 8c5c216838 added more descriptive error messages Benedikt Galbavy 2024-01-29 17:41:47 +01:00
• 2500b5b01f removed unneeded git submodules - again Benedikt Galbavy 2024-01-29 17:41:32 +01:00
• d155753840 added ability to load in sound ineslelin 2024-01-28 20:14:12 +01:00
• dfa6768a96 added SDL_mixer Benedikt Galbavy 2024-01-28 19:10:19 +01:00
• 28af8c9389 minor improvements Benedikt Galbavy 2024-01-28 18:18:27 +01:00
• 0a25cab6e8
  Merge pull request #18 from Nimac0/Collision ines 2024-01-28 17:55:46 +01:00
• 00190facab minimal changes in transformcomponent::update ineslelin 2024-01-28 17:52:18 +01:00
• fce7ded0e3 Merge branch 'collision-manager' into powerups Benedikt Galbavy 2024-01-28 17:12:01 +01:00
• 4755076c34 removed debug print Benedikt Galbavy 2024-01-28 17:01:18 +01:00
• 9f2df7c6c5 fixed sliding Benedikt Galbavy 2024-01-28 16:59:59 +01:00
• c2cb8f9fc6 fixed collision interaction with player ineslelin 2024-01-28 16:49:08 +01:00
• e14c27f84a
  Merge pull request #19 from Nimac0/MainMenu sara 2024-01-28 16:03:28 +01:00
• c146160660 Added 2 new sprites ezveee 2024-01-28 15:33:14 +01:00
• f538e95623 Hotfix collision to the right Benedikt Galbavy 2024-01-28 15:19:27 +01:00
• 0c1c9a7f84 Hotfix only calculate for player Benedikt Galbavy 2024-01-28 15:10:01 +01:00
• 8ff81ace72 Rewrite player collisions Benedikt Galbavy 2024-01-28 14:51:01 +01:00
• fcf14b20c4 framework for randomly spawning items Nimac0 2024-01-28 14:56:09 +01:00
• 93b7262db7 Updated character selection screen ezveee 2024-01-28 14:08:37 +01:00
• a9ae4f087e Character selection working ezveee 2024-01-28 10:14:10 +01:00
• 314b58ac4a sliding collision around borders done ineslelin 2024-01-27 19:36:44 +01:00
• fa480f916f Merge branch 'texture-flipping' Benedikt Galbavy 2024-01-27 18:34:31 +01:00
• fb88128f37 Merge branch 'Collision' of https://github.com/Nimac0/SDL_Minigame into Collision ineslelin 2024-01-27 18:30:12 +01:00
• 0095b09357 Merge branch 'main' into Collision Benedikt Galbavy 2024-01-27 18:22:10 +01:00
• 42858da5fc
  Merge pull request #16 from Nimac0/bounding-box Nanogamer7 2024-01-27 18:20:50 +01:00
• 679f7ab8c2
  Fixed inconsistent indentations in ColliderComponent.cpp Nanogamer7 2024-01-27 18:19:58 +01:00
• 7fbcda681c
  Fixes inconsistent indentations on KeyboardController.h Nanogamer7 2024-01-27 18:19:07 +01:00
• 8bb1110e0b Merge remote-tracking branch 'origin/bounding-box' into Collision ineslelin 2024-01-27 18:18:47 +01:00
• 35a527101b left/right sliding collision possible now ineslelin 2024-01-27 17:29:14 +01:00
• 59fc17ec25 refined hitboxes so they are not bigger than the sprite Nimac0 2024-01-27 16:07:25 +01:00
• a51ffe4460 added correct spritesheet Nimac0 2024-01-27 00:03:17 +01:00
• 6e23d0d3d8 added bounding box Nimac0 2024-01-26 23:51:44 +01:00
• d9f3b5ceba player sprites look direction they shoot Benedikt Galbavy 2024-01-26 23:36:53 +01:00
• 96418442f0 implemented actual flipping of textures Benedikt Galbavy 2024-01-26 23:28:55 +01:00
• 251d7f6661 Merge branch 'optimised-libs' Benedikt Galbavy 2024-01-26 22:09:10 +01:00
• cd4c6d7339 Merge remote-tracking branch 'origin/Animations' Benedikt Galbavy 2024-01-26 21:49:32 +01:00
• 94e2107af6 removed zlib and libpng Benedikt Galbavy 2024-01-26 21:48:15 +01:00
• baf3a206b6 reformatted inconsistent code and optimized imports Benedikt Galbavy 2024-01-24 16:28:41 +01:00
• f36632c9fd Added diagrams for documentation Benedikt Galbavy 2024-01-24 15:04:38 +01:00
• 78f1b11d01 minor improvements with includes Benedikt Galbavy 2024-01-24 14:27:13 +01:00
• 9351307290 sprites walking directions done ineslelin 2024-01-24 14:22:25 +01:00
• 4ae462136e Improved console output Benedikt Galbavy 2024-01-24 09:54:20 +01:00
• d649a650a3 Updated textures Nimac0 2024-01-24 09:34:42 +01:00
• f09a89b9cd added right startscreen image ezveee 2024-01-24 09:30:58 +01:00
• 643e312983 startscreen implemented ezveee 2024-01-24 07:48:51 +01:00
• 317dc9d3bc Merge branch 'Animations' into 'main' Benedikt Galbavy 2024-01-24 02:07:36 +01:00
• 3766fefb13 fixed walk/idle animation Benedikt Galbavy 2024-01-24 01:50:33 +01:00
• 06042583f8 added error throwing for texture load Benedikt Galbavy 2024-01-23 22:33:08 +01:00
• 76f4ae79ed spritesheets and correct game.cpp ineslelin 2024-01-23 22:26:26 +01:00
• 552168dab3 animation wip ineslelin 2024-01-23 20:16:17 +01:00
• 7bc17eb8b9 Merge branch 'origin/Projectiles' into 'main' Benedikt Galbavy 2024-01-23 19:34:29 +01:00
• 5c730a6369 refactor done sara 2024-01-23 19:13:02 +01:00
• 5d4512133c refactor (working version) sara 2024-01-23 18:50:21 +01:00
• 02cbc58d0b added some comments for clarity Markus 2024-01-22 17:54:36 -06:00
• 7c87ccc42b added health, getting damage and visual representation of it Markus 2024-01-22 17:39:47 -06:00
• acbea34632 code documentation in form of comments added Markus 2024-01-21 22:13:21 -06:00
• 98f8cbc221 worst tutorial, but projectiles added Markus 2024-01-21 13:28:58 -06:00
• 091ffb4a33 fixed relative file path in CMake Nimac0 2024-01-11 19:16:44 +01:00
• 587b40ce43 added comments Nimac0 2024-01-11 18:38:08 +01:00