TDDC76_proj.git
14 months agosmall changes - Alma + Stina
Alma Dejus [Thu, 9 Nov 2023 15:06:27 +0000 (16:06 +0100)]
small changes - Alma + Stina

14 months agoMerge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into main
Arvid Sjöblom [Thu, 9 Nov 2023 15:02:24 +0000 (16:02 +0100)]
Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into main

14 months agocode skeleton for State.h
Arvid Sjöblom [Thu, 9 Nov 2023 15:02:12 +0000 (16:02 +0100)]
code skeleton for State.h

14 months agoMerge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into main
Alma Dejus [Thu, 9 Nov 2023 15:00:56 +0000 (16:00 +0100)]
Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into main

14 months agoAdded Helper.h /stina + Alma
Alma Dejus [Thu, 9 Nov 2023 15:00:41 +0000 (16:00 +0100)]
Added Helper.h /stina + Alma

14 months agoskelett för Voi_enemy och liten ändring i static_obeject.h
lukel495 [Thu, 9 Nov 2023 14:59:52 +0000 (15:59 +0100)]
skelett för Voi_enemy och liten ändring i static_obeject.h

14 months agoAdded player
Nils Forssén [Thu, 9 Nov 2023 14:51:54 +0000 (15:51 +0100)]
Added player

14 months agotog bort en grej
lukel495 [Thu, 9 Nov 2023 14:51:29 +0000 (15:51 +0100)]
tog bort en grej

14 months agoMerge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into main
Alma Dejus [Thu, 9 Nov 2023 14:48:54 +0000 (15:48 +0100)]
Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into main

14 months agoadded Main_enemy
Alma Dejus [Thu, 9 Nov 2023 14:48:18 +0000 (15:48 +0100)]
added Main_enemy

14 months agoMerge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into main
lukel495 [Thu, 9 Nov 2023 14:44:49 +0000 (15:44 +0100)]
Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into main

14 months agoMerge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into main
lukel495 [Thu, 9 Nov 2023 14:44:25 +0000 (15:44 +0100)]
Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into main

14 months agola till skelett för Statc_object klassen
lukel495 [Thu, 9 Nov 2023 14:43:59 +0000 (15:43 +0100)]
la till skelett för Statc_object klassen

14 months agoMerge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into main
arvsj277 [Thu, 9 Nov 2023 14:43:13 +0000 (15:43 +0100)]
Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into main

14 months agoadded header files for Bike_enemy and Autonomous_object
arvsj277 [Thu, 9 Nov 2023 14:42:14 +0000 (15:42 +0100)]
added header files for Bike_enemy and Autonomous_object

14 months agoAdded bottle class
malak585 [Thu, 9 Nov 2023 14:39:59 +0000 (15:39 +0100)]
Added bottle class

14 months agoname error
Nils Forssén [Thu, 9 Nov 2023 14:26:37 +0000 (15:26 +0100)]
name error

14 months agoFixed scale issue
Nils Forssén [Thu, 9 Nov 2023 14:22:29 +0000 (15:22 +0100)]
Fixed scale issue

14 months agoAdded object base class
Nils Forssén [Thu, 9 Nov 2023 14:22:08 +0000 (15:22 +0100)]
Added object base class

14 months agoFinally fixed scale constants
Nils Forssén [Thu, 9 Nov 2023 14:12:29 +0000 (15:12 +0100)]
Finally fixed scale constants

14 months agoChagned scale
Nils Forssén [Thu, 9 Nov 2023 13:44:22 +0000 (14:44 +0100)]
Chagned scale

14 months agochanged scale
Nils Forssén [Thu, 9 Nov 2023 13:39:56 +0000 (14:39 +0100)]
changed scale

14 months agoadded background
Nils Forssén [Thu, 9 Nov 2023 13:11:34 +0000 (14:11 +0100)]
added background

14 months agoWorking window
Nils Forssén [Thu, 9 Nov 2023 13:07:08 +0000 (14:07 +0100)]
Working window

