| 2023-11-15 | lukel495 | fixed menu image | commit | commitdiff | tree | snapshot | 
| 2023-11-15 | lukel495 | Fixed merge conflicts, Nils, Lukas, Stina, Malin, Alma... | commit | commitdiff | tree | snapshot | 
| 2023-11-15 | lukel495 | Fixed merge error | commit | commitdiff | tree | snapshot | 
| 2023-11-15 | lukel495 | REsolved merge conflicts, Nils, Lukas, Arvid, Stina | commit | commitdiff | tree | snapshot | 
| 2023-11-15 | lukel495 | Merge branch 'enemy' into main | commit | commitdiff | tree | snapshot | 
| 2023-11-15 | lukel495 | fixat json till bottle Nils | commit | commitdiff | tree | snapshot | 
| 2023-11-15 | Arvid Sjöblom | added enemy, arvid, stina | commit | commitdiff | tree | snapshot | 
| 2023-11-15 | Alma Dejus | updated the paus menu - Alma och Malin | commit | commitdiff | tree | snapshot | 
| 2023-11-15 | Alma Dejus | changed font in start menu - Alma och Malin | commit | commitdiff | tree | snapshot | 
| 2023-11-14 | Alma Dejus | worked on start menu - Malin och Alma | commit | commitdiff | tree | snapshot | 
| 2023-11-14 | lukel495 | Git added json to player and helper, Nils, Lukas | commit | commitdiff | tree | snapshot | 
| 2023-11-14 | Arvid Sjöblom | added a sack to player, arvid, stina | commit | commitdiff | tree | snapshot | 
| 2023-11-14 | stian853 | la till finende bild | commit | commitdiff | tree | snapshot | 
| 2023-11-14 | lukel495 | fixed merge | commit | commitdiff | tree | snapshot | 
| 2023-11-14 | stian853 | fix picturers | commit | commitdiff | tree | snapshot | 
| 2023-11-14 | lukel495 | removed scale factor on players | commit | commitdiff | tree | snapshot | 
| 2023-11-14 | lukel495 | merged helper and bottle | commit | commitdiff | tree | snapshot | 
| 2023-11-14 | Arvid Sjöblom | fixat så bottle_texture bara laddas in en gång, arvid... | commit | commitdiff | tree | snapshot | 
| 2023-11-13 | stian853 | pause picture | commit | commitdiff | tree | snapshot | 
| 2023-11-13 | Arvid Sjöblom | added collision between bottles and players, arvid... | commit | commitdiff | tree | snapshot | 
| 2023-11-13 | stian853 | new picture | commit | commitdiff | tree | snapshot | 
| 2023-11-13 | Alma Dejus | edited start menu, Alma + Malin | commit | commitdiff | tree | snapshot | 
| 2023-11-13 | Alma Dejus | added font, Alma + Malin | commit | commitdiff | tree | snapshot | 
| 2023-11-13 | Arvid Sjöblom | Merge branch 'bottle' of gitlab.liu.se:TDDC76-2023... | commit | commitdiff | tree | snapshot | 
| 2023-11-13 | Arvid Sjöblom | Added removal of bottles, arvid, stina | commit | commitdiff | tree | snapshot | 
| 2023-11-13 | stian853 | add picture | commit | commitdiff | tree | snapshot | 
| 2023-11-13 | stian853 | Merge branch 'bottle' of gitlab.liu.se:TDDC76-2023... | commit | commitdiff | tree | snapshot | 
| 2023-11-13 | stian853 | tillägg av bild | commit | commitdiff | tree | snapshot | 
| 2023-11-13 | Nils Forssén | Fixed time_delta | commit | commitdiff | tree | snapshot | 
| 2023-11-13 | Arvid Sjöblom | börjat på placering av flaskor arvid, stina | commit | commitdiff | tree | snapshot | 
| 2023-11-13 | Nils Forssén | update för helper | commit | commitdiff | tree | snapshot | 
| 2023-11-13 | Nils Forssén | Added new branch helper | commit | commitdiff | tree | snapshot | 
| 2023-11-13 | Arvid Sjöblom | private | commit | commitdiff | tree | snapshot | 
| 2023-11-13 | malak585 | test | commit | commitdiff | tree | snapshot | 
| 2023-11-13 | stian853 | Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1... | commit | commitdiff | tree | snapshot | 
| 2023-11-13 | stian853 | la till lite kommentarer | commit | commitdiff | tree | snapshot | 
| 2023-11-13 | Nils Forssén | restructuring | commit | commitdiff | tree | snapshot | 
| 2023-11-11 | Nils Forssén | Changed to smart pointers | commit | commitdiff | tree | snapshot | 
| 2023-11-11 | Nils Forssén | Restructuring | commit | commitdiff | tree | snapshot | 
| 2023-11-11 | Nils Forssén | Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1... | commit | commitdiff | tree | snapshot | 
| 2023-11-11 | Nils Forssén | Added menus and context, Lukas, Nils, Arvid, Malin... | commit | commitdiff | tree | snapshot | 
| 2023-11-11 | Nils Forssén | changed names | commit | commitdiff | tree | snapshot | 
| 2023-11-11 | lukel495 | test.cc fungerar | commit | commitdiff | tree | snapshot | 
| 2023-11-11 | lukel495 | Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1... | commit | commitdiff | tree | snapshot | 
| 2023-11-11 | lukel495 | fixade en konflikt i testfilen | commit | commitdiff | tree | snapshot | 
| 2023-11-10 | Nils Forssén | removed unessecary files | commit | commitdiff | tree | snapshot | 
| 2023-11-10 | Nils Forssén | Added constant FPS, background and working player | commit | commitdiff | tree | snapshot | 
| 2023-11-10 | Nils Forssén | Added background map | commit | commitdiff | tree | snapshot | 
| 2023-11-10 | Nils Forssén | Added movement to player | commit | commitdiff | tree | snapshot | 
| 2023-11-10 | Nils Forssén | renaming | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Nils Forssén | small changes | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Nils Forssén | Update makefile | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Nils Forssén | moving player | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Arvid Sjöblom | Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1... | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Arvid Sjöblom | forgot to include State.h | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | stian853 | added Game_state.h | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Arvid Sjöblom | removed paus_meny files | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Arvid Sjöblom | code for menus | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Alma Dejus | small changes - Alma + Stina | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Arvid Sjöblom | Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1... | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Arvid Sjöblom | code skeleton for State.h | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Alma Dejus | Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1... | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Alma Dejus | Added Helper.h /stina + Alma | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | lukel495 | skelett för Voi_enemy och liten ändring i static_obeject.h | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Nils Forssén | Added player | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | lukel495 | tog bort en grej | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Alma Dejus | Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1... | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Alma Dejus | added Main_enemy | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | lukel495 | Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1... | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | lukel495 | Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1... | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | lukel495 | la till skelett för Statc_object klassen | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | arvsj277 | Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1... | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | arvsj277 | added header files for Bike_enemy and Autonomous_object | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | malak585 | Added bottle class | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Nils Forssén | name error | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Nils Forssén | Fixed scale issue | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Nils Forssén | Added object base class | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Nils Forssén | Finally fixed scale constants | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Nils Forssén | Chagned scale | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Nils Forssén | changed scale | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Nils Forssén | added background | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Nils Forssén | Working window | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Nils Forssén | Changed name of gamestate | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Nils Forssén | removed resources folder | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Nils Forssén | Added UML code skeleton | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Nils Forssén | removed file | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | lukel495 | Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1... | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | lukel495 | removed strange file | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | stian853 | fix conflikt | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | stian853 | la till mallan | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Lukel495 | Bilderna till spelet | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Nils Forssén | Added resources for code skeleton | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Nils Forssén | Added asset folder | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Nils Forssén | removed build folder | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Nils Forssén | Changed to cc files | commit | commitdiff | tree | snapshot | 
| 2023-11-09 | Nils Forssén | Added gitignore locally | commit | commitdiff | tree | snapshot | 
| 2023-11-08 | lukel495 | Added code exampel from lecture | commit | commitdiff | tree | snapshot | 
| 2023-11-08 | lukel495 | Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1... | commit | commitdiff | tree | snapshot | 
| 2023-11-08 | lukel495 | la till testexempel | commit | commitdiff | tree | snapshot | 
| 2023-11-08 | Nils Forssén | Added code framework from lecture | commit | commitdiff | tree | snapshot | 
| next |