Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/rb 160 fix client init protocol #138

Closed
wants to merge 83 commits into from
Closed
Show file tree
Hide file tree
Changes from 81 commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
e54a90d
ECS: Add button that can change scene
KitetsuK Oct 24, 2023
a1d7ce8
CLIENT-GAME/DOCUMENTATION: Add first functional version of menu + som…
KitetsuK Oct 26, 2023
e0d3e32
FORMAT-AUTO: automatic format on pull request #129
github-actions[bot] Oct 26, 2023
6cbb95f
CLIENT-GAME/DOCUMENTATION: Update client game and error management
KitetsuK Oct 26, 2023
929a8b2
FORMAT-AUTO: automatic format on pull request #129
github-actions[bot] Oct 26, 2023
0c83ecc
CLIENT-GAME: Fix coderabbit review
KitetsuK Oct 27, 2023
4468308
Merge branch 'feature/RB-142-menu-de-connection' of github.com:X-R-G-…
KitetsuK Oct 27, 2023
3d57f0d
FORMAT-AUTO: automatic format on pull request #129
github-actions[bot] Oct 27, 2023
8717d45
CLIENT-GAME: Modif now menu can init entity with the singletone MenuF…
KitetsuK Oct 27, 2023
1ec2ceb
Merge branch 'feature/RB-142-menu-de-connection' of github.com:X-R-G-…
KitetsuK Oct 27, 2023
2988335
FORMAT-AUTO: automatic format on pull request #129
github-actions[bot] Oct 27, 2023
8578093
CLIENT-GAME: Update src/Client/Systems/Menu/ButtonCallbacks.cpp
KitetsuK Oct 27, 2023
2b047da
CLIENT-GAME: Modif script to debug compil
KitetsuK Oct 27, 2023
9f1cdd6
CLIENT-GAME: Update code to make it cleaner
KitetsuK Oct 27, 2023
d72186b
FORMAT-AUTO: automatic format on pull request #129
github-actions[bot] Oct 27, 2023
34a1040
CLIENT-GAME/DOCUMENTATION: Add some docs for menu builder class
KitetsuK Oct 28, 2023
8145342
Merge branch 'feature/RB-142-menu-de-connection' of github.com:X-R-G-…
KitetsuK Oct 28, 2023
7652ba1
FORMAT-AUTO: automatic format on pull request #129
github-actions[bot] Oct 28, 2023
7c3f567
CLIENT-GAME: Update setAllInputBoxFalse to be more optimized
KitetsuK Oct 28, 2023
a077be9
Merge branch 'feature/RB-142-menu-de-connection' of github.com:X-R-G-…
KitetsuK Oct 28, 2023
89aa8dd
FORMAT-AUTO: automatic format on pull request #129
github-actions[bot] Oct 28, 2023
cc42bf8
CLIENT-GAME: Fix some bad includes
KitetsuK Oct 28, 2023
c48dc37
Merge branch 'feature/RB-142-menu-de-connection' of github.com:X-R-G-…
KitetsuK Oct 28, 2023
e10d26e
FORMAT-AUTO: automatic format on pull request #129
github-actions[bot] Oct 28, 2023
ae4fcd2
CLIENT-GAME: Modif now use template Json function
KitetsuK Oct 28, 2023
dff0704
Merge branch 'feature/RB-142-menu-de-connection' of github.com:X-R-G-…
KitetsuK Oct 28, 2023
5e0e0f8
FORMAT-AUTO: automatic format on pull request #129
github-actions[bot] Oct 28, 2023
fdb2d67
CLIENT-GAME: Modif now use template Json function
KitetsuK Oct 28, 2023
5c9cea1
Merge branch 'feature/RB-142-menu-de-connection' of github.com:X-R-G-…
KitetsuK Oct 28, 2023
7387646
FORMAT-AUTO: automatic format on pull request #129
github-actions[bot] Oct 28, 2023
98289d4
CLIENT-GAME: Modif now use template Json function
KitetsuK Oct 28, 2023
7bc3b51
Merge branch 'feature/RB-142-menu-de-connection' of github.com:X-R-G-…
KitetsuK Oct 28, 2023
465cd92
FORMAT-AUTO: automatic format on pull request #129
github-actions[bot] Oct 28, 2023
8c21808
DOCUMENTATION: Update json doc
KitetsuK Oct 28, 2023
e0606b7
gpMerge branch 'feature/RB-142-menu-de-connection' of github.com:X-R-…
KitetsuK Oct 28, 2023
f279cb8
SCRIPTS: Modif scripts to do the same things as before
KitetsuK Oct 28, 2023
c2edfbb
ECS: Add button that can change scene
KitetsuK Oct 24, 2023
6cc6076
CLIENT-GAME/DOCUMENTATION: Add first functional version of menu + som…
KitetsuK Oct 26, 2023
59ea18f
FORMAT-AUTO: automatic format on pull request #129
github-actions[bot] Oct 26, 2023
61c07c8
CLIENT-GAME/DOCUMENTATION: Update client game and error management
KitetsuK Oct 26, 2023
240a432
CLIENT-GAME: Fix coderabbit review
KitetsuK Oct 27, 2023
528e592
FORMAT-AUTO: automatic format on pull request #129
github-actions[bot] Oct 26, 2023
83642b7
CLIENT-GAME: Modif now menu can init entity with the singletone MenuF…
KitetsuK Oct 27, 2023
05a1070
FORMAT-AUTO: automatic format on pull request #129
github-actions[bot] Oct 27, 2023
8577d4c
CLIENT-GAME: Update src/Client/Systems/Menu/ButtonCallbacks.cpp
KitetsuK Oct 27, 2023
3d8770b
CLIENT-GAME: Modif script to debug compil
KitetsuK Oct 27, 2023
f425cf7
CLIENT-GAME: Update code to make it cleaner
KitetsuK Oct 27, 2023
fffdf66
CLIENT-GAME/DOCUMENTATION: Add some docs for menu builder class
KitetsuK Oct 28, 2023
4cda1d7
FORMAT-AUTO: automatic format on pull request #129
github-actions[bot] Oct 27, 2023
a42aef5
CLIENT-GAME: Update setAllInputBoxFalse to be more optimized
KitetsuK Oct 28, 2023
adcb8a7
FORMAT-AUTO: automatic format on pull request #129
github-actions[bot] Oct 28, 2023
9771152
CLIENT-GAME: Fix some bad includes
KitetsuK Oct 28, 2023
c6d20aa
FORMAT-AUTO: automatic format on pull request #129
github-actions[bot] Oct 28, 2023
7d99a44
CLIENT-GAME: Modif now use template Json function
KitetsuK Oct 28, 2023
e2fcb37
FORMAT-AUTO: automatic format on pull request #129
github-actions[bot] Oct 28, 2023
ed72b5a
CLIENT-GAME: Modif now use template Json function
KitetsuK Oct 28, 2023
d5b88ca
FORMAT-AUTO: automatic format on pull request #129
github-actions[bot] Oct 28, 2023
6bbadc6
CLIENT-GAME: Modif now use template Json function
KitetsuK Oct 28, 2023
8683ee4
FORMAT-AUTO: automatic format on pull request #129
github-actions[bot] Oct 28, 2023
1310892
DOCUMENTATION: Update json doc
KitetsuK Oct 28, 2023
7553f0c
FORMAT-AUTO: automatic format on pull request #129
github-actions[bot] Oct 28, 2023
3966696
SCRIPTS: Modif scripts to do the same things as before
KitetsuK Oct 28, 2023
baf6bd9
Merge branch 'feature/RB-142-menu-de-connection' of github.com:X-R-G-…
KitetsuK Oct 28, 2023
a813b4f
FORMAT-AUTO: automatic format on pull request #129
github-actions[bot] Oct 28, 2023
722d56c
CLIENT-GAME: Add first version of connection menu (need work)
KitetsuK Oct 30, 2023
7cf4ac0
Merge dev into RB-142
KitetsuK Oct 30, 2023
543c9d8
CLIENT-GAME: Add list-libby menu (begin)
romainpanno Oct 30, 2023
e28fa0b
CLIENT-GAME: Add final version of main menu to connect to main server
KitetsuK Oct 30, 2023
f0a687d
Merge branch 'feature/RB-142-menu-de-connection' of github.com:X-R-G…
KitetsuK Oct 30, 2023
1fc1ee5
CLIENT-GAME: Remove useless print
KitetsuK Oct 30, 2023
5f81437
CLIENT-GAME: Add create lobby scene
romainpanno Oct 30, 2023
9780e5e
CLIENT-GAME: Add create lobby menu
romainpanno Oct 30, 2023
7c8c112
CLIENT-GAME: Add parallax to menus
romainpanno Oct 30, 2023
858f215
CLIENT-GAME: Add first version of select lobby menu (need debug)
KitetsuK Nov 1, 2023
abb0fec
CLIENT-GAME: Add second version of select lobby menu (more functional)
KitetsuK Nov 1, 2023
5f641a5
CLIENT-GAME: Fix warnings
romainpanno Nov 2, 2023
7648bd4
CLIENT-NETWORK/SERVER-NETWORK: Add smooth lobby connexion & quit events
romainpanno Nov 2, 2023
a916ce6
Merge remote-tracking branch 'origin/dev' into feature/RB-160-fix-cli…
romainpanno Nov 2, 2023
c54e349
FORMAT-AUTO: automatic format on pull request #138
github-actions[bot] Nov 2, 2023
64664b4
RFC: Add RFC for connect_lobby, connect_lobby_resp & disconnect_lobby
romainpanno Nov 2, 2023
bda991c
Merge branch 'feature/RB-160-fix-client-init-protocol' of github.com:…
romainpanno Nov 2, 2023
c734450
NITWORK-SERVER: Upgrade ready message handling (start game when every…
romainpanno Nov 2, 2023
ddbd097
FORMAT-AUTO: automatic format on pull request #138
github-actions[bot] Nov 2, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
279 changes: 279 additions & 0 deletions assets/Json/createLobby.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,279 @@
{
"createLobbyMenu": {
"goBack": {
"type": "button",
"spritePath": "assets/Menu/button.png",
"width": 1600,
"height": 1000,
"rect": {
"x": 0.0,
"y": 0.0,
"width": 1366.0,
"height": 406.0
},
"position": {
"x": 100,
"y": 500
},
"collisionRect": {
"width": 1600,
"height": 1000
},
"animRect": [
{
"type": "hover",
"time": 80,
"noIncr": true,
"list": [
{
"x": 1366.0,
"y": 0.0,
"width": 1366.0,
"height": 406.0
}
]
},
{
"type": "selected",
"time": 80,
"noIncr": true,
"list": [
{
"x" : 2732.0,
"y": 0.0,
"width": 1366.0,
"height": 406.0
}
]
}
]
},
"goBackText": {
"type": "text",
"text": "Go Back",
"color": "red",
"size": 2,
"position": {
"x": 525,
"y": 875
}
},
"name-text" : {
"type": "text",
"color": "red",
"size": 2,
"text": "NAME OF THE LOBBY",
"position" : {
"x": 2670,
"y": 1700
}
},
"name": {
"name": "name",
"type": "input",
"font": "assets/Fonts/soliden/SolidenTrial-Black.otf",
"spritePath": "assets/Menu/input-box.png",
"text": "ServerOfSaverio",
"color": "white",
"textSize": 2,
"maxChar": 30,
"width": 6000,
"height": 800,
"textPosition": {
"x": 3050,
"y": 2250
},
"position" : {
"x": 2000,
"y": 2000
},
"rect": {
"x": 0.0,
"y": 0.0,
"width": 1670.0,
"height": 278.0
},
"collisionRect": {
"width": 4500,
"height": 800
},
"animRect": [
{
"type": "hover",
"time": 80,
"noIncr": true,
"list": [
{
"x" : 1697.0,
"y": 31.0,
"width": 1618.0,
"height": 221.0
}
]
},
{
"type": "selected",
"time": 80,
"noIncr": true,
"list": [
{
"x" : 3348.0,
"y": 14.0,
"width": 1651.0,
"height": 252.0
}
]
}
]
},
"maxNb-text" : {
"type": "text",
"color": "red",
"size": 2,
"text": "NUMBER OF MAX PLAYERS IN THE LOBBY",
"position" : {
"x": 2670,
"y": 3700
}
},
"maxNb": {
"name": "maxNb",
"type": "input",
"font": "assets/Fonts/soliden/SolidenTrial-Black.otf",
"spritePath": "assets/Menu/input-box.png",
"text": "2",
"color": "white",
"textSize": 3,
"maxChar": 2,
"width": 6000,
"height": 800,
"textPosition": {
"x": 3050,
"y": 4180
},
"position" : {
"x": 2000,
"y": 4000
},
"rect": {
"x": 0.0,
"y": 0.0,
"width": 1670.0,
"height": 278.0
},
"collisionRect": {
"width": 4500,
"height": 800
},
"animRect": [
{
"type": "hover",
"time": 80,
"noIncr": true,
"list": [
{
"x" : 1697.0,
"y": 31.0,
"width": 1618.0,
"height": 221.0
}
]
},
{
"type": "selected",
"time": 80,
"noIncr": true,
"list": [
{
"x" : 3348.0,
"y": 14.0,
"width": 1651.0,
"height": 252.0
}
]
}
]
},
"createLobby-text" : {
"type": "text",
"color": "red",
"size": 3,
"text": "CREATE WITH GAME TYPE :",
"position" : {
"x": 3000,
"y": 6500
}
},
"gametype_normal-text" : {
"type": "text",
"color": "white",
"size": 2,
"text": "NORMAL",
"position" : {
"x": 4600,
"y": 7600
}
},
"gametype_normal": {
"type": "button",
"spritePath": "assets/Menu/button.png",
"width": 2500,
"height" : 1250,
"rect": {
"x": 0.0,
"y": 0.0,
"width": 1366.0,
"height": 406.0
},
"position": {
"x": 3750,
"y": 7100
},
"collisionRect": {
"width": 3000,
"height": 1500
},
"animRect": [
{
"type": "hover",
"time": 80,
"noIncr": true,
"list": [
{
"x": 1366.0,
"y": 0.0,
"width": 1366.0,
"height": 406.0
}
]
},
{
"type": "selected",
"time": 80,
"noIncr": true,
"list": [
{
"x" : 3348.0,
"y": 14.0,
"width": 1651.0,
"height": 252.0
}
]
},
{
"type": "selected",
"time": 80,
"noIncr": true,
"list": [
{
"x": 2732.0,
"y": 0.0,
"width": 1366.0,
"height": 406.0
}
]
}
]
}
}
}
Loading
Loading