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
|
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
|
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
|
1c28d17eb3
|
Merge branch 'master' of gitlab.iut-clermont.uca.fr:/maribemont/projet-tut
|
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
|
d9537f3e68
|
Added AudioHandler, based on Audio.h and Audio.c
|
4 years ago |
|
Mathis RIBEMONT
|
f45b7def6d
|
test génération texture
|
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
|
e786553e3b
|
Documented functions in Game.h, renamed clickOnBoard
|
4 years ago |
|
marouault
|
c3b43c4f32
|
Documented Coord.h, completed and renamed coordValid
|
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
|
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
|
5bbba0da09
|
Prototype for functions moveOnBoard ->modify IslandOrBridge, create bridge structure
|
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 |
|
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 |
|
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
|
08e7dd3f3a
|
Resolve conflicts
|
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 |
|
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 |
|
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 |
