]>
gitweb.forssennils.se Git - TDDC76_proj.git/log
Nils Forssén [Tue, 28 Nov 2023 12:44:31 +0000 (13:44 +0100)]
Merge branch 'cykel'
Nils Forssén [Tue, 28 Nov 2023 12:43:07 +0000 (13:43 +0100)]
Merge branch 'menu'
Nils Forssén [Tue, 28 Nov 2023 12:42:39 +0000 (13:42 +0100)]
fixed merge
Alma Dejus [Tue, 28 Nov 2023 12:42:11 +0000 (13:42 +0100)]
small changes - Alma och Malin
malak585 [Tue, 28 Nov 2023 12:32:31 +0000 (13:32 +0100)]
merging
stian853 [Tue, 28 Nov 2023 12:20:25 +0000 (13:20 +0100)]
game_over picture
malak585 [Mon, 27 Nov 2023 13:44:46 +0000 (14:44 +0100)]
worked on scoreboard. - Alma och malin
Alma Dejus [Mon, 27 Nov 2023 12:19:33 +0000 (13:19 +0100)]
fixed warnings
stian853 [Mon, 27 Nov 2023 10:17:21 +0000 (11:17 +0100)]
added bike enemy
stian853 [Mon, 27 Nov 2023 09:21:37 +0000 (10:21 +0100)]
kollision yf och player, stina arvid
lukel495 [Mon, 27 Nov 2023 07:57:32 +0000 (08:57 +0100)]
added yf time to json Nils Lukas Arvid Stina
lukel495 [Mon, 27 Nov 2023 07:51:18 +0000 (08:51 +0100)]
Merge branch 'main' of gitlab.liu.se:TDDC76-2023-PRA1/Maria-1 into main
lukel495 [Mon, 27 Nov 2023 07:51:08 +0000 (08:51 +0100)]
merging yf and game_time
lukel495 [Mon, 27 Nov 2023 07:44:28 +0000 (08:44 +0100)]
added csv file, NILs LUKAS
stian853 [Mon, 27 Nov 2023 07:43:50 +0000 (08:43 +0100)]
fixed yf, stina arvid
stian853 [Mon, 27 Nov 2023 07:30:23 +0000 (08:30 +0100)]
bild
lukel495 [Thu, 23 Nov 2023 11:02:32 +0000 (12:02 +0100)]
Added json, fixed time, fixed scales and positions, Nils Lukas
lukel495 [Thu, 23 Nov 2023 10:48:00 +0000 (11:48 +0100)]
fixed random seed
Lukel495 [Wed, 22 Nov 2023 14:41:56 +0000 (15:41 +0100)]
gitignoring
Lukel495 [Wed, 22 Nov 2023 14:39:10 +0000 (15:39 +0100)]
Revert "gitignoreing"
This reverts commit
4da6eb8e4af74a4c4e9dea7493edd0d3c8e71aa4.
Lukel495 [Wed, 22 Nov 2023 14:38:38 +0000 (15:38 +0100)]
gitignoreing
Lukel495 [Wed, 22 Nov 2023 14:37:41 +0000 (15:37 +0100)]
changed gitignore
Lukel495 [Wed, 22 Nov 2023 14:33:53 +0000 (15:33 +0100)]
Revert "fixar grejer"
This reverts commit
b5a369da41012071a4346427ffd15366ea62f3ca.
Lukel495 [Wed, 22 Nov 2023 14:30:42 +0000 (15:30 +0100)]
fixar grejer
Nils Forssén [Wed, 22 Nov 2023 13:43:27 +0000 (14:43 +0100)]
pushing stuff
Nils Forssén [Tue, 21 Nov 2023 13:29:36 +0000 (14:29 +0100)]
Merged helper_collision
stian853 [Mon, 20 Nov 2023 09:19:24 +0000 (10:19 +0100)]
fix scale lingare
lukel495 [Mon, 20 Nov 2023 09:06:38 +0000 (10:06 +0100)]
collision between helper and player + added points to map Lukas and Nils
Arvid Sjöblom [Mon, 20 Nov 2023 08:54:54 +0000 (09:54 +0100)]
lagt till ett yf-tåg, arvid, stina
malak585 [Mon, 20 Nov 2023 08:45:44 +0000 (09:45 +0100)]
added GameOver and Scoreboard menu
stian853 [Mon, 20 Nov 2023 08:10:01 +0000 (09:10 +0100)]
la till fiende cyklist
malak585 [Mon, 20 Nov 2023 07:32:09 +0000 (08:32 +0100)]
Resolved merge conflict
malak585 [Mon, 20 Nov 2023 07:18:54 +0000 (08:18 +0100)]
trash
Lukel495 [Fri, 17 Nov 2023 21:31:22 +0000 (22:31 +0100)]
tog bort sus fil
lukel495 [Fri, 17 Nov 2023 11:22:31 +0000 (12:22 +0100)]
collison between helper and player
lukel495 [Wed, 15 Nov 2023 13:54:27 +0000 (14:54 +0100)]
fixed menu image
lukel495 [Wed, 15 Nov 2023 13:52:33 +0000 (14:52 +0100)]
Fixed merge conflicts, Nils, Lukas, Stina, Malin, Alma, Arvid
lukel495 [Wed, 15 Nov 2023 13:43:47 +0000 (14:43 +0100)]
Fixed merge error
lukel495 [Wed, 15 Nov 2023 13:39:51 +0000 (14:39 +0100)]
REsolved merge conflicts, Nils, Lukas, Arvid, Stina
lukel495 [Wed, 15 Nov 2023 13:36:13 +0000 (14:36 +0100)]
Merge branch 'enemy' into main
lukel495 [Wed, 15 Nov 2023 13:33:15 +0000 (14:33 +0100)]
fixat json till bottle Nils
Arvid Sjöblom [Wed, 15 Nov 2023 13:29:32 +0000 (14:29 +0100)]
added enemy, arvid, stina
Alma Dejus [Wed, 15 Nov 2023 13:17:43 +0000 (14:17 +0100)]
updated the paus menu - Alma och Malin
Alma Dejus [Wed, 15 Nov 2023 12:41:36 +0000 (13:41 +0100)]
changed font in start menu - Alma och Malin
Alma Dejus [Tue, 14 Nov 2023 14:24:51 +0000 (15:24 +0100)]
worked on start menu - Malin och Alma
lukel495 [Tue, 14 Nov 2023 14:15:57 +0000 (15:15 +0100)]
Git added json to player and helper, Nils, Lukas
Arvid Sjöblom [Tue, 14 Nov 2023 13:51:53 +0000 (14:51 +0100)]
added a sack to player, arvid, stina
stian853 [Tue, 14 Nov 2023 13:31:16 +0000 (14:31 +0100)]
la till finende bild
lukel495 [Tue, 14 Nov 2023 12:58:53 +0000 (13:58 +0100)]
fixed merge
stian853 [Tue, 14 Nov 2023 12:53:53 +0000 (13:53 +0100)]
fix picturers
lukel495 [Tue, 14 Nov 2023 12:51:20 +0000 (13:51 +0100)]
removed scale factor on players
lukel495 [Tue, 14 Nov 2023 12:46:56 +0000 (13:46 +0100)]
merged helper and bottle
Arvid Sjöblom [Tue, 14 Nov 2023 12:39:22 +0000 (13:39 +0100)]
fixat så bottle_texture bara laddas in en gång, arvid, lukas, nils, stina
stian853 [Mon, 13 Nov 2023 14:27:33 +0000 (15:27 +0100)]
pause picture
Arvid Sjöblom [Mon, 13 Nov 2023 13:43:30 +0000 (14:43 +0100)]
added collision between bottles and players, arvid, nils
stian853 [Mon, 13 Nov 2023 11:04:54 +0000 (12:04 +0100)]
new picture
Alma Dejus [Mon, 13 Nov 2023 10:35:53 +0000 (11:35 +0100)]
edited start menu, Alma + Malin
Alma Dejus [Mon, 13 Nov 2023 10:34:51 +0000 (11:34 +0100)]
added font, Alma + Malin
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:20:37 +0000 (11:20 +0100)]
add picture
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
Nils Forssén [Mon, 13 Nov 2023 10:06:27 +0000 (11:06 +0100)]
update för helper
Nils Forssén [Mon, 13 Nov 2023 07:43:03 +0000 (08:43 +0100)]
Added new branch helper
Arvid Sjöblom [Mon, 13 Nov 2023 07:42:35 +0000 (08:42 +0100)]
private
malak585 [Mon, 13 Nov 2023 07:38:46 +0000 (08:38 +0100)]
test
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
projects / TDDC76_proj.git / log