14 months agoChanged name of gamestate
Nils Forssén [Thu, 9 Nov 2023 13:02:54 +0000 (14:02 +0100)]
Changed name of gamestate

14 months agoremoved resources folder
Nils Forssén [Thu, 9 Nov 2023 13:00:48 +0000 (14:00 +0100)]
removed resources folder

14 months agoAdded UML code skeleton
Nils Forssén [Thu, 9 Nov 2023 13:00:02 +0000 (14:00 +0100)]
Added UML code skeleton

14 months agoremoved file
Nils Forssén [Thu, 9 Nov 2023 12:50:04 +0000 (13:50 +0100)]
removed file

14 months agoMerge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into main
lukel495 [Thu, 9 Nov 2023 12:42:43 +0000 (13:42 +0100)]
Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into main

14 months agoremoved strange file
lukel495 [Thu, 9 Nov 2023 12:42:29 +0000 (13:42 +0100)]
removed strange file

14 months agofix conflikt
stian853 [Thu, 9 Nov 2023 12:41:23 +0000 (13:41 +0100)]
fix conflikt

14 months agola till mallan
stian853 [Thu, 9 Nov 2023 12:39:08 +0000 (13:39 +0100)]
la till mallan

14 months agoBilderna till spelet
Lukel495 [Thu, 9 Nov 2023 12:35:47 +0000 (13:35 +0100)]
Bilderna till spelet

14 months agoAdded resources for code skeleton
Nils Forssén [Thu, 9 Nov 2023 12:32:48 +0000 (13:32 +0100)]
Added resources for code skeleton

14 months agoAdded asset folder
Nils Forssén [Thu, 9 Nov 2023 12:25:23 +0000 (13:25 +0100)]
Added asset folder

14 months agoremoved build folder
Nils Forssén [Thu, 9 Nov 2023 12:22:15 +0000 (13:22 +0100)]
removed build folder

14 months agoChanged to cc files
Nils Forssén [Thu, 9 Nov 2023 12:18:47 +0000 (13:18 +0100)]
Changed to cc files

14 months agoAdded gitignore locally
Nils Forssén [Thu, 9 Nov 2023 12:18:19 +0000 (13:18 +0100)]
Added gitignore locally

14 months agoAdded code exampel from lecture
lukel495 [Wed, 8 Nov 2023 14:15:18 +0000 (15:15 +0100)]
Added code exampel from lecture

14 months agoMerge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into main
lukel495 [Wed, 8 Nov 2023 13:52:52 +0000 (14:52 +0100)]
Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into main

14 months agola till testexempel
lukel495 [Wed, 8 Nov 2023 13:52:42 +0000 (14:52 +0100)]
la till testexempel

14 months agoAdded code framework from lecture
Nils Forssén [Wed, 8 Nov 2023 13:50:55 +0000 (14:50 +0100)]
Added code framework from lecture

14 months agoLa till testexempelet till main och tillhörande filer
lukel495 [Wed, 8 Nov 2023 13:46:30 +0000 (14:46 +0100)]
La till testexempelet till main och tillhörande filer

14 months agoUpdate .gitignore
Nils Forssén [Mon, 6 Nov 2023 12:02:02 +0000 (12:02 +0000)]
Update .gitignore

14 months agoAdd new file
Nils Forssén [Mon, 6 Nov 2023 12:01:18 +0000 (12:01 +0000)]
Add new file

14 months agotest ändring 2
stian853 [Mon, 6 Nov 2023 11:54:04 +0000 (12:54 +0100)]
test ändring 2

14 months agotest ändring
stian853 [Mon, 6 Nov 2023 11:46:59 +0000 (12:46 +0100)]
test ändring

14 months agoInitial commit, Makefile created and basic project structure
Nils Forssén [Thu, 2 Nov 2023 09:14:06 +0000 (10:14 +0100)]
Initial commit, Makefile created and basic project structure