Forged Alliance Forever

Re: Need help making changes to the in game lobby

2016-05-23T15:26:08+02:00

justify wrote:
I submitted a pull request now. Thanks!

Ok. So the workflow is the one stated here:
https://github.com/FAForever/fa/blob/de ... IBUTING.md

Is there any simple way to keep my fork up to date with the original source?
Or Do I have to do it like in step 3 of this tutorial:
https://2buntu.com/articles/1459/keepin ... am-source/

You have to do it that way

Statistics: Posted by Aulex — 23 May 2016, 15:26

Re: Need help making changes to the in game lobby

2016-05-23T13:52:29+02:00

Yah. Well. So basicly I have to start all over again.

Statistics: Posted by CavemanHost — 23 May 2016, 13:52

Re: Need help making changes to the in game lobby

2016-05-23T12:56:12+02:00

I submitted a pull request now. Thanks!

Ok. So the workflow is the one stated here:
https://github.com/FAForever/fa/blob/de ... IBUTING.md

Is there any simple way to keep my fork up to date with the original source?
Or Do I have to do it like in step 3 of this tutorial:
https://2buntu.com/articles/1459/keepin ... am-source/

Statistics: Posted by CavemanHost — 23 May 2016, 12:56

Re: Need help making changes to the in game lobby

2016-05-23T11:49:38+02:00

ok so for me this is kinda how it works:

1. create a fork of the fa repo (you can also save it to your pc as a repo and use it as your own copy, ect. i can explain about that separately.)
2. put your changes into your branch, make it all how you want, ect. make sure you change the right branch (the one you want your pull requst to go to) ask icedreamer which branch.
3. go to here: https://github.com/FAForever/fa/compare
4. press compare across forks
5. select your fork and branch, and compare it to the fa branch you want to pull request into
6. create pull request.
7. hope for the best

Statistics: Posted by Exotic_Retard — 23 May 2016, 11:49

Re: Need help making changes to the in game lobby

2016-05-23T10:37:07+02:00

Can't create pull requests. The git desktop app says I don't have permssions to do so.

Statistics: Posted by CavemanHost — 23 May 2016, 10:37

Re: Need help making changes to the in game lobby

2016-05-23T07:06:38+02:00

I got a unkown System message error on the Client side, after implementing the Player swap via click & click. Have to work out why that happens, but I can merge the Rating Label code.

Statistics: Posted by CavemanHost — 23 May 2016, 07:06

Re: Need help making changes to the in game lobby

2016-05-23T01:39:21+02:00

Gimme that PR, and I will be very glad to merge it in for you

EDIT: Target develop branch please.

Statistics: Posted by IceDreamer — 23 May 2016, 01:39

Re: Need help making changes to the in game lobby

2016-05-21T15:24:36+02:00

ok so the way things work is kinda like this:
im assuming you know how to use git in general. no need for super advanced stuff; really basic ui knowledge will do.

in faf we use a development model that looks something like this:
http://nvie.com/posts/a-successful-git-branching-model/

we have a develop branch and a master branch. when you want to add some feature or whatnot you can take a copy of that branch, put your changes in and then merge it with a pull request. a pull request is just like a merge except its tagged with a "check me please".

having just said that, in reality our fa branching is a total mess xD

just ask icedreamer on which branch to take and what to merge into. i suspect it will be release/3654 but no promises.

(personally i just give code to him in pastebin/make him do it for me/cry about sth and hope it gets fixed, but im not super much of a coder so theres that too xD)

Statistics: Posted by Exotic_Retard — 21 May 2016, 15:24

Re: Need help making changes to the in game lobby

2016-05-20T17:09:46+02:00

a rating of 3200 Oo

Statistics: Posted by keyser — 20 May 2016, 17:09

Re: Need help making changes to the in game lobby

2016-05-20T15:46:24+02:00

Look at this magic.

Statistics: Posted by CavemanHost — 20 May 2016, 15:46

Re: Need help making changes to the in game lobby

2016-05-20T14:32:28+02:00

I actually do need help with git. What is the work flow for submitting changes to faf? Do I use my own fork for that? Or do I work in a branch of the actual repository of FAF?

Statistics: Posted by CavemanHost — 20 May 2016, 14:32

Re: Need help making changes to the in game lobby

2016-05-20T11:28:36+02:00

i kinda really like the idea of drag and drop on the map directly.
i do suspect lots of potential issues but i hope this will come to something.

the size constraint certainly does make things interesting, but not impossible.
we can also look at the option of a "widescreen" setting so those with large screens can use more of them, or some kind of size adjustment.

some initial thoughts:
option to hide all the details from the map preview - so you can see the map without obstruction just like the large preview currently works.
the columns in the tables probably need to all stay, and they do take quite a bit of space. for small screens this is indeed an issue.

this has my support, good luck with it, if you need any sort of help or advice dont hesitate to ask.

Statistics: Posted by Exotic_Retard — 20 May 2016, 11:28

Re: Need help making changes to the in game lobby

2016-05-20T11:24:14+02:00

IceDreamer wrote:
There simply isn't enough space to do it, because we're limited by having to support a minimum 1280*1024 resolution or something dumb and old.

Yeah unfortunatly.

I did some experiments yesterday. I think it is possible to decrease the size of the table of players just enough so make the map preview double its size.

If it is possible to have that label beside the commander symbol (with the functionality of the table of players), it should in theory be possible to get rid of the table of players. And that would free up a lot of screen space.

Drag and drop is not doable without getting the position of the mouse cursor, unfortunatly. But it should be possible to do something like this:
1 Click on not empty spot on the map preview
2 Store slot number
3 Click on another not empty spot on the map preview
4 Swap players

Statistics: Posted by CavemanHost — 20 May 2016, 11:24

Re: Need help making changes to the in game lobby

2016-05-20T05:09:01+02:00

*COUGH* 1366x768 *COUGH*

Statistics: Posted by speed2 — 20 May 2016, 05:09

Re: Need help making changes to the in game lobby

2016-05-20T04:16:59+02:00

I tried a similar layout in testing when I redesigned the lobby about a year ago. There simply isn't enough space to do it, because we're limited by having to support a minimum 1280*1024 resolution or something dumb and old. If we could tell those with monitors from 1985 to go away, and support a minimum of 1980*1080, we could do SO MUCH MORE

Statistics: Posted by IceDreamer — 20 May 2016, 04:16