These are chat archives for anderspitman/dice-game

16th
Apr 2016
sarahka7
@sarahka7
Apr 16 2016 00:08
Okay im in github on readme. "Clone this repo using git" so i need to re-fork? To have most up-to--date version
Hi, okay I'm in GitHub now- in Readme. @anderspitman @mshannahnv - anyone available for a walkthru?
Anders Pitman
@anderspitman
Apr 16 2016 00:09
Had one inline comment @mshannahnv. Also, in general it help to do large formatting fixes (like changing indentation) in separate PRs. Otherwise it makes it hard to see what functionality got changed during review. Thanks!
@sarahka7 you should be able to use your original clone
do you still have a dice-game directory?
sarahka7
@sarahka7
Apr 16 2016 00:10
yes
Anders Pitman
@anderspitman
Apr 16 2016 00:11
cool. just go in there and do a git pull upstream master. That should bring you up to date
sarahka7
@sarahka7
Apr 16 2016 00:13
in cygwin right? okay now what if I
I'm on a Windows comp w/o Cgywin?
Anders Pitman
@anderspitman
Apr 16 2016 00:13
without cygwin you'll need another git client
there are a couple different options on windows, but I'm not really familiar with any of them
sarahka7
@sarahka7
Apr 16 2016 00:14
ah, got it okay lemme get cygwin on here- 1 sec.
Anders Pitman
@anderspitman
Apr 16 2016 00:18
@mshannahnv other than the one suggestion I just playtested and everything looks great! If you can't do that refactor tonight I'd say let's just merge this and maybe we can do it next week if we have time. functionally everything is good
@chcschmid what's your status?
@sarahka7 how did you clone the repo without git?
Christiaan Schmid
@chcschmid
Apr 16 2016 00:22
Just got home and working on the getPlayerStats() method
sarahka7
@sarahka7
Apr 16 2016 00:25
@anderspitman oh I'm just on a different desktop than the one I original used, but if I get cygwin installed, I should be okay to test on it right?
Anders Pitman
@anderspitman
Apr 16 2016 00:28
probably. I'm just curious how you have the dice-game on that computer. You must have had git on there at some point. or are you using a flash drive?
@chcschmid cool I'm working on those changes to the db we talked about. I'll get a PR up ASAP so you can work off the latest version
sarahka7
@sarahka7
Apr 16 2016 00:31
i'm at my parents now house so totally different computer. I just finished installing cygwin but need help connecting to git.
I'm viewing dice-game from the github website-
Anders Pitman
@anderspitman
Apr 16 2016 00:35
ah gotcah
gotcha**
that makes more sense
just so you know you can install cygwin on a flash drive then carry it around with you so you don't have to install it on different computers
sarahka7
@sarahka7
Apr 16 2016 00:36
oooh! i like that idea.
i can get to my own computer it just might be in an hour or so
Anders Pitman
@anderspitman
Apr 16 2016 00:37
once you have cygwin installed with git, you should just need to run the following:
git clone https://github.com/sarahka7/dice-game
cd dice-game
git remote add upstream https://github.com/anderspitman/dice-game
git pull upstream master
it's up to you, whatever's easiest
@chcschmid if you can review #65 that should have what you need
Christiaan Schmid
@chcschmid
Apr 16 2016 00:41
Alright I think it looks good. You may need to help me real quick with getting everything into an appropriate branch. Before I pull your changes I want to create a new branch, right? with the changes I've implemented so far?
Anders Pitman
@anderspitman
Apr 16 2016 00:41
yup. here's what you do. git checkout -b BRANCH-NAME
then commit whatever you have
Christiaan Schmid
@chcschmid
Apr 16 2016 00:42
Then pull your PR and merge it into my new working branch?
Anders Pitman
@anderspitman
Apr 16 2016 00:42
then git checkout master and git pull upstream master
then git checkout BRANCH-NAME and git merge master
if it says there are merge conflicts go into the files that have conflicts and fix them manually
then save and commit
and keep working on your branch
Christiaan Schmid
@chcschmid
Apr 16 2016 00:45
Got it. Thanks!
Anders Pitman
@anderspitman
Apr 16 2016 00:46
np. did it work?
sarahka7
@sarahka7
Apr 16 2016 00:47
@anderspitman I need a add-on in Cygwin for Github don't I?
grrr. okay maybe I'll wait to get home sorry. Don
I will check back here!
Anders Pitman
@anderspitman
Apr 16 2016 00:50
when you run the cygwin installer you can go into the devel options and select git
Christiaan Schmid
@chcschmid
Apr 16 2016 00:50
Yep, it did. I had an indian friend on YouTube help me remember how to commit lol.
Christiaan Schmid
@chcschmid
Apr 16 2016 01:02
@anderspitman Can you help me understand this at the bottom of Database.java?
class ConcreteDatabase extends Database {
    public RollRecord[] getAllRecords() {
        return new RollRecord[1];
    }

