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 |
|
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 |
|
thmaillarb
|
05cf3d4c64
|
Updated Settings view (UNTESTED)
|
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 |
|
Mathis RIBEMONT
|
92d3833975
|
Button can be created without texture
|
4 years ago |
|
Mathis RIBEMONT
|
5ddd5b144c
|
correction of a mistake
|
4 years ago |
|
Mathis RIBEMONT
|
890713033a
|
+Documentation of createGenericButtonTexture
|
4 years ago |
|
Mathis RIBEMONT
|
81fd8a410d
|
+function creating generic texture with parameters (font, fontSize, thickness of the borders and padding)
|
4 years ago |
|
Mathis RIBEMONT
|
1b692a5f17
|
Merge branch 'master' of gitlab.iut-clermont.uca.fr:/maribemont/projet-tut
|
4 years ago |
|
Mathis RIBEMONT
|
ca6f7ec8b2
|
Function for creating button texture [NOT TESTED YET]
|
4 years ago |
|
marouault
|
3f134538c6
|
Ajout de sprite de couleur pour les pieces
|
4 years ago |
|
Allan POINT
|
ea635c070b
|
Cortect segfault
|
4 years ago |
|
marouault
|
258c5581d9
|
Modification des sprites
|
4 years ago |
|
Allan POINT
|
420b3a6ab0
|
Bug correction for TextInput(add and rm char) + Add utils for font (calculate lenght of a TTF word)
|
4 years ago |
|
Allan POINT
|
8132bc8ddd
|
Add TextLabel and TextInput (not yet finished)
|
4 years ago |
|
thmaillarb
|
a4dda9993a
|
Fixed fadeout, completed testAudioHandler. AudioHandler is now done.
|
4 years ago |
|
thmaillarb
|
8cf39bb99e
|
Partially tested AudioHandler -> fade out doesn't work
|
4 years ago |
|
Allan POINT
|
fcf2395d1d
|
Add a font loader
|
4 years ago |
|
Mathis RIBEMONT
|
0edd96fe17
|
ratio size font
|
4 years ago |
|
Mathis RIBEMONT
|
1c28d17eb3
|
Merge branch 'master' of gitlab.iut-clermont.uca.fr:/maribemont/projet-tut
|
4 years ago |
|
Mathis RIBEMONT
|
b8755a6b0a
|
relation entre hauteur et largeur pour la font
|
4 years ago |
|
marouault
|
6f473cb794
|
Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
|
4 years ago |
|
marouault
|
08f635a303
|
Completed interactible cases
|
4 years ago |
|
thmaillarb
|
c4c27d3edc
|
Merge branch 'master' of gitlab.iut-clermont.uca.fr:maribemont/projet-tut
|
4 years ago |
|
thmaillarb
|
d9537f3e68
|
Added AudioHandler, based on Audio.h and Audio.c
|
4 years ago |
|
Mathis RIBEMONT
|
f45b7def6d
|
test génération texture
|
4 years ago |
|
Jacques THOMAS
|
057079b5bb
|
Add a little modify in a commentary function
|
4 years ago |
|
marouault
|
d90840571e
|
Documented some files
|
4 years ago |
|
marouault
|
822a9d79ca
|
Light modification of main
|
4 years ago |
|
marouault
|
b218a0eeb3
|
Added ArrayUtils to facilitate use of dynamic arrays. Tested some solutions to the InputHandler problem (The one which is commited mostly work)
|
4 years ago |
|
marouault
|
28c65bb4db
|
Maybe corrected the correction
|
4 years ago |
|
marouault
|
0759da75fb
|
Corrected checkBridge
|
4 years ago |
|
marouault
|
e13b538da0
|
Implemented some game feature (mainly the change between phase and player after actions), There are bugs but the game can be 'played'
|
4 years ago |
|
marouault
|
4e5f963eeb
|
Corrected a bug with moveOnBoard, Added special rule for 2 players and a drawer for pieces (at this time, we can move player 0's pieces around)
|
4 years ago |
|
Theotime812
|
ec966bb3f6
|
Fixed segfault with switchMusic, but will have to optimize
|
4 years ago |
|
Allan POINT
|
cafeaf8264
|
Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
|
4 years ago |
|
Allan POINT
|
cd50f41aeb
|
Centering the board
|
4 years ago |
|
marouault
|
6e1d28f252
|
Started to specify the placement rule for two players games, need to place Pieces (in newBoard or in newGame, I don't know)
|
4 years ago |
|
marouault
|
861dba6e74
|
Refactor clickOnBoard RM_BRIDGE case
|
4 years ago |
|
marouault
|
d760a8e1a8
|
Modified processInput for a better handle of move events
|
4 years ago |
|
marouault
|
b81cba8d83
|
Documented newBoard in Board.h
|
4 years ago |
|
marouault
|
319f0252de
|
Documented BoardDrawer.h
|
4 years ago |
|
marouault
|
e786553e3b
|
Documented functions in Game.h, renamed clickOnBoard
|
4 years ago |
|
marouault
|
c3b43c4f32
|
Documented Coord.h, completed and renamed coordValid
|
4 years ago |
|
marouault
|
3966a612d6
|
Documented InputProcessor.h
|
4 years ago |
|
marouault
|
db7d1e6c82
|
Documented TextureHandler.h
|
4 years ago |
|
marouault
|
e11fbb01b4
|
Corrected some coordinate transformation errors (we can clic to remove bridges if we set game's phase to RM_BRDIGE)
|
4 years ago |
|
marouault
|
718fdee338
|
Added a Texture handler (care MACROS (ask me if you want explainations)), First version of game's sprites and drawBoard completed for now
|
4 years ago |
|
marouault
|
d6ddd1e1ed
|
Multiple modifications assited with gcc (principaly advenced in model/game)
|
4 years ago |
|
Jacques THOMAS
|
7dd47dcc0d
|
Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
|
4 years ago |
|
Jacques THOMAS
|
ea9c20cb80
|
Resolve confilts in Game.c
|
4 years ago |
|
thmaillarb
|
f976f32269
|
Added non-blocking function to switch to another music with fadeout
Test functions are written, but I diidn't test yet
|
4 years ago |
|
Jacques THOMAS
|
6e0f6b05eb
|
Resolve conflits
|
4 years ago |
|
Jacques THOMAS
|
c68f45a7c1
|
Game c : add getPieceFromIsland which allow you to get the piece from an island, and also add moveOnBoard which allows you to move piece from start position to end position
|
4 years ago |
|
Allan POINT
|
51ba8313d7
|
Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
|
4 years ago |
|
Allan POINT
|
b09abd6cc6
|
Beginig the boardDrawer
|
4 years ago |
|
Mathis RIBEMONT
|
a7facabf45
|
commit -m "add changeButtonHoverTexture to test error"
|
4 years ago |
|
Allan POINT
|
c2c5cb2e7f
|
Create TextureLoader
|
4 years ago |
|
Allan POINT
|
46c146d2be
|
Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
|
4 years ago |
|
Allan POINT
|
8b66386772
|
Create TextureLoader
|
4 years ago |
|
Allan POINT
|
79dce381b5
|
Resolve conflict
|
4 years ago |
|
Mathis RIBEMONT
|
a78479cb99
|
Merge branch 'master' of gitlab.iut-clermont.uca.fr:/maribemont/projet-tut
|
4 years ago |
|
Mathis RIBEMONT
|
4352634712
|
button work with hover
|
4 years ago |
|
marouault
|
be4b4c347e
|
Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
|
4 years ago |
|
marouault
|
745ca533b2
|
Test more flexible
|
4 years ago |
|
Jacques THOMAS
|
d5cc01766e
|
Resolve conflicts
|
4 years ago |
|
Jacques THOMAS
|
feb3428ba2
|
Add to cliqueOnBoard and moveOnBoard
|
4 years ago |
|
marouault
|
cacb66ccf9
|
Merge
|
4 years ago |
|
marouault
|
7b1d473ef2
|
IslandOrBridge modified and coordToBridge modified and tested
|
4 years ago |
|
Jacques THOMAS
|
ccc8f7ac0a
|
Add a bridge struct (two islands) and modify of rmBridge due to this new struct
|
4 years ago |
|
marouault
|
fe6a5016b6
|
Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
|
4 years ago |
|
marouault
|
5bbba0da09
|
Prototype for functions moveOnBoard ->modify IslandOrBridge, create bridge structure
|
4 years ago |
|
Mathis RIBEMONT
|
4dfbfb7bc4
|
Merge branch of gitlab.iut-clermont.uca.fr:/maribemont/projet-tut
|
4 years ago |
|
Mathis RIBEMONT
|
3f3c77ade9
|
commit testButton
|
4 years ago |
|
Mathis RIBEMONT
|
d20f95e6a7
|
push TextureLoad.h
|
4 years ago |
|
marouault
|
4528f15b36
|
New check for islands (to avoid us mistakes)
|
4 years ago |
|
marouault
|
3b1cbf71ff
|
Test and modify functions from model/Game + Modify documentation for checkBridge to match the semantics
|
4 years ago |
|
marouault
|
a67479f429
|
Modify the interface of some check function in game, mainly by splitting checkIsland in two\nBe carefull with Island -> they are temporary objects, they can't know if a player is on their position
|
4 years ago |
|
marouault
|
3a68c6f700
|
Slightly changed the main to make the app run correctly
|
4 years ago |
|
marouault
|
563350f190
|
Correction d'include et faute de frappes -> je vais faire des tests sur le modele probablement
|
4 years ago |
|
thmaillarb
|
c0e7808048
|
Added rmBridge
|
4 years ago |
|
thmaillarb
|
ea4857750d
|
Fixed and finished movement functions and related
|
4 years ago |
|
Mathis RIBEMONT
|
2ad9c5034b
|
resolve conflict with button
|
4 years ago |
|
Mathis RIBEMONT
|
1a7dd39a3e
|
drawButton doesn't return value anymore, and exit when there is an error
|
4 years ago |
|
Mathis RIBEMONT
|
9cfebbe920
|
comment of function
|
4 years ago |
