 JOSSERAND GIOVANNI p2405212
|
1a53e15095
|
Merge branch 'fix/valideBtn' into 'dev'
fix of validate crash and validate dialogues and personnages
See merge request p2406187/sae201!28
|
2025-06-21 10:45:59 +00:00 |
|
|
JOSSERAND GIOVANNI p2405212
|
55dcacaa96
|
Merge branch 'feature/styleTool' into 'dev'
Feature/style tool
See merge request p2406187/sae201!27
|
2025-06-20 21:57:40 +00:00 |
|
|
JOSSERAND GIOVANNI p2405212
|
e85e3f9c07
|
Merge branch 'dev' into 'feature/styleTool'
# Conflicts:
# mainwindow.cpp
# mainwindow.h
# mainwindow.ui
|
2025-06-20 21:57:30 +00:00 |
|
|
JOSSERAND GIOVANNI p2405212
|
2ad71467d8
|
Merge branch 'feature/menuBar' into 'dev'
Feature/menu bar
See merge request p2406187/sae201!25
|
2025-06-20 19:57:56 +00:00 |
|
|
JOSSERAND GIOVANNI p2405212
|
2b07de57d0
|
Merge branch 'feature/saveAs' into 'main'
add of saveAsFile function
See merge request p2406187/sae201!22
|
2025-06-20 15:00:13 +00:00 |
|
|
JOSSERAND GIOVANNI p2405212
|
a2c4577025
|
Merge branch 'fix/valider' into 'main'
fix of valider button
See merge request p2406187/sae201!19
|
2025-06-20 14:48:42 +00:00 |
|
|
JOSSERAND GIOVANNI p2405212
|
7bfa00db0a
|
Merge branch 'fix/save' into 'main'
of save and load a path without image
See merge request p2406187/sae201!15
|
2025-06-20 13:38:55 +00:00 |
|
|
JOSSERAND GIOVANNI p2405212
|
3616867793
|
Merge branch 'feature/save' into 'main'
Feature/save
See merge request p2406187/sae201!14
|
2025-06-20 12:24:29 +00:00 |
|
|
JOSSERAND GIOVANNI p2405212
|
374438a5bb
|
Merge branch 'main' into 'feature/save'
# Conflicts:
# mainwindow.cpp
# mainwindow.h
# mainwindow.ui
# step.h
|
2025-06-20 12:20:12 +00:00 |
|
|
JOSSERAND GIOVANNI p2405212
|
8fd2dc0df7
|
Merge branch 'feature/Path' into 'main'
add of data directory and first path
See merge request p2406187/sae201!5
|
2025-06-19 07:39:23 +00:00 |
|
|
JOSSERAND GIOVANNI p2405212
|
0be1ffc72d
|
Merge branch 'feature/Path' into 'main'
Feature/path
See merge request p2406187/sae201!3
|
2025-06-19 07:30:09 +00:00 |
|