    public RollRecord[] getRecordsForUser(String userId) {
        return new RollRecord[1];
    }
}
what is RollRecord[1]?
Anders Pitman
@anderspitman
Apr 16 2016 01:03
that's just a placeholder
since it needs to return an array I just allocated one with length 1
but what you'll most likely do for the real deal is create an ArrayList<RollRecord> and loop through and append (using add) to it, then at the end you'll convert it to an array and return it, like I'm doing in getPlayerList
Christiaan Schmid
@chcschmid
Apr 16 2016 01:05
gotcha
sarahka7
@sarahka7
Apr 16 2016 01:19
@anderspitman Okay back on my own laptop now. So I just followed the commands and 28 files updates, so that worked. Then I typed in ./gradlew check and it's downloading a bunch of dots and lines... now it just said build failed.
Anders Pitman
@anderspitman
Apr 16 2016 01:20
try ./gradlew clean then check again
Christiaan Schmid
@chcschmid
Apr 16 2016 01:20
Is there anyway we can have variable that keeps track of the total number of lines in the database?
Anders Pitman
@anderspitman
Apr 16 2016 01:21
@chcschmid an easy hack would be to call getAllRecords and check the length of the array returned. Not super efficient but safe and easy
Christiaan Schmid
@chcschmid
Apr 16 2016 01:22
cool cool
sarahka7
@sarahka7
Apr 16 2016 01:22
@anderspitman okay got another "Build Failed" "Execution failed for task ':shared:compilJava'. Could not find tools.jar
Anders Pitman
@anderspitman
Apr 16 2016 01:22
you can add a method getRowsCount that does that under the hood. That way if we come up with a more efficient way later we just have to change that method and not the places that call it
deja vu
I think @chcschmid had that one
something to do with the JAVA_HOME on path I think
Christiaan Schmid
@chcschmid
Apr 16 2016 01:23
Yeah @sarahka7 , let me find the link that Anders sent me.
The third answer was what I used to fix the issue
sarahka7
@sarahka7
Apr 16 2016 01:25
@chcschmid cool thx!
Christiaan Schmid
@chcschmid
Apr 16 2016 01:30
@sarahka7 If you have Windows 10 just search System Variables and select edit the system environment variables. Then select click on the button Environment Variables. I wasn't sure how to get there at first.
sarahka7
@sarahka7
Apr 16 2016 02:16
@chcschmid ty! that was helpful.
@anderspitman Okay the build was successful. Ready for next step- is this where I use ./gradlew :cli: run?
Christiaan Schmid
@chcschmid
Apr 16 2016 02:17
If the build was successful then it should work
Anders Pitman
@anderspitman
Apr 16 2016 02:21
@sarahka7 yeah, ./gradlew :cli:run and ./gradlew :gui:run
not sure if the gui will work in cygwin or not
if not you can run it from windows
just navigate to the directory in command prompt and do gradlew :gui:run
sarahka7
@sarahka7
Apr 16 2016 02:24
great okay i'm seeing the text and playing around. how can i see the gui version?
Anders Pitman
@anderspitman
Apr 16 2016 02:24
did you try the gui command above?
sarahka7
@sarahka7
Apr 16 2016 02:26
oops glossed right over that- yep got it working.
Anders Pitman
@anderspitman
Apr 16 2016 02:26
nice! does it work from cygwin
?
sarahka7
@sarahka7
Apr 16 2016 02:26
yes
well... it shows, and I can press btns, but it doesn't function
I get runExceptions
Anders Pitman
@anderspitman
Apr 16 2016 02:27
hm
try it directly from windows
sarahka7
@sarahka7
Apr 16 2016 02:31
okay so for windows do i use the command prompt (black box)
Anders Pitman
@anderspitman
Apr 16 2016 02:31
yeah
you can use cd just like linux, but use dir instead of ls
sarahka7
@sarahka7
Apr 16 2016 02:34
okay and what is my destination folder/file?
Anders Pitman
@anderspitman
Apr 16 2016 02:34
wherever your dice-game folder is
sarahka7
@sarahka7
Apr 16 2016 02:34
ah ok
Anders Pitman
@anderspitman
Apr 16 2016 02:38
@mshannahnv and @hehe876 I merged both of your PRs. Functionally they were fine and I needed the features for my changes. @hehe876 it would be good if you could roll the small couple of fixes into your next PR
Christiaan Schmid
@chcschmid
Apr 16 2016 02:55
@anderspitman do you think we could do a screen share and work on one of these functions together? I still feel a little lost with all the back-end data getting thrown around between classes. Sorry...
Anders Pitman
@anderspitman
Apr 16 2016 03:02
sure np
just call me in hangouts
Christiaan Schmid
@chcschmid
Apr 16 2016 03:06
Can I just do a voice call or does it need to be video?
Anders Pitman
@anderspitman
Apr 16 2016 03:07
video
for the screen share
Christiaan Schmid
@chcschmid
Apr 16 2016 03:08
lol
Anders Pitman
@anderspitman
Apr 16 2016 03:08
you call me. I will wait
sarahka7
@sarahka7
Apr 16 2016 03:29
@anderspitman hey when done can u pls help me I'm accidentally deleted my dice-folder, and have been trying to re-install it, but get a message to commit changes before I merge or something..
ho hurry
no hurry
Anders Pitman
@anderspitman
Apr 16 2016 03:31
hm
what was the method whereby it was deleted?
sarahka7
@sarahka7
Apr 16 2016 03:39
I had two copies of dice-folder - one in cygwin folder and one on my desktop. Accidentally deleted the wrong one (current one). So trying to get the current versions back
but when i did git pull upstream master (from ~/dice-game) I got an error to that "your local changes to the following files would be overwritten by merge- please commit your changes or stash them before you can merge."
Anders Pitman
@anderspitman
Apr 16 2016 03:43
are you sure you had 2 different copies, or just 2 views (windows and cygwin) into the same one?
sarahka7
@sarahka7
Apr 16 2016 03:45
I think two different copies of the folder. Only the one in my C:\cygwin64\home\circl\dice-game was current with todays date
The files in the desktop folder were from last week
maybe I should remove all my dice-folders and re-fork/re-pull?
Anders Pitman
@anderspitman
Apr 16 2016 03:48
ah ok
nah I think we can probably fix it
it will be a good exercise
do a git diff to see what the changes are it's complaining about
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 03:50
Feel free ot review #66
Just contains javadocs/documentaiton
sarahka7
@sarahka7
Apr 16 2016 03:53
whoa theres like everything different
Anders Pitman
@anderspitman
Apr 16 2016 03:54
do a git status and post the output
sarahka7
@sarahka7
Apr 16 2016 03:59
ok how do I post output again? in the black bubble format you all use?
Anders Pitman
@anderspitman
Apr 16 2016 03:59
three backticks (left of 1 key) before and after the output
sarahka7
@sarahka7
Apr 16 2016 04:00
ok thx
is there a trick to copy text from cygwin and paste in here?
or do i just need to retype manually
Anders Pitman
@anderspitman
Apr 16 2016 04:02
I'm sure you can. I would just google it
sarahka7
@sarahka7
Apr 16 2016 04:02
test
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 04:02
I'm getting NumberFormatException when I play GUI
and press ROLL button
Anders Pitman
@anderspitman
Apr 16 2016 04:02
@mshannahnv make sure you enter the number of dice
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 04:03
;-;
sarahka7
@sarahka7
Apr 16 2016 04:07
image.png
Anders Pitman
@anderspitman
Apr 16 2016 04:09
weird
yeah I would just start fresh if there aren't any changes you made that you need in there. Rename that folder and keep it around for a while just in case
sarahka7
@sarahka7
Apr 16 2016 04:09
ok
Nguyen Dao
@ngdao
Apr 16 2016 04:12
formating the strings sucks!
Anders Pitman
@anderspitman
Apr 16 2016 04:13
lol
don't worry too much about it
Nguyen Dao
@ngdao
Apr 16 2016 04:14
blob
txaStat.setText(
               "Cumulative score:"+"                "
                       + thisPlayerStat.getCumulativeScore() + "\n"
              +"Average score:"+"                   "
                       + thisPlayerStat.getAvgScore() + "\n"
              +"Average number of dice used:"+"     " 
                       + thisPlayerStat.getAvgNumDiceUsed() +"\n"
              +"Total Roll:"+"                      "
                       + thisPlayerStat.getTotalRolls() + "\n"
              +"Average rolls per game:"+"          "
                       + thisPlayerStat.getAvgRollsPerGame() + "\n");
