 T'JAMPENS QUENTIN p2406187
|
6d857c5cd5
|
Merge branch 'dev' into 'fix/localistation'
# Conflicts:
# mainwindow.cpp
|
2025-06-21 12:13:52 +00:00 |
|
|
JOSSERAND GIOVANNI p2405212
|
2bf6a9397e
|
Merge branch 'feature/resetplainTextEdit' into 'dev'
fix duplication of dialogues
See merge request p2406187/sae201!33
|
2025-06-21 12:13:07 +00:00 |
|
|
Pyramond
|
c8e264fe18
|
Save loc on validation and stop validation when stepNumber value is changed
|
2025-06-21 14:13:01 +02:00 |
|
|
Giovanni JOSSERAND
|
6b24485cf0
|
fix duplication of dialogues
|
2025-06-21 14:12:31 +02:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
83e7a92ee3
|
Merge branch 'feature/undoRedoPlainTextEdit' into 'dev'
Add undo/redo action for dialogEdit
See merge request p2406187/sae201!32
|
2025-06-21 11:45:15 +00:00 |
|
|
Pyramond
|
3fa9853a12
|
Add undo/redo action for dialogEdit
|
2025-06-21 13:43:59 +02:00 |
|
|
p2405951
|
b4f153888c
|
Merge branch 'dev' of https://iutbg-gitlab.iutbourg.univ-lyon1.fr/p2406187/sae201 into dev
|
2025-06-21 13:24:23 +02:00 |
|
|
p2405951
|
f35ac93673
|
bouton retour html
|
2025-06-21 13:23:17 +02:00 |
|
|
JOSSERAND GIOVANNI p2405212
|
93a04e9185
|
Merge branch 'dev' into 'feature/automatiqueValidate'
# Conflicts:
# mainwindow.cpp
# mainwindow.h
|
2025-06-21 11:22:01 +00:00 |
|
|
Giovanni JOSSERAND
|
b2457787b7
|
add of automatique validate
|
2025-06-21 13:19:40 +02:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
8a781a2df6
|
Merge branch 'dev' into 'feature/addStep'
# Conflicts:
# mainwindow.cpp
|
2025-06-21 11:18:03 +00:00 |
|
|
Pyramond
|
ffcb6fa203
|
Add step btn
|
2025-06-21 13:14:54 +02:00 |
|
|
Giovanni JOSSERAND
|
6950ff066c
|
Merge remote-tracking branch 'origin/dev' into fix/valideBtn
|
2025-06-21 12:43:40 +02:00 |
|
|
Giovanni JOSSERAND
|
04fcf40798
|
fix of validate crash and validate dialogues and personnages
|
2025-06-21 12:28:21 +02:00 |
|
|
p2405951
|
699643741c
|
fix issue link html
|
2025-06-21 11:27:52 +02:00 |
|
|
Giovanni JOSSERAND
|
d1a32217d2
|
re-add of styleTool widgets
|
2025-06-21 00:16:58 +02: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 |
|
|
Giovanni JOSSERAND
|
a74c419c5d
|
add of shortcut for style tools
|
2025-06-20 23:38:12 +02:00 |
|
|
Giovanni JOSSERAND
|
a609d4f413
|
update style functions to work without selection
|
2025-06-20 23:26:30 +02:00 |
|
|
Giovanni JOSSERAND
|
2f6b7d44d8
|
add of fontSize and font functions
|
2025-06-20 23:10:11 +02:00 |
|
|
Giovanni JOSSERAND
|
0b4f2a172c
|
add of overline function
|
2025-06-20 22:40:18 +02:00 |
|
|
Giovanni JOSSERAND
|
b9aa141763
|
adapt style function to work with PlainTextEdit
|
2025-06-20 22:18:33 +02:00 |
|
|
Giovanni JOSSERAND
|
516d432bdd
|
add copy, past and cut for plainTextedit
|
2025-06-20 21:56:15 +02:00 |
|
|
Giovanni JOSSERAND
|
75f9928957
|
review of toolbar and menu bar
|
2025-06-20 21:21:46 +02:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
8c33d16122
|
Add export to html btn
|
2025-06-20 18:33:34 +02:00 |
|
|
Giovanni JOSSERAND
|
69e206afa9
|
add of saveAsFile function
|
2025-06-20 16:58:59 +02:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
af4426191f
|
Merge branch 'main' into 'dev'
# Conflicts:
# mainwindow.cpp
|
2025-06-20 14:52:18 +00:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
1011a9f123
|
Fix issues
|
2025-06-20 16:51:11 +02:00 |
|
|
Giovanni JOSSERAND
|
be6c35faa8
|
fix of valider button
|
2025-06-20 16:47:19 +02:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
d3b84f32f4
|
Merge branch 'dev' into 'feature/web'
# Conflicts:
# data/parcours2.json
# mainwindow.cpp
# mainwindow.h
# step.cpp
# step.h
|
2025-06-20 14:40:02 +00:00 |
|
|
Giovanni JOSSERAND
|
fe5623b804
|
add of color selector
|
2025-06-20 16:30:24 +02:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
c6be9f6c17
|
Fix issues
|
2025-06-20 16:30:18 +02:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
3e9e248f04
|
Merge branch 'main' into 'feature/validateBtn'
# Conflicts:
# mainwindow.h
# mainwindow.ui
# path.cpp
|
2025-06-20 14:24:44 +00:00 |
|
|
p2405951
|
105f1a6918
|
modif export + automatisation + fonction qui centralise tout les exports
|
2025-06-20 16:08:32 +02:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
992874a603
|
Save step info
|
2025-06-20 15:54:23 +02:00 |
|
|
Giovanni JOSSERAND
|
afd9997724
|
of save and load a path without image
|
2025-06-20 15:38:11 +02:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
591737118b
|
ValidateBtn
|
2025-06-20 14:34:28 +02: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 |
|
|
Giovanni JOSSERAND
|
9aee1f659b
|
final save function
|
2025-06-20 14:08:36 +02:00 |
|
|
Giovanni JOSSERAND
|
65e391412e
|
add of setbold, setItalic, setUnderlined and setFontColor functions
|
2025-06-20 11:54:36 +02:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
9ae7d4e834
|
Can change step
|
2025-06-20 11:52:46 +02:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
c2151515f5
|
Possibility to change the current Path
|
2025-06-20 11:30:45 +02:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
55837df72e
|
display dialog
|
2025-06-20 11:01:03 +02:00 |
|
|
p2405951
|
213f8e1217
|
ajout export html
|
2025-06-20 10:58:40 +02:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
aed27c2483
|
Display coordinates
|
2025-06-20 09:16:07 +02:00 |
|
|
Giovanni JOSSERAND
|
4fe0884432
|
add of save function with default value
|
2025-06-20 08:58:07 +02:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
4f508adbb9
|
Display path number
|
2025-06-19 23:22:19 +02:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
ce6614e29d
|
Display step title
|
2025-06-19 23:14:25 +02:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
2aa518bc1d
|
Add cut function
|
2025-06-19 22:55:11 +02:00 |
|
|
T'JAMPENS QUENTIN p2406187
|
f4454d513e
|
Add paste function
|
2025-06-19 22:38:00 +02:00 |
|