thmaillarb
|
510cdebce9
|
Merge branch 'fixingSettings' into 'master'
Fixed Settings (but not functionnal)
See merge request maribemont/projet-tut!2
|
3 years ago |
|
thmaillarb
|
220296bb4f
|
Fixed Settings! But not functionnal
|
3 years ago |
|
thmaillarb
|
5b230e8358
|
Partially fixed Settings (but now it doesn't compile)
I forgot about it oops
|
3 years ago |
|
thmaillarb
|
a9e3fbf081
|
fixed conflicts
|
3 years ago |
|
marouault
|
9473c0c2b4
|
Multiplayer available, EndGameMenu better than ever
|
3 years ago |
|
marouault
|
2741bf875c
|
Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
|
3 years ago |
|
marouault
|
f7c25903a8
|
Started to integrate MenuInterface into GameMain + Cut menu_sound_effect.wav silence to make it end quicker so channels aren't overbooked
|
3 years ago |
|
Allan POINT
|
2615280bf5
|
Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
|
3 years ago |
|
Allan POINT
|
211af5e591
|
change TextInput.value default length to 1 (\0)
|
3 years ago |
 Mathis RIBEMONT
|
5d455b4cbc
|
resizable windows for main menu, fix bug with WARNING msg in playSFX
|
3 years ago |
|
Mathis RIBEMONT
|
06f903e9f5
|
Merge branch 'master' of gitlab.iut-clermont.uca.fr:/maribemont/projet-tut
|
3 years ago |
|
Mathis RIBEMONT
|
49c39db13f
|
Free at ending of functions
|
3 years ago |
|
marouault
|
1a29afc70a
|
Updated Game.c to set correctly rank and elminationTurn for player. Updated GameMain to make MenuEndGame work (a little fix will be made to resize but it's functionnal)
|
3 years ago |
|
marouault
|
a841982dc5
|
Modified GameCreationMenu to make it use PlayersColors (goal -> remove SDL_Colors from model (+easier for some functions))
|
3 years ago |
|
Allan POINT
|
c433025706
|
resolve confict
|
3 years ago |
|
Allan POINT
|
d0500097c8
|
Add CreationMenu (to be upgradeed (redraw permanetly)) (also, the numbre of player is not update on the scree)
|
3 years ago |
|
marouault
|
abdb6656e8
|
ViewGame functionnal, color for player modified, bug with 3 players due to bad allocation -> use valgrind to try to find it (we need to be more carefull when we allocate space)
|
4 years ago |
|
marouault
|
930719ce7d
|
End game modified but not totally fixed
|
4 years ago |
|
marouault
|
8cb3ccef1b
|
Game can be fluid in IUT's PC
|
4 years ago |
|
marouault
|
9eb65816df
|
New Drawing system in place -> going to test it on guacamole
|
4 years ago |
|
marouault
|
33191714c1
|
Modified gameMenu, adapted some calls
|
4 years ago |
|
marouault
|
dd93f9508a
|
Merge
|
4 years ago |
|
marouault
|
0db8531880
|
PositionAdapter for redimensionnable window
|
4 years ago |
|
marouault
|
ad1c627d13
|
Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
|
4 years ago |
|
marouault
|
4babc2db8e
|
Game Main modified (need to correct drawMovePiece and drawDeleteBridge)
|
4 years ago |
 Jacques THOMAS
|
0ae2392c07
|
Merge branch 'master' of gitlab.iut-clermont.uca.fr:maribemont/projet-tut
|
4 years ago |
|
Jacques THOMAS
|
dc8d05c091
|
On game interface, add text label for nbTurn and time
|
4 years ago |
|
Mathis RIBEMONT
|
57dace4e2c
|
free des boutons
|
4 years ago |
|
marouault
|
e6fa8b77e2
|
Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
|
4 years ago |
|
marouault
|
167786f1fc
|
Modify main page and game main
|
4 years ago |
|
Jacques THOMAS
|
b0a85ac7d1
|
Draw setting and sound button on the game interface (top rigth corner)
|
4 years ago |
|
marouault
|
da18422918
|
Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
|
4 years ago |
|
marouault
|
5ec95f9d67
|
It compile, GameMain updated
|
4 years ago |
|
Jacques THOMAS
|
400d94d867
|
Merge
|
4 years ago |
|
Jacques THOMAS
|
716239eebf
|
Button menu (not over) of the game interface
|
4 years ago |
|
marouault
|
3d9ccdc3bc
|
merge
|
4 years ago |
|
marouault
|
b35066dd1f
|
Avanced game main
|
4 years ago |
|
Mathis RIBEMONT
|
42636bca6e
|
modification newGame
|
4 years ago |
|
marouault
|
14f93ae622
|
Modification de l'affichage des action de jeu
|
4 years ago |
|
Mathis RIBEMONT
|
d71beabbd7
|
maj de la documentation sur isHover et IsButtonEntry
|
4 years ago |
|
Mathis RIBEMONT
|
f0c2995733
|
isButtonEntry pour l'entrée du curseur dans le bouton + bruit au bouton hover
|
4 years ago |
|
marouault
|
ec52ebd10c
|
Appel des fonctions globales
|
4 years ago |
|
marouault
|
2a194aa4fd
|
Ajout du menu de fin de partie
|
4 years ago |
|
thmaillarb
|
0d8a8956c0
|
Finished appearance of Settings view
|
4 years ago |
|
thmaillarb
|
755106d512
|
Fixed compilation errors
|
4 years ago |
|
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 |
