 Mathis RIBEMONT
|
cdb8ae5a34
|
Merge branch 'master' of gitlab.iut-clermont.uca.fr:/maribemont/projet-tut
|
4 years ago |
|
Mathis RIBEMONT
|
da87ea716e
|
main fonctionnel vers menu principal
|
4 years ago |
marouault
|
b9a1c0ac09
|
Modified interface for EndGameMenu and documentation
|
4 years ago |
|
marouault
|
792a97a27e
|
Finished End game menu
|
4 years ago |
|
marouault
|
fca84edc00
|
Added free function to Input processors
|
4 years ago |
|
marouault
|
dec491cfbd
|
Advancing in endgamemenu loop
|
4 years ago |
|
thmaillarb
|
e923900ba7
|
Merge branch 'master' of gitlab.iut-clermont.uca.fr:maribemont/projet-tut
|
4 years ago |
|
marouault
|
3cc3a8047d
|
Merge
|
4 years ago |
|
marouault
|
e00807a276
|
Modified end game menu and input processors
|
4 years ago |
|
Allan POINT
|
7b455ae718
|
Create CreationMenue view
|
4 years ago |
|
thmaillarb
|
a0f382f6a3
|
Fixed conflicts (doesn't compile because of Settings view)
|
4 years ago |
|
thmaillarb
|
7492987f2f
|
More rewritting of Settings view
(without commit 5ca9c02b "Added sizeFactor to textLabel")
|
4 years ago |
|
Mathis RIBEMONT
|
be2734a793
|
main de base
|
4 years ago |
|
marouault
|
425e7bcacd
|
Add general state
|
4 years ago |
|
marouault
|
e96d6385b8
|
Corrected color include
|
4 years ago |
|
marouault
|
8ea6e3d807
|
Move color.h in include
|
4 years ago |
|
Mathis RIBEMONT
|
6257e9ed4e
|
Merge branch 'master' of gitlab.iut-clermont.uca.fr:/maribemont/projet-tut
|
4 years ago |
|
Mathis RIBEMONT
|
ecbcb3afe8
|
freeTexture
|
4 years ago |
|
marouault
|
5ca9c02b00
|
Added sizeFactor to textLabel
|
4 years ago |
|
marouault
|
5b1ebb9492
|
Merge branch 'ProblemSigTrap' into 'master'
Problem sig trap
See merge request maribemont/projet-tut!1
|
4 years ago |
|
thmaillarb
|
d97c970721
|
Rewrote part of settings view
|
4 years ago |
|
Mathis RIBEMONT
|
de9b79fea5
|
Merge branch 'master' of gitlab.iut-clermont.uca.fr:/maribemont/projet-tut
|
4 years ago |
|
Mathis RIBEMONT
|
7bbffcc20b
|
protoMenu
|
4 years ago |
|
Mathis RIBEMONT
|
4857a08df2
|
résolution bug du createButtonTexture
|
4 years ago |
|
marouault
|
544ea39083
|
Debug EndGameMenu
|
4 years ago |
|
thmaillarb
|
0a9a214cc3
|
Fixed some syntax errors in Settings (UNTESTED)
|
4 years ago |
|
marouault
|
84649f64dd
|
merge
|
4 years ago |
|
marouault
|
11d2f07fff
|
Added end game menu
|
4 years ago |
|
Allan POINT
|
f8d22eebc1
|
Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
|
4 years ago |
|
Allan POINT
|
b913ea8dbb
|
rm swap files
|
4 years ago |
|
thmaillarb
|
70e50e26f8
|
Merge branch 'master' of gitlab.iut-clermont.uca.fr:maribemont/projet-tut
|
4 years ago |
|
thmaillarb
|
33017854f5
|
Fixed AudioHandler
|
4 years ago |
|
marouault
|
dd1cab387f
|
Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
|
4 years ago |
|
thmaillarb
|
0f3f8d0d1f
|
Merge branch 'master' of gitlab.iut-clermont.uca.fr:maribemont/projet-tut
|
4 years ago |
|
Allan POINT
|
dea190029d
|
MenuConnection
|
4 years ago |
|
marouault
|
4431d4c8e2
|
Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
|
4 years ago |
|
marouault
|
5f783b5584
|
Modified Player struct
|
4 years ago |
|
Allan POINT
|
b1aef804e6
|
Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
|
4 years ago |
|
Allan POINT
|
7a694fa838
|
Add Curvilingus Font
|
4 years ago |
|
thmaillarb
|
99ca0e35a7
|
Merge branch 'master' of gitlab.iut-clermont.uca.fr:maribemont/projet-tut
|
4 years ago |
|
thmaillarb
|
994f585032
|
Added Settings view (UNTESTED)
|
4 years ago |
|
marouault
|
a46ce1a83f
|
Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
|
4 years ago |
|
marouault
|
35d27e4bc0
|
Added position argument for textLabel
|
4 years ago |
|
Mathis RIBEMONT
|
d4975d24f0
|
compilable button
|
4 years ago |
|
Mathis RIBEMONT
|
5078bb685f
|
arg in P_Button
|
4 years ago |
|
Mathis RIBEMONT
|
b481b1ca85
|
Merge branch 'master' of gitlab.iut-clermont.uca.fr:/maribemont/projet-tut
|
4 years ago |
|
Mathis RIBEMONT
|
ffb3623389
|
new arg for button
|
4 years ago |
|
marouault
|
5e807d874e
|
Better TextLabel
|
4 years ago |
|
marouault
|
1fee23a440
|
Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
|
4 years ago |
|
marouault
|
f63ea0a321
|
Added functions to textLabel
|
4 years ago |
