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 |
|
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 |
|
marouault
|
dbf3501483
|
Continue Input processing, need documentation and testing
|
4 years ago |
|
Allan POINT
|
6d63c6a402
|
Add CheckBridge
|
4 years ago |
|
thmaillarb
|
232256adbe
|
Merge branch 'master' of gitlab.iut-clermont.uca.fr:maribemont/projet-tut
|
4 years ago |
|
thmaillarb
|
eeabdf3db2
|
Added Coord struct
|
4 years ago |
|
Mathis RIBEMONT
|
eb085f36a4
|
solve conflict button.c
|
4 years ago |
|
Mathis RIBEMONT
|
17ac705a29
|
button drawable
|
4 years ago |
|
thmaillarb
|
e27357cadd
|
Added IslandOrBridge + converter
|
4 years ago |
|
Allan POINT
|
419e51867a
|
Resolve conflict
|
4 years ago |
|
marouault
|
3812df5975
|
Started event processing
|
4 years ago |
|
Mathis RIBEMONT
|
062f8a9f96
|
Push button prototype
|
4 years ago |
|
Allan POINT
|
2eaed495a4
|
Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
|
4 years ago |
|
Allan POINT
|
08e7dd3f3a
|
Resolve conflicts
|
4 years ago |
|
Mathis RIBEMONT
|
3f526cdf03
|
Add comment: function isHover() and isClicked()
|
4 years ago |
|
Allan POINT
|
b1c616c156
|
Button imporovements
|
4 years ago |
|
marouault
|
b5d542a146
|
Des const un peu partout et quelques modification de code + vidage partiel du fichier main
|
4 years ago |
|
Martin ROUAULT
|
54d90c10cd
|
Resolve conflict
|
4 years ago |
|
Martin ROUAULT
|
7b2f1f00d2
|
Test compilation on GNU/Linux -> work but we will need to ask the installation of the following libraries : libsdl2-ttf-dev libsdl2-net-dev libsdl2-mixer-dev libsdl2-image-dev
|
4 years ago |
|
thmaillarb
|
b224ad1d5f
|
Switched Button's documentation to Doxygen
|
4 years ago |
|
marouault
|
e0d29cd6b4
|
Modification for windows compiling (with mingw, to test on other configurations), I'm going to test it on linux now
|
4 years ago |
|
thmaillarb
|
92d9812dbf
|
deleted bin
|
4 years ago |
|
Martin ROUAULT
|
0e4215f636
|
Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
|
4 years ago |
|
Martin ROUAULT
|
a705266713
|
Make pass need to test on Windows
|
4 years ago |
|
Allan POINT
|
13c6f1a275
|
Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
|
4 years ago |
|
thmaillarb
|
91af634f70
|
Fixed other compilation error in Board.c
|
4 years ago |
|
Allan POINT
|
bbafae60eb
|
constructor of button
|
4 years ago |
|
thmaillarb
|
2c3f27890c
|
Merge branch 'master' of gitlab.iut-clermont.uca.fr:maribemont/projet-tut
|
4 years ago |
|
thmaillarb
|
2b3cf6e61d
|
Fixed compilations errors in Board.c
|
4 years ago |
|
thmaillarb
|
9b80275cbb
|
Players are added to the game
|
4 years ago |
|
Martin ROUAULT
|
43557fbd56
|
Ajout d'un fichier CMakeLists.txt
|
4 years ago |
|
Martin ROUAULT
|
d6db39d042
|
Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
|
4 years ago |
|
thmaillarb
|
471dab296b
|
Added struct Board and function newPiece()
|
4 years ago |
|
Allan POINT
|
de74bdd917
|
Add buttun's creation function
|
4 years ago |
|
Martin ROUAULT
|
8d4a2d5461
|
Resolution de conflit
|
4 years ago |
|
Martin ROUAULT
|
5fc52e09c7
|
Debut de makefile
|
4 years ago |
|
thmaillarb
|
004e5cf177
|
Merge branch 'master' of gitlab.iut-clermont.uca.fr:maribemont/projet-tut
|
4 years ago |
|
thmaillarb
|
8b0a7c6da3
|
Translated into English
|
4 years ago |
|
Mathis RIBEMONT
|
5717b4a372
|
Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
|
4 years ago |
|
Mathis RIBEMONT
|
4afd632624
|
function on click prototype
|
4 years ago |
|
Jacques THOMAS
|
ef2b43ca3f
|
Merge
|
4 years ago |
|
Mathis RIBEMONT
|
fe1984804b
|
rename button.h to Button.h
|
4 years ago |
|
Jacques THOMAS
|
3f5526b91a
|
Add in model: Island.h and Piece.h
|
4 years ago |
|
Mathis RIBEMONT
|
ccea65a8c0
|
Merge branch 'master' of https://gitlab.iut-clermont.uca.fr/maribemont/projet-tut
|
4 years ago |
|
Mathis RIBEMONT
|
a64de143f0
|
prototype et structure bouton
|
4 years ago |
|
thmaillarb
|
6e4c1ce0c1
|
Ajout de Game
|
4 years ago |
|
thmaillarb
|
c990134a67
|
Ajout de la structure du joueur
|
4 years ago |
|
Martin ROUAULT
|
0e9d277999
|
Creation de l'arborecence
|
4 years ago |
