]>
gitweb.forssennils.se Git - TDDC76_proj.git/log
summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Arvid Sjöblom [Mon, 13 Nov 2023 10:26:40 +0000 (11:26 +0100)]
Merge branch 'bottle' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into bottle
Arvid Sjöblom [Mon, 13 Nov 2023 10:26:18 +0000 (11:26 +0100)]
Added removal of bottles, arvid, stina
stian853 [Mon, 13 Nov 2023 10:18:26 +0000 (11:18 +0100)]
Merge branch 'bottle' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into bottle
stian853 [Mon, 13 Nov 2023 10:18:05 +0000 (11:18 +0100)]
tillägg av bild
Nils Forssén [Mon, 13 Nov 2023 10:16:28 +0000 (11:16 +0100)]
Fixed time_delta
Arvid Sjöblom [Mon, 13 Nov 2023 10:06:28 +0000 (11:06 +0100)]
börjat på placering av flaskor arvid, stina
Arvid Sjöblom [Mon, 13 Nov 2023 07:42:35 +0000 (08:42 +0100)]
private
stian853 [Mon, 13 Nov 2023 07:30:55 +0000 (08:30 +0100)]
Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into main
stian853 [Mon, 13 Nov 2023 07:30:23 +0000 (08:30 +0100)]
la till lite kommentarer
Nils Forssén [Mon, 13 Nov 2023 07:22:18 +0000 (08:22 +0100)]
restructuring
Nils Forssén [Sat, 11 Nov 2023 18:35:10 +0000 (19:35 +0100)]
Changed to smart pointers
Nils Forssén [Sat, 11 Nov 2023 17:57:40 +0000 (18:57 +0100)]
Restructuring
Nils Forssén [Sat, 11 Nov 2023 16:53:31 +0000 (17:53 +0100)]
Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1
Nils Forssén [Sat, 11 Nov 2023 16:52:32 +0000 (17:52 +0100)]
Added menus and context, Lukas, Nils, Arvid, Malin, Stina, Alma
Nils Forssén [Sat, 11 Nov 2023 16:51:09 +0000 (17:51 +0100)]
changed names
lukel495 [Sat, 11 Nov 2023 14:39:44 +0000 (15:39 +0100)]
test.cc fungerar
lukel495 [Sat, 11 Nov 2023 14:35:28 +0000 (15:35 +0100)]
Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into main
lukel495 [Sat, 11 Nov 2023 14:34:50 +0000 (15:34 +0100)]
fixade en konflikt i testfilen
Nils Forssén [Fri, 10 Nov 2023 00:29:25 +0000 (01:29 +0100)]
removed unessecary files
Nils Forssén [Fri, 10 Nov 2023 00:29:03 +0000 (01:29 +0100)]
Added constant FPS, background and working player
Nils Forssén [Fri, 10 Nov 2023 00:28:22 +0000 (01:28 +0100)]
Added background map
Nils Forssén [Fri, 10 Nov 2023 00:28:05 +0000 (01:28 +0100)]
Added movement to player
Nils Forssén [Fri, 10 Nov 2023 00:25:16 +0000 (01:25 +0100)]
renaming
Nils Forssén [Thu, 9 Nov 2023 16:03:41 +0000 (17:03 +0100)]
small changes
Nils Forssén [Thu, 9 Nov 2023 15:59:28 +0000 (16:59 +0100)]
Update makefile
Nils Forssén [Thu, 9 Nov 2023 15:32:36 +0000 (16:32 +0100)]
moving player
Arvid Sjöblom [Thu, 9 Nov 2023 15:20:28 +0000 (16:20 +0100)]
Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into main
Arvid Sjöblom [Thu, 9 Nov 2023 15:20:24 +0000 (16:20 +0100)]
forgot to include State.h
stian853 [Thu, 9 Nov 2023 15:19:54 +0000 (16:19 +0100)]
added Game_state.h
Arvid Sjöblom [Thu, 9 Nov 2023 15:14:41 +0000 (16:14 +0100)]
removed paus_meny files
Arvid Sjöblom [Thu, 9 Nov 2023 15:14:08 +0000 (16:14 +0100)]
code for menus
Alma Dejus [Thu, 9 Nov 2023 15:06:27 +0000 (16:06 +0100)]
small changes - Alma + Stina
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
Arvid Sjöblom [Thu, 9 Nov 2023 15:02:12 +0000 (16:02 +0100)]
code skeleton for State.h
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
Alma Dejus [Thu, 9 Nov 2023 15:00:41 +0000 (16:00 +0100)]
Added Helper.h /stina + Alma
lukel495 [Thu, 9 Nov 2023 14:59:52 +0000 (15:59 +0100)]
skelett för Voi_enemy och liten ändring i static_obeject.h
Nils Forssén [Thu, 9 Nov 2023 14:51:54 +0000 (15:51 +0100)]
Added player
lukel495 [Thu, 9 Nov 2023 14:51:29 +0000 (15:51 +0100)]
tog bort en grej
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
Alma Dejus [Thu, 9 Nov 2023 14:48:18 +0000 (15:48 +0100)]
added Main_enemy
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
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
lukel495 [Thu, 9 Nov 2023 14:43:59 +0000 (15:43 +0100)]
la till skelett för Statc_object klassen
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
arvsj277 [Thu, 9 Nov 2023 14:42:14 +0000 (15:42 +0100)]
added header files for Bike_enemy and Autonomous_object
malak585 [Thu, 9 Nov 2023 14:39:59 +0000 (15:39 +0100)]
Added bottle class
Nils Forssén [Thu, 9 Nov 2023 14:26:37 +0000 (15:26 +0100)]
name error
Nils Forssén [Thu, 9 Nov 2023 14:22:29 +0000 (15:22 +0100)]
Fixed scale issue
Nils Forssén [Thu, 9 Nov 2023 14:22:08 +0000 (15:22 +0100)]
Added object base class
Nils Forssén [Thu, 9 Nov 2023 14:12:29 +0000 (15:12 +0100)]
Finally fixed scale constants
Nils Forssén [Thu, 9 Nov 2023 13:44:22 +0000 (14:44 +0100)]
Chagned scale
Nils Forssén [Thu, 9 Nov 2023 13:39:56 +0000 (14:39 +0100)]
changed scale
Nils Forssén [Thu, 9 Nov 2023 13:11:34 +0000 (14:11 +0100)]
added background
Nils Forssén [Thu, 9 Nov 2023 13:07:08 +0000 (14:07 +0100)]
Working window
Nils Forssén [Thu, 9 Nov 2023 13:02:54 +0000 (14:02 +0100)]
Changed name of gamestate
Nils Forssén [Thu, 9 Nov 2023 13:00:48 +0000 (14:00 +0100)]
removed resources folder
Nils Forssén [Thu, 9 Nov 2023 13:00:02 +0000 (14:00 +0100)]
Added UML code skeleton
Nils Forssén [Thu, 9 Nov 2023 12:50:04 +0000 (13:50 +0100)]
removed file
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
lukel495 [Thu, 9 Nov 2023 12:42:29 +0000 (13:42 +0100)]
removed strange file
stian853 [Thu, 9 Nov 2023 12:41:23 +0000 (13:41 +0100)]
fix conflikt
stian853 [Thu, 9 Nov 2023 12:39:08 +0000 (13:39 +0100)]
la till mallan
Lukel495 [Thu, 9 Nov 2023 12:35:47 +0000 (13:35 +0100)]
Bilderna till spelet
Nils Forssén [Thu, 9 Nov 2023 12:32:48 +0000 (13:32 +0100)]
Added resources for code skeleton
Nils Forssén [Thu, 9 Nov 2023 12:25:23 +0000 (13:25 +0100)]
Added asset folder
Nils Forssén [Thu, 9 Nov 2023 12:22:15 +0000 (13:22 +0100)]
removed build folder
Nils Forssén [Thu, 9 Nov 2023 12:18:47 +0000 (13:18 +0100)]
Changed to cc files
Nils Forssén [Thu, 9 Nov 2023 12:18:19 +0000 (13:18 +0100)]
Added gitignore locally
lukel495 [Wed, 8 Nov 2023 14:15:18 +0000 (15:15 +0100)]
Added code exampel from lecture
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
lukel495 [Wed, 8 Nov 2023 13:52:42 +0000 (14:52 +0100)]
la till testexempel
Nils Forssén [Wed, 8 Nov 2023 13:50:55 +0000 (14:50 +0100)]
Added code framework from lecture
lukel495 [Wed, 8 Nov 2023 13:46:30 +0000 (14:46 +0100)]
La till testexempelet till main och tillhörande filer
Nils Forssén [Mon, 6 Nov 2023 12:02:02 +0000 (12:02 +0000)]
Update .gitignore
Nils Forssén [Mon, 6 Nov 2023 12:01:18 +0000 (12:01 +0000)]
Add new file
stian853 [Mon, 6 Nov 2023 11:54:04 +0000 (12:54 +0100)]
test ändring 2
stian853 [Mon, 6 Nov 2023 11:46:59 +0000 (12:46 +0100)]
test ändring
Nils Forssén [Thu, 2 Nov 2023 09:14:06 +0000 (10:14 +0100)]
Initial commit, Makefile created and basic project structure
projects / TDDC76_proj.git / log