-
Notifications
You must be signed in to change notification settings - Fork 274
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
Code Driven Dialog Boxes [Ready] #659
Code Driven Dialog Boxes [Ready] #659
Conversation
52 commits to Update
Keyboard Script Refactor Moved Code from World into Keyboard for time control
… Dev-20160822 # Conflicts: # Assets/Scripts/Controllers/WorldController.cs
All Dialog Boxs are now code driven
… Test-More-Dev # Conflicts: # Assets/_SCENE_.unity
Please explain exactly how to make a dialog box in your new system. If this change does go through we all need to know how to work the new UI |
First off sorry im on my phone I will make a pdf with picture if it gets accepted. How To make a new Dialog Box
How to open your dialog box (from a button)
|
@bjubes - done |
Marked as [WIP], more commits incoming. |
No, its not a work in progress. Spliting up the uploads as to keep the changes smaller so it wont conflict with othere PR's |
Hoping this will get accepted in the next couple hours then I can have a fresh branch to work on the other changes when I get home and all will be done tonight. This way by this time tomorrow no more SCENE changes.YAY!!!!!!!!!! 👍 :) |
I will be closing this pull in about 2.5 hours from now. I just though getting the UI out of the SCENE was IMPORTANT. |
@dustinwloring1988 This can't be merged because it conflicts. If you can fix these then we can properly look at it and (hopefully) merge it. |
When I get home I will fix it once that is it I'm not going to keep fixing it over and over it's been up for 24 hours and needs posted or it's obvious that nobody wants it |
You have to understand that this young project is moving extremely rapidly, everything is volatile. Scene changes is a known problem and this is and extreme example. If you're tired of playing catch up with the other work, maybe find someone that can pick this up? Or maybe find someone to just test it. While there are a few us that can actually merge it, anyone can test it. Finding someone thats willing to pull your branch, test it, and come here and formally vouch for it would speed it up greatly. |
… Test-More-Dev # Conflicts: # Assets/Scripts/UI/InGameUI/MenuController.cs # Assets/_SCENE_.unity
@WardBenjamin @Mizipzor It works now |
Please commit so I can finish the UI stuff so we dont have conflicts with the SCENE anymore it is driving me crazy |
Other than the following:
Not sure if these are in the scope but they do work in master. |
Those will be the first 2 I fix just I just dont want to make this commit change any more files |
@svmnotn - Thanks for testing it |
Looks good! Please do fix those issues though.... better to get this merged now though. Merging! |
I know this is a rather big merge but I think it will be for the better since it was focused on making the UI more code driven like @quill18, and I think most of us, wanted from the start.
Other small changes to make the UI more code driven
After this get accept I should have another ready tomorrow after work that will finish up making the UI "more"code driven.
YAY FINALLY!!!!!!!!!!!