Skip to content

Commit

Permalink
CLIENT-MENU: Create Servers from GUI / Add menu music (#142)
Browse files Browse the repository at this point in the history 
* CLIENT-MENU: Add the possibility for client to create servers
MINOR

* FORMAT-AUTO: automatic format on pull request #142

* CLIENT-MENU: Add a little text to indicate scene + fix quiGame bug
MINOR

* CLIENT-MENU: Fix bad merging conflicts
PATCH

* CLIENT-MENU: Now client can create only 1 server
MINOR

* CLIENT-MENU: Fix windows compilation
PATCH

* FORMAT-AUTO: automatic format on pull request #142

* FORMAT-AUTO: automatic format on pull request #142

* CLIENT-MENU: Now users can choose parallax
MINOR

* FORMAT-AUTO: automatic format on pull request #142

* CLIENT-GAME: Fix compile

* FORMAT-AUTO: automatic format on pull request #142

* CLIENT-MENU: Now users can choose parallax
MINOR

* FORMAT-AUTO: automatic format on pull request #142

* CLIENT-GAME: Add music menu / Remove debug

* CLIENT-MENU: Now users can choose parallax
MINOR

* FORMAT-AUTO: automatic format on pull request #142

* CLIENT: Remove log unused

PATCH

* CLIENT-MENU: Now users can know if they already create a server
MINOR

* CLIENT-MENU: Now users can click on a button to exit programm
MINOR

* FORMAT-AUTO: automatic format on pull request #142

* CLIENT-MENU: Modif text button
MINOR

* CLIENT-MENU: Modif now text button can reappeared even if the scene is changed
MINOR

* FORMAT-AUTO: automatic format on pull request #142

* CLIENT-MENU: Modif now it s working
MINOR

---------

Co-authored-by: Github Actions <github-actions[bot]@users.noreply.github.com>
Co-authored-by: tenshi <[email protected]>
Co-authored-by: Xavier Mitault <[email protected]>
  • Loading branch information
@KitetsuK @github-actions
@TTENSHII @Saverio976
4 people authored Nov 5, 2023
1 parent 74b73e8 commit a335e49
Show file tree
Hide file tree
Showing 23 changed files with 1,133 additions and 53 deletions.
Binary file added assets/Audio/Musics/home.mp3
View file
Binary file not shown.
71 changes: 71 additions & 0 deletions assets/Json/createLobby.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,67 @@
}
]
},
{
"type": "button",
"callback": "changeParallax",
"spritePath": "assets/Menu/button.png",
"width": 1500,
"height" : 750,
"rect": {
"x": 51.0,
"y": 51.0,
"width": 1265.0,
"height": 305.0
},
"position" : {
"x": 8000,
"y": 500
},
"collisionRect": {
"width": 1500,
"height": 750,
"offsetX": 0,
"offsetY": 0
},
"animRect": [
{
"type": "hover",
"time": 80,
"noIncr": true,
"list": [
{
"x" : 1416.0,
"y": 49.0,
"width": 1267.0,
"height": 307.0
}
]
},
{
"type": "selected",
"time": 80,
"noIncr": true,
"list": [
{
"x" : 2759.0,
"y": 31.0,
"width": 1303.0,
"height": 340.0
}
]
}
]
},
{
"type": "text",
"color": "red",
"size": 1.5,
"text": "PARALLAX_1",
"position" : {
"x": 8300,
"y": 800
}
},
{
"type": "text",
"text": "Go Back",
Expand Down Expand Up @@ -284,6 +345,16 @@
]
}
]
},
{
"type": "text",
"color": "red",
"size": 2,
"text": "CREATE LOBBY",
"position" : {
"x": 4150,
"y": 500
}
}
]
}
312 changes: 312 additions & 0 deletions assets/Json/createServer.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,312 @@
{
"createServerMenu": [
{
"type": "button",
"spritePath": "assets/Menu/button.png",
"width": 1600,
"height": 1000,
"callback": "goToMenu",
"rect": {
"x": 0.0,
"y": 0.0,
"width": 1366.0,
"height": 406.0
},
"position": {
"x": 100,
"y": 500
},
"collisionRect": {
"width": 1600,
"height": 1000,
"offsetX": 0,
"offsetY": 0
},
"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
}
]
}
]
},
{
"type": "button",
"callback": "changeParallax",
"spritePath": "assets/Menu/button.png",
"width": 1500,
"height" : 750,
"rect": {
"x": 51.0,
"y": 51.0,
"width": 1265.0,
"height": 305.0
},
"position" : {
"x": 8000,
"y": 500
},
"collisionRect": {
"width": 1500,
"height": 750,
"offsetX": 0,
"offsetY": 0
},
"animRect": [
{
"type": "hover",
"time": 80,
"noIncr": true,
"list": [
{
"x" : 1416.0,
"y": 49.0,
"width": 1267.0,
"height": 307.0
}
]
},
{
"type": "selected",
"time": 80,
"noIncr": true,
"list": [
{
"x" : 2759.0,
"y": 31.0,
"width": 1303.0,
"height": 340.0
}
]
}
]
},
{
"type": "text",
"color": "red",
"size": 1.5,
"text": "PARALLAX_1",
"position" : {
"x": 8300,
"y": 800
}
},
{
"type": "text",
"text": "Go Back",
"color": "red",
"size": 2,
"position": {
"x": 525,
"y": 875
}
},
{
"type": "text",
"color": "red",
"size": 2,
"text": "YOU CAN CREATE A NEW SERVER HERE",
"position" : {
"x": 2670,
"y": 1700
}
},
{
"type": "text",
"color": "red",
"size": 2,
"text": "JUST INDICATE US THE PORT OF YOUR SERVER",
"position" : {
"x": 2250,
"y": 2000
}
},

{
"type": "text",
"color": "red",
"size": 2,
"text": "PORT (ex: 4242)",
"position" : {
"x": 2450,
"y": 3650
}
},
{
"name": "port",
"type": "input",
"font": "assets/Fonts/soliden/SolidenTrial-Black.otf",
"spritePath": "assets/Menu/input-box.png",
"text": "4242",
"color": "white",
"textSize": 3,
"maxChar": 8,
"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": 6000,
"height": 800,
"offsetX": 0,
"offsetY": 0
},
"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
}
]
}
]
},
{
"type": "text",
"color": "white",
"size": 2,
"text": "CREATE",
"position" : {
"x": 4200,
"y": 6500
}
},
{
"type": "button",
"spritePath": "assets/Menu/button.png",
"callback": "createServer",
"width": 2500,
"height" : 1250,
"rect": {
"x": 0.0,
"y": 0.0,
"width": 1366.0,
"height": 406.0
},
"position": {
"x": 3400,
"y": 6000
},
"collisionRect": {
"width": 2500,
"height": 1250,
"offsetX": 0,
"offsetY": 0
},
"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
}
]
}
]
},
{
"type": "text",
"color": "red",
"size": 2,
"text": "CREATE SERVER",
"position" : {
"x": 3800,
"y": 500
}
}
],
"errorMessage": {
"type": "text",
"color": "red",
"size": 2,
"text": "SERVER ALREADY CREATED",
"position" : {
"x": 3200,
"y": 8500
}
}
}

Loading

0 comments on commit a335e49

Please sign in to comment.