Commit Graph

119 Commits (e11fbb01b4fdcd27bd505c0c2f885d4559c92cf9)
 

Author SHA1 Message Date
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
thmaillarb bb4c85f134 Proof-read the French README and translated it into English in a separate file
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
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
Allan POINT 69a993ea31 Change README.md
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 6cbe9fc5c8 Added .gitattributes
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
Mathis RIBEMONT dc0d9e277b Button and function is usable, we can test with isHover.
4 years ago
marouault f39c5e0347 Modified Doxyfile and document engine Input
4 years ago
marouault 6fd58d28b6 Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
4 years ago
marouault 4c04ac8268 Partial merge of different Coord
4 years ago
Jacques THOMAS 364bd7f423 resolve conflicts
4 years ago
marouault cbf1adee8e Merge
4 years ago
Jacques THOMAS 36f0bc4409 Add in game.c and game.h, the functions : movePiece and checkIsland, MUST BE tested git add *!
4 years ago
Allan POINT d88d842b0f Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
4 years ago