thmaillarb
|
d6d95a8a22
|
Made AudioHandler volumes more consistent + added tests to avoid weird settings
|
3 years ago |
 Mathis RIBEMONT
|
03e90b030d
|
sound when exit main Menu
|
3 years ago |
 Jacques THOMAS
|
2ea7834b35
|
In GameInterface, add the function createGameInterfaceLabels
|
3 years ago |
|
thmaillarb
|
bbee7397a9
|
Added input loop in settings
|
3 years ago |
|
Mathis RIBEMONT
|
ada68519ae
|
Merge branch and enum for button
|
3 years ago |
|
Mathis RIBEMONT
|
f1ac5006f0
|
new enum for button, drawn become enable
|
3 years ago |
|
marouault
|
d6ea65ad62
|
Patch menu end game
|
3 years ago |
|
Mathis RIBEMONT
|
ef51abf562
|
Merge branch 'master' of gitlab.iut-clermont.uca.fr:/maribemont/projet-tut
|
3 years ago |
|
Mathis RIBEMONT
|
ebff452e44
|
new interaction system for button, we can now know if cursor exit the button
|
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)
|
4 years ago |
|
marouault
|
a841982dc5
|
Modified GameCreationMenu to make it use PlayersColors (goal -> remove SDL_Colors from model (+easier for some functions))
|
4 years ago |
|
Allan POINT
|
c433025706
|
resolve confict
|
4 years ago |
|
Allan POINT
|
d0500097c8
|
Add CreationMenu (to be upgradeed (redraw permanetly)) (also, the numbre of player is not update on the scree)
|
4 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 |
|
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 |
|
thmaillarb
|
c6fdb662a4
|
Upated Settings view to support last version of TextLabel
|
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
|
63aa24c254
|
Moved away old main
|
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 |
|
marouault
|
ae9852ea0b
|
Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
|
4 years ago |
|
marouault
|
da04515482
|
Little chnge in button comment
|
4 years ago |
|
Mathis RIBEMONT
|
b0951a4604
|
Merge branch 'master' of gitlab.iut-clermont.uca.fr:/maribemont/projet-tut
|
4 years ago |
|
Mathis RIBEMONT
|
6257e9ed4e
|
Merge branch 'master' of gitlab.iut-clermont.uca.fr:/maribemont/projet-tut
|
4 years ago |
|
Mathis RIBEMONT
|
63b9f0a9a6
|
maine menu avec lenna bg
|
4 years ago |
|
Allan POINT
|
73f15dc002
|
Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
|
4 years ago |
|
Allan POINT
|
0fe213d648
|
Add commons collors
|
4 years ago |
|
Mathis RIBEMONT
|
247e365eea
|
correct mistake
|
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 |
|
marouault
|
daa017700f
|
Patch branch error
|
4 years ago |
|
thmaillarb
|
d97c970721
|
Rewrote part of settings view
|
4 years ago |
|
Mathis RIBEMONT
|
99a30ab946
|
mainMenu afficher avec bouton et quit bouton fonctionnel ni bg ni centré
|
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 |
|
alpoint
|
d23a46499d
|
Delete .GameCreationMenu.c.swp
|
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 |
|
Jacques THOMAS
|
dc50f5c99d
|
Resolve conflits
|
4 years ago |
|
Jacques THOMAS
|
b2affcdff5
|
Start to draw the game interface, not many things done, firstly buttons
|
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
|
0403dd0281
|
Renaming Connection menu
|
4 years ago |
