search

Nashet / Prosperity-Wars

Game-like agent based economy simulator
GNU General Public License v3.0
251 stars 41 forks source link

Better code styling. #464

Closed dillyo09 closed 6 years ago

dillyo09 commented 6 years ago

Cleaned up the inconsistency with the code styling.

Nashet commented 6 years ago

Hi! I merged your commits here cause there was some conflicts: #466 I'm not very experience with Git so I did it as I can.

I'm wondering, what program you used for code styling? Also, feel free to ask me about the code.

dillyo09 commented 6 years ago

I use a mix between CodeMaid & Resharper.

dillyo09 commented 6 years ago

I am also very inexperience with pull requests in general.

Nashet commented 6 years ago

I probably had to push your commits first, then apply mine. BTW, don't know if you are experience with Unity but thing is that UI forms stored in binary format so they can't be merged if case of conflict, as I understand.

dillyo09 commented 6 years ago

I believe the UI should be prefab so that way it can change without a merge conflict.