Anders Pitman
@anderspitman
Apr 16 2016 04:17
lol
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 04:17
I would leave it without tabs
Anders Pitman
@anderspitman
Apr 16 2016 04:17
you need a monospace font
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 04:18
I'm trying to fix that roll button exception
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 04:30
@hehe876 I fixed the roll button not throwing an exception if the field is blank, it now pops up your pop up message
    private void btnRollActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnRollActionPerformed
        String diceText = txtDiceNumber.getText();

        if (diceText.matches("[1-3]")) {
            int diceNumber = Integer.parseInt(diceText);
            enableDie(diceNumber);

            dieAnimation(diceNumber);

            txtDiceNumber.setEnabled(false);
            btnStop.setEnabled(true);
            btnRoll.setEnabled(false);
        }
        else
        {
            JOptionPane.showMessageDialog(null, "Please enter a number from 1-3", "Invalid Input",
            JOptionPane.OK_OPTION);
        }
    }//GEN-LAST:event_btnRollActionPerformed
sweet RegEx
Not sure if you want me to commit or have you add it in on your end
??
Christiaan Schmid
@chcschmid
Apr 16 2016 04:33
@anderspitman getCumulativeScore() returns the final score of all games added together?
Anders Pitman
@anderspitman
Apr 16 2016 04:34
yeah
I think so
Nguyen Dao
@ngdao
Apr 16 2016 04:34
@mshannahnv thanks, let me put it on my end so we don't get conflicts
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 04:35
:thumbsup:
Anders Pitman
@anderspitman
Apr 16 2016 04:35
fight, fight, fight
Nguyen Dao
@ngdao
Apr 16 2016 04:36
tch, trying to steal my GUI glory aintcha? hahaha
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 04:37
Nooo!!
Nguyen Dao
@ngdao
Apr 16 2016 04:38
haha jk. It's kinda sad that this is the best thing I can do friday night lol
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 04:40
@sarahka7 Did you get everything up and running?
sarahka7
@sarahka7
Apr 16 2016 04:44
Heya- yep. Was able to test out the gui and cli in cgywin and getting my notes/rubric together. I will keep the categories broad like Anders mentioned earlier so we can retest easily with the same criteria. I'm going to also try and get it running in Windows now.
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 04:44
Sweet!
sarahka7
@sarahka7
Apr 16 2016 04:44
You guys have done an AMAZING job- it's really good!
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 04:46
Yeah! We all make a good team
:D
Christiaan Schmid
@chcschmid
Apr 16 2016 04:47
How do you do emoticons in here?
very important question
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 04:48
:
Christiaan Schmid
@chcschmid
Apr 16 2016 04:48
:)
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 04:48
Just found that
It's HUGE!
Christiaan Schmid
@chcschmid
Apr 16 2016 04:49
:lips:
lol
nice
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 04:50
:octopus:
sarahka7
@sarahka7
Apr 16 2016 04:52
/play trololo
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 04:53
hahah I was so excited for sounds - it only works in "Campfire" whatever that is
sarahka7
@sarahka7
Apr 16 2016 04:53
oh darn!!! lol!
Okay so now to run the cli/gui in windows command prompt--- I navigated to the fold were my dice-game lives. Command prompt reads: C:\cygqin64\home\circl\dice-game>
so do i just add gradlew: cli:run ???
Christiaan Schmid
@chcschmid
Apr 16 2016 04:55
yes, but it should be gradlew :cli:run
the colon before cli
sarahka7
@sarahka7
Apr 16 2016 04:56
ah thx!
worked
Christiaan Schmid
@chcschmid
Apr 16 2016 04:56
booya!!
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:01
@hehe876 What do you think about preventing users from entering names that contain integers/special characters? Something like the following would only accept 3-character initials like, "ABC"
    private void formWindowOpened(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_formWindowOpened
       String name;
       do{
           name = JOptionPane.showInputDialog(null, "What are your initials (3-characters)?");
           if (name == null)
               System.exit(0);
           if (name.length() != 3 || !name.matches("[a-zA-Z]+"))
               JOptionPane.showMessageDialog(null, "Invalid Input, must contain 3 alpha characters!", "Invalid Input",
               JOptionPane.OK_OPTION);
       } while (name.length() != 3 || !name.matches("[a-zA-Z]+"));

       lblPlayerName.setText(name);
    }//GEN-LAST:event_formWindowOpened
