 Mohamed Fatih
|
3a97dbc5ba
|
Merge branch 'main' of gitlab.emi.u-bordeaux.fr:pt2/teams-s4/tm07/lightup-07c
|
2022-03-24 17:14:28 +01:00 |
|
|
Mohamed Fatih
|
89d623fb0b
|
opti clean
|
2022-03-24 17:14:24 +01:00 |
|
|
Théophyl Hoguet
|
5906954378
|
new save
|
2022-03-24 16:41:33 +01:00 |
|
|
Théophyl Hoguet
|
2cf3e1d62c
|
little tweaks
|
2022-03-24 16:30:35 +01:00 |
|
|
Théophyl Hoguet
|
6512425435
|
Merge branch 'main' of gitlab.emi.u-bordeaux.fr:pt2/teams-s4/tm07/lightup-07c
|
2022-03-24 16:17:22 +01:00 |
|
|
Théophyl Hoguet
|
95f27e64ea
|
render victory a bit more beautiful
|
2022-03-24 16:17:08 +01:00 |
|
|
Théophyl Hoguet
|
4caee1a300
|
lightup window name
|
2022-03-24 16:14:54 +01:00 |
|
|
valentin carmona
|
c8a66b9b28
|
Merge branch 'main' of gitlab.emi.u-bordeaux.fr:pt2/teams-s4/tm07/lightup-07c
|
2022-03-24 16:00:31 +01:00 |
|
|
valentin carmona
|
1a9b930c7b
|
recktification des undo et redo
|
2022-03-24 16:00:29 +01:00 |
|
|
Théophyl Hoguet
|
aa7af6ee13
|
le ! connard
|
2022-03-24 15:44:56 +01:00 |
|
|
valentin carmona
|
442b9da1bb
|
tjr ce clang qui m'emmerde
|
2022-03-24 14:55:10 +01:00 |
|
|
valentin carmona
|
7d1461d268
|
ajout de l'impossibilité dees undo redo
|
2022-03-24 14:53:45 +01:00 |
|
|
valentin carmona
|
5fa045735d
|
suppression de can undo/redo et optimisation de la création des textures
|
2022-03-24 14:23:25 +01:00 |
|
|
Théophyl Hoguet
|
3f0e63e1d6
|
interoperabilité
|
2022-03-24 12:44:30 +01:00 |
|
|
valentin carmona
|
1f3538b88f
|
Merge branch 'main' of gitlab.emi.u-bordeaux.fr:pt2/teams-s4/tm07/lightup-07c
|
2022-03-24 12:09:38 +01:00 |
|
|
valentin carmona
|
2a9d355b27
|
ajout dans game_ext de can_undo et can_redo et correction de model
|
2022-03-24 12:09:35 +01:00 |
|
|
Théophyl Hoguet
|
2c85c918dc
|
oops
|
2022-03-24 11:58:01 +01:00 |
|
|
Theophyl Hoguet
|
64044f2868
|
Merge branch 'wip-remove-duplication-of-code' into 'main'
remove duplication of code
See merge request pt2/teams-s4/tm07/lightup-07c!6
|
2022-03-24 11:50:33 +01:00 |
|
|
Théophyl Hoguet
|
04a2c187d2
|
finished main without render_blended_text
|
2022-03-24 11:48:42 +01:00 |
|
|
valentin carmona
|
a04251a007
|
block button undo / redo when not possible
|
2022-03-24 11:27:59 +01:00 |
|
|
valentin carmona
|
6f4148bacb
|
add shortcuts and optimize process (en plus j'ai pas oublié le clang)
|
2022-03-24 11:07:31 +01:00 |
|
|
Théophyl Hoguet
|
77cfe41170
|
WIP err seg L~222
|
2022-03-23 21:50:24 +01:00 |
|
|
Théophyl Hoguet
|
29ddb79444
|
update download.sh
|
2022-03-23 21:49:38 +01:00 |
|
|
Théophyl Hoguet
|
b04c245f0c
|
remove full update text + render button in white
|
2022-03-23 19:05:01 +01:00 |
|
|
Théophyl Hoguet
|
d5bd75613e
|
victory show :D
|
2022-03-23 18:36:10 +01:00 |
|
|
Théophyl Hoguet
|
0793f1f671
|
WIP win ca marche mais pas trop
|
2022-03-23 13:47:06 +01:00 |
|
|
Theophyl Hoguet
|
26e4c456ae
|
Merge branch 'sound_effects_game_sdl' into 'main'
add music on each moves lighbulb / mark and when an error occurs
See merge request pt2/teams-s4/tm07/lightup-07c!5
|
2022-03-23 13:35:50 +01:00 |
|
|
Théophyl Hoguet
|
4da52cd3aa
|
resolve pb
|
2022-03-23 13:34:49 +01:00 |
|
|
Theophyl Hoguet
|
b1bcce78f8
|
Merge branch 'main' into 'sound_effects_game_sdl'
# Conflicts:
# model.c
|
2022-03-23 12:32:58 +00:00 |
|
|
Théophyl Hoguet
|
7b1f713e9c
|
add win sound
|
2022-03-23 13:30:10 +01:00 |
|
|
valentin carmona
|
068a209451
|
clang d'enculé
|
2022-03-22 22:13:41 +01:00 |
|
|
valentin carmona
|
e3ad24e630
|
maintien du ration plus création des boutons plus de textures pour ceux_ci
|
2022-03-22 22:09:52 +01:00 |
|
|
valentin carmona
|
cfc2758f6d
|
clang de con
|
2022-03-22 17:16:34 +01:00 |
|
|
valentin carmona
|
73cddbd6b7
|
Merge branch 'main' of gitlab.emi.u-bordeaux.fr:pt2/teams-s4/tm07/lightup-07c
|
2022-03-22 17:13:40 +01:00 |
|
|
valentin carmona
|
a198939e30
|
implémentation du process android
|
2022-03-22 17:13:38 +01:00 |
|
|
Théophyl Hoguet
|
64a9f9993e
|
comments
|
2022-03-22 16:00:56 +01:00 |
|
|
Théophyl Hoguet
|
b09951b596
|
patch compilation android
|
2022-03-21 22:01:41 +01:00 |
|
|
Theophyl Hoguet
|
05bd0e2a97
|
Merge branch 'main' into 'sound_effects_game_sdl'
# Conflicts:
# .vscode/settings.json
# model.c
|
2022-03-21 20:47:47 +00:00 |
|
|
Théophyl Hoguet
|
e76712f49d
|
remove SDL2 from include
|
2022-03-21 20:54:34 +01:00 |
|
|
Theophyl Hoguet
|
876e686535
|
Merge branch 'Android_version' into 'main'
Android version
See merge request pt2/teams-s4/tm07/lightup-07c!4
|
2022-03-21 18:56:17 +01:00 |
|
|
Nessar
|
76e4d87d70
|
add music on each moves lighbulb / mark and when an error occurs
|
2022-03-21 05:56:34 +01:00 |
|
|
Théophyl Hoguet
|
985f41f720
|
fullscreen with f11 WIP
|
2022-03-20 22:35:45 +01:00 |
|
|
Théophyl Hoguet
|
5de3b23945
|
remove warns
|
2022-03-20 18:53:41 +01:00 |
|
|
Théophyl Hoguet
|
b265f4b7d2
|
portage fini :D
|
2022-03-20 06:22:29 +01:00 |
|
|
Théophyl Hoguet
|
4f75d464e8
|
ca compile c'est incredible
|
2022-03-20 05:32:15 +01:00 |
|
|
Théophyl Hoguet
|
a553a86f1a
|
initial commit for android
|
2022-03-20 05:18:51 +01:00 |
|
|
Théophyl Hoguet
|
459b66b955
|
rename img -> assets + remove dupli from cmake.txt
|
2022-03-20 03:16:17 +01:00 |
|
|
Théophyl Hoguet
|
aaca2d2ae7
|
fix a bit of memory leak
|
2022-03-18 19:13:27 +01:00 |
|
|
Théophyl Hoguet
|
f763238a4e
|
forget remove game_print used for debug + remove dupli code
|
2022-03-18 18:45:00 +01:00 |
|
|
Théophyl Hoguet
|
44600bb3a3
|
finished basic interface :D close #15 #18 #19 #20 #21
|
2022-03-18 18:37:21 +01:00 |
|