sarahka7
@sarahka7
Apr 16 2016 05:08
Windows cli/gui checked out good- writing up my user test results now and then will try to do the pull request to get it loaded up.
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:09
@/all I submitted our link on Blackboard
sarahka7
@sarahka7
Apr 16 2016 05:09
ty!
Christiaan Schmid
@chcschmid
Apr 16 2016 05:09
Merci
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:09
Any exceptions or crazy bugs so far @sarahka7 ?
Nguyen Dao
@ngdao
Apr 16 2016 05:12
@mshannahnv Since you already written up the code, might as well use it lol. I think it's a good idea, just haven't got around to do it yet
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:12
@hehe876 I'm just bored over here
lol
Nguyen Dao
@ngdao
Apr 16 2016 05:14
are done with the mock data for CLI already?
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:15
Yeah I finished leaderboard and statistics page
with mock data
it's a lot easier to implement in CLI
You got the hard job!
@hehe876 What time are you going to be done for the night? We'll need to merge your pR
Nguyen Dao
@ngdao
Apr 16 2016 05:16
and guys, since the player list is a String Array, I can only list it as a drop down menu, won't be as pretty as a list to choose from
I'll work on it for another hour
sarahka7
@sarahka7
Apr 16 2016 05:16
I'm sure you guys are working on these, but gui is allowing 3 numbers for player name, cli in cygwin is working really well, but could use some line formatting to keep words from breaking up at end of line, not an issue in the windows cli. Also do we want a default num of dice for the gui- similar to cli. I was able to hit roll w/o entering a number of dice. That's prob. most major stuff. I'll include some usability comments too. @/all
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:17
Is your cygwin a small window @sarahka7 ?
Or is it happening even when it's a maximized window?
sarahka7
@sarahka7
Apr 16 2016 05:17
yeah, i maximized it, but it is on a surface pro- so that might be why line breaks?
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:18
Because I did notice that for small windows
Maybe! I could also try to decrease some of the columns
sarahka7
@sarahka7
Apr 16 2016 05:18
I'll take a screen shot - 1 sec
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:19
@hehe876 I don't even think you need to finish everything tonight. Just whatever your next stopping point is. We still have all next week
Nguyen Dao
@ngdao
Apr 16 2016 05:20
I'll push what I have now
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:20
:thumbsup:
Nguyen Dao
@ngdao
Apr 16 2016 05:20
only the leader board and formating left
sarahka7
@sarahka7
Apr 16 2016 05:21
Hey nm! It's fitting beautiful now. Must have fixed up when I re-downloaded earlier.
Anders Pitman
@anderspitman
Apr 16 2016 05:27
Man the DB has been kickin my trash
I think it's basically working now though
#68 needs review
in the worst way
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:28
:clap:
Christiaan Schmid
@chcschmid
Apr 16 2016 05:28
@anderspitman I just finished getAllStats()
Anders Pitman
@anderspitman
Apr 16 2016 05:28
@chcschmid great!
that means you're done
because getPlayerStats is identical
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:28
@anderspitman this looks complicated
Anders Pitman
@anderspitman
Apr 16 2016 05:29
@mshannahnv it's not too bad, mostly just hacks within hacks to make it work
;)
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:30
@hehe876 Can you submit a PR for your latest commit/push?
Nguyen Dao
@ngdao
Apr 16 2016 05:31
I'm on it
how come my CLI is ahead of anders @.@
Anders Pitman
@anderspitman
Apr 16 2016 05:32
did you merge directly from @mshannahnv ?
or make your own changes?
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:32
yeah that's weird
even my master is behind anders
err.. my fork
whatever
Anders Pitman
@anderspitman
Apr 16 2016 05:33
your forks will stay behind unless you merge master
as master gets updated by merging PRs branches get further and further behind unless you periodically merge from master
@chcschmid I don't suppose you implemented getLeaderboard()?
Christiaan Schmid
@chcschmid
Apr 16 2016 05:35
I have not
Anders Pitman
@anderspitman
Apr 16 2016 05:35
k, no problem
we just need to use a built-in sort on it
Nguyen Dao
@ngdao
Apr 16 2016 05:35
PR #69 is ready
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:36
He has an old commit of mine in his PR
that's weird
Anders Pitman
@anderspitman
Apr 16 2016 05:37
I agree something is fishy here
master is correct
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:37
and all of my comments are gone
Nguyen Dao
@ngdao
Apr 16 2016 05:37
have you done something with your master anders?
Christiaan Schmid
@chcschmid
Apr 16 2016 05:37
:fish:
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:38
:crying_cat_face:
Anders Pitman
@anderspitman
Apr 16 2016 05:38
but for some reason that PR makes it look like master is behind
Nguyen Dao
@ngdao
Apr 16 2016 05:38
I only ever pull from anders master
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:38
Do you pull like.. git pull upstream master
Nguyen Dao
@ngdao
Apr 16 2016 05:38
yeah
the changes was at the first commit, when I merge from anders master
Anders Pitman
@anderspitman
Apr 16 2016 05:39
really weird. when I checkout your branch and compare it to my master locally it's fine
Nguyen Dao
@ngdao
Apr 16 2016 05:39
yeah, your remote master maybe behind?
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:40
What happens when you "git remote -v"
?
Anders Pitman
@anderspitman
Apr 16 2016 05:40
does the same thing when I try to do the PR for you
github is my remote master
and you can browse the code yourself, it's up to date
Nguyen Dao
@ngdao
Apr 16 2016 05:41
upstream https://github.com/anderspitman/dice-game.git (fetch)
upstream https://github.com/anderspitman/dice-game.git (push)
origin  https://github.com/hehe876/dice-game.git (fetch)
origin  https://github.com/hehe876/dice-game.git (push)
Anders Pitman
@anderspitman
Apr 16 2016 05:42
don't ask me why this works
ok fixed it
Nguyen Dao
@ngdao
Apr 16 2016 05:42
what is it comparing with lol
Anders Pitman
@anderspitman
Apr 16 2016 05:42
do this
git checkout -b BRANCH-NAME
git checkout master
git pull upstream master
git checkout BRANCH-NAME
git merge master
git push origin BRANCH-NAME
then do a PR on that branch
determined to keep it on master eh?
Eric no likey branches
Nguyen Dao
@ngdao
Apr 16 2016 05:46
you said to checkout master
lol
Anders Pitman
@anderspitman
Apr 16 2016 05:47
yeah
as 1 of 5 steps
lol
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:48
The exception is still in the code
Anders Pitman
@anderspitman
Apr 16 2016 05:48
oops
too late
Nguyen Dao
@ngdao
Apr 16 2016 05:48
oh yeah I forgot to copy it @mshannahnv
sowwy
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:48
I'll commit and PR
Nguyen Dao
@ngdao
Apr 16 2016 05:48
lol
Anders Pitman
@anderspitman
Apr 16 2016 05:48
8D
Nguyen Dao
@ngdao
Apr 16 2016 05:48
aight
Anders Pitman
@anderspitman
Apr 16 2016 05:49
@chcschmid what's your status on a PR?
Nguyen Dao
@ngdao
Apr 16 2016 05:49
blob
*side joke: is this the equivalent of "get a room" for gitter?
Anders Pitman
@anderspitman
Apr 16 2016 05:49
pretty much
Christiaan Schmid
@chcschmid
Apr 16 2016 05:50
I am currently thinking about how I am going to do that so I don't pull an Eric
Anders Pitman
@anderspitman
Apr 16 2016 05:50
hahaha!
Nguyen Dao
@ngdao
Apr 16 2016 05:50
gosh dang it
Anders Pitman
@anderspitman
Apr 16 2016 05:50
Step 1: use a branch
Christiaan Schmid
@chcschmid
Apr 16 2016 05:50
;)
Anders Pitman
@anderspitman
Apr 16 2016 05:50
just push it too a branch and do a PR
Christiaan Schmid
@chcschmid
Apr 16 2016 05:51
from that branch?
Anders Pitman
@anderspitman
Apr 16 2016 05:51
a PR doesn't have to be complete. you can push more commits to the branch and it will automatically update the PR
Nguyen Dao
@ngdao
Apr 16 2016 05:51
that was a mysterious time travel future stuff!
Christiaan Schmid
@chcschmid
Apr 16 2016 05:51
Sounds good
I'll give it a shot right now
Anders Pitman
@anderspitman
Apr 16 2016 05:51
I have a ton of taco meat I should cook but I really just wanna order pizza
Nguyen Dao
@ngdao
Apr 16 2016 05:52
you haven't had dinner?
Anders Pitman
@anderspitman
Apr 16 2016 05:52
not for a while
Christiaan Schmid
@chcschmid
Apr 16 2016 05:52
My wife brought me home Costco pizza. So good.
Anders Pitman
@anderspitman
Apr 16 2016 05:52
niiiice
Christiaan Schmid
@chcschmid
Apr 16 2016 05:52
Alright Anders, I created a branch called database
Anders Pitman
@anderspitman
Apr 16 2016 05:53
lol
Christiaan Schmid
@chcschmid
Apr 16 2016 05:53
I'm in github right now wanting to do PR
Anders Pitman
@anderspitman
Apr 16 2016 05:53
really?
that's what mine's called
Christiaan Schmid
@chcschmid
Apr 16 2016 05:53
yes.... sorry hahaha
Anders Pitman
@anderspitman
Apr 16 2016 05:53
no problem. we'll do yours first
btw has anyone started reviewing mine?
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:53
I was looking at it Anders
Anders Pitman
@anderspitman
Apr 16 2016 05:54
we need to get this integrated ASAP so we can work out any bugs
Nguyen Dao
@ngdao
Apr 16 2016 05:54
so was I
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:54
Can't we do the mock DB this week?
Christiaan Schmid
@chcschmid
Apr 16 2016 05:54
I don't see mine in my github page though...
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:54
err mock data?
Nguyen Dao
@ngdao
Apr 16 2016 05:54
but then I decide to play a League game before bed
Anders Pitman
@anderspitman
Apr 16 2016 05:54
hm
I guess we could
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:55
We have another week
Nguyen Dao
@ngdao
Apr 16 2016 05:55
we have 2 more weeks, because when the database is done, we're basically done
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:55
2 weeks?
Anders Pitman
@anderspitman
Apr 16 2016 05:55
let's see how it goes. we'll plan on leaving the mock data in, but if it somehow is rock solid we might as well use the reall deal
Nguyen Dao
@ngdao
Apr 16 2016 05:56
yesh, 2
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:56
I thought final submissionw as 4/22
I have conflicts in #71
I don't know what to do!
Nguyen Dao
@ngdao
Apr 16 2016 05:57
'The project is composed of three sprints, ending 4/1, 4/15, and 4/29'
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:57
ah
So it doesn't say we need Sprint Backlogs,right?
Anders Pitman
@anderspitman
Apr 16 2016 05:58
@mshannahnv git pull upstream master into your gui branch
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:58
$ git pull upstream master
From https://github.com/anderspitman/dice-game
 * branch            master     -> FETCH_HEAD
Auto-merging gui/src/main/java/DiceGameGUI.java
CONFLICT (content): Merge conflict in gui/src/main/java/DiceGameGUI.java
Automatic merge failed; fix conflicts and then commit the result.
Anders Pitman
@anderspitman
Apr 16 2016 05:58
if it still tells you merge conflicts just open the files it points out and manually fix the conflicts. then commit the merge
you can search the file for ">>>>>>" to find all the conflicts
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 05:59
ok
Anders Pitman
@anderspitman
Apr 16 2016 05:59
back in the day every merge had to be handled this way. That's part of the magic of git
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 06:02
So once I fix it
I pull upstream master again?
nvm
Anders Pitman
@anderspitman
Apr 16 2016 06:04
once you fix it push to gui again
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 06:05
please review #71
Opps
I accidentally deleted something in my conflict fix
Let me fix
Christiaan Schmid
@chcschmid
Apr 16 2016 06:10
regardez #72 s'il vous plaƮt
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 06:10
please review #71
for the last time :)
Christiaan Schmid
@chcschmid
Apr 16 2016 06:13
Sorry for the messiness of getPlayerStats()... Let me know if there are more efficient/effective ways to access the data in the mock DB
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 06:13
merged #68 looks good
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 06:21
uh oh
Travis broke
Anders Pitman
@anderspitman
Apr 16 2016 06:23
@hehe876 can you review #71 for @mshannahnv ? I'm working on integrated mine and @chcschmid goodies
Hm well it runs without crashing after merging our changes, which is quite impressive!
but unfortunately there are a few issues
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 06:27
#73 Product Backlog updated
This message was deleted
sarahka7
@sarahka7
Apr 16 2016 06:30
@anderspitman hey ready to add my test results. I saved them to my dice-folder. Can you pls. help me through the walk through. This time I will take notes so I remember better for next time
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 06:30
I think @hehe876 is playing LoL and won't be able to review #71
Anders Pitman
@anderspitman
Apr 16 2016 06:31
the build is broken
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 06:31
What can I do?
Anders Pitman
@anderspitman
Apr 16 2016 06:31
@sarahka7 hang on need to fix the build
@chcschmid might be able to walk you through
@mshannahnv it's probably not serious. just the call to create().
Christiaan Schmid
@chcschmid
Apr 16 2016 06:32
Alright @sarahka7 give me a second here
sarahka7
@sarahka7
Apr 16 2016 06:32
yep ready
Anders Pitman
@anderspitman
Apr 16 2016 06:32
took about 2 seconds to fix
Christiaan Schmid
@chcschmid
Apr 16 2016 06:33
k let's check to see what branch you're in. type git branch and the branch you're in should be green or have a star by it
you'll need to be in your dice-game folder in command prompt or cygwin or whatever
Anders Pitman
@anderspitman
Apr 16 2016 06:35
#74 should do the trick
sarahka7
@sarahka7
Apr 16 2016 06:35
  • master
Christiaan Schmid
@chcschmid
Apr 16 2016 06:36
actually let's do a hangouts call. Can we do that? It might be easier to teach you and walk you through it.
sarahka7
@sarahka7
Apr 16 2016 06:36
sure - i'll go there.
Christiaan Schmid
@chcschmid
Apr 16 2016 06:37
sounds good. when you get there start a video call and enter my name. You'll see a three dot button at the top right of the screen. click on that and select share screen and that will allow me to see what you're looking at
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 06:37
@anderspitman merged #74
Anders Pitman
@anderspitman
Apr 16 2016 06:37
thx
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 06:37
@anderspitman How can I fix #73?
Anders Pitman
@anderspitman
Apr 16 2016 06:38
merge master into product-backlog and push
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 06:40
ok #73 is good to go for review
also #71 still needs review but Eric isn't online
sarahka7
@sarahka7
Apr 16 2016 06:41
@chcschmid ok i'm in there. Can you find me? sarahka7@gmail.com?
Anders Pitman
@anderspitman
Apr 16 2016 06:45
k reviewed and merged everything
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 06:45
ty Anders
Anders Pitman
@anderspitman
Apr 16 2016 06:45
getting a little loosy goosey with the code reviews but the apps still run
did a quick sanity check of most of the features
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 06:46
I just didn't want that exception happening on the roll button
Anders Pitman
@anderspitman
Apr 16 2016 06:46
as of right now @chcschmid and my code is in, but not turned on. We're still using the mocks for now
This project represents my most dense contribution period on github. That's just sad
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 06:48
No way it's awesome
Look at my profile
THAT'S sad
GUI is missing the option to stop game before going over I think
But that's for next week :)
Anders Pitman
@anderspitman
Apr 16 2016 06:50
yeah good call just using the mock data this week
too much of a scramble.
we'll fix the integration early next week, then we can focus on javadocs and stress testing
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 06:51
agh
I also think @/all should test CLI and GUI and try to break it
next week
Submit issues, etc.
6 minutes left - we good?!
Anders Pitman
@anderspitman
Apr 16 2016 06:57
idk if @chcschmid and @sarahka7 got her stuff in or not
or if they're close I mean
crap forgot to do a release
hm
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 07:00
fix quick if you need to
Anders Pitman
@anderspitman
Apr 16 2016 07:02
went ahead and did it a little late
maybe they won't care
wait
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 07:02
They can still ./gradlew - no?
Anders Pitman
@anderspitman
Apr 16 2016 07:02
it counts the release time as the time of the last commit aka 20 minutes ago :sunglasses:
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 07:03
hahaha
Anders Pitman
@anderspitman
Apr 16 2016 07:03
hopefully it'll be ok
I mean they could still look at the file was created
or just read this chat...
sarahka7
@sarahka7
Apr 16 2016 07:05
@chcschmid ok
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 07:09
@anderspitman you get an exception when you cancel your name?
Anders Pitman
@anderspitman
Apr 16 2016 07:10
yeah
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 07:10
I can't get it to throw on my end
Anders Pitman
@anderspitman
Apr 16 2016 07:10
interesting
the very first popup, right?
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 07:11
yea
Is it just NullPointerException?>
I was getting that on another cancel button
Overall Stats>cancel
Anders Pitman
@anderspitman
Apr 16 2016 07:12
yup
same as the other one for me
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 07:15
This is an old version
before my changes I think
Yea
Not sure if theres a way to include my commit in that release?
Anders Pitman
@anderspitman
Apr 16 2016 07:17
really?
it's gotta be in there
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 07:17
Yeah it's totally old
Anders Pitman
@anderspitman
Apr 16 2016 07:17
nvm lies
what the crap. I sweat I pulled master right before i built the jars
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 07:21
How do you even get to the releases page
Anders Pitman
@anderspitman
Apr 16 2016 07:21
updated it
that explains why I was getting the other exception
not anymore. now it just exits if you cancel
you get there from the main repo page. middle right
sarahka7
@sarahka7
Apr 16 2016 07:24
@anderspitman Hey Anders can you double check me on the pull request pls? I'm like 90% there, but I'm not getting the green button
or if tomorrow is better I can totally check back too- I know it's late :/
Anders Pitman
@anderspitman
Apr 16 2016 07:26
did you push it on a branch?
sarahka7
@sarahka7
Apr 16 2016 07:26
yes git branch
Christiaan Schmid
@chcschmid
Apr 16 2016 07:26
@sarahka7 and I were working on it. We got close, but ran into issues with the actual PR. We created a new branch test-results and tried doing a PR, but it said that everything was up to date
she pushed it to test-results
Anders Pitman
@anderspitman
Apr 16 2016 07:28
That branch just looks like an old version of master to me
there aren't any commits on it
Christiaan Schmid
@chcschmid
Apr 16 2016 07:29
We ran the git commit -a -m "our message" command, right @sarahka7 ?
sarahka7
@sarahka7
Apr 16 2016 07:29
yeah
Christiaan Schmid
@chcschmid
Apr 16 2016 07:29
then we pushed it doing git push origin test-results
Anders Pitman
@anderspitman
Apr 16 2016 07:29
that only works if you're dealing with files that git already knows about. If you're adding new files you need to do git add on each of them
Christiaan Schmid
@chcschmid
Apr 16 2016 07:30
oops.
Sorry, @sarahka7 !
When we do git status we don't see any "modified" files
did we lose them by doing the commit incorrectly?
sarahka7
@sarahka7
Apr 16 2016 07:32
I'll try adding and following the steps again.
Anders Pitman
@anderspitman
Apr 16 2016 07:34
modified only shows ones git knows about as well
the new stuff will appear under "untracked" until you add them
Nguyen Dao
@ngdao
Apr 16 2016 20:17
so... is the concrete database ready? if yes, how do you use it? Database(type,file), how do you want to do the file?
Hannah Van Den Bosch
@mshannahnv
Apr 16 2016 22:29
I think we pushed it for next week