Where communities thrive


  • Join over 1.5M+ people
  • Join over 100K+ communities
  • Free without limits
  • Create your own community
People
Repo info
Activity
  • Dec 03 2014 02:14

    digitaldaimyo on master

    line added not functional adde… Merge remote-tracking branch 'o… (compare)

  • Sep 01 2014 20:03

    ElementalSPARKe on master

    3dfishSprite Test 3dfishSprite… (compare)

  • Sep 01 2014 00:35

    ElementalSPARKe on master

    re added bg bg sprite water (compare)

  • Aug 31 2014 18:50

    ElementalSPARKe on master

    adjusted size of fish revert w… (compare)

  • Aug 31 2014 18:35

    ElementalSPARKe on master

    water pt 2 Added d3d water, ne… (compare)

  • Aug 31 2014 17:14

    ElementalSPARKe on master

    Watah Changed the water a bit,… (compare)

  • Aug 29 2014 02:39

    ElementalSPARKe on master

    Water animations added Added b… (compare)

  • Aug 29 2014 01:15

    digitaldaimyo on MikeWorkingCopy

    (compare)

  • Aug 29 2014 01:15

    digitaldaimyo on JustinWorkingCopy

    (compare)

digitaldaimyo
@digitaldaimyo
so clone and open was a big fail eh?
SPARKe
@ElementalSPARKe
someone says there is a way.. we might be making it more difficult than necc.. let me try to clone in desktop and then edit... we might have to do like the guy says about half way down... we each clone... edit... then merge
digitaldaimyo
@digitaldaimyo
right
SPARKe
@ElementalSPARKe
installing the git dskp
digitaldaimyo
@digitaldaimyo
cool
fingers crossed
SPARKe
@ElementalSPARKe
kinda laggy.. surprised.. I would think it would be pretty optimized .. lol
digitaldaimyo
@digitaldaimyo
the desktop or the fish ? :D
SPARKe
@ElementalSPARKe
desktop, lol.. still wont clone to it.. bringing me back to the DL page everytime
digitaldaimyo
@digitaldaimyo
did it prompt you to reboot?
SPARKe
@ElementalSPARKe
nah, had to close it all and reopen tabs, etc.. got it cloned now.. hmmm.. soooo... let me try and do an edit.. this chat maybe the exact thing we needed funny enough! lol.. look at the right... we each have a working copy there
digitaldaimyo
@digitaldaimyo
yah i made branches :)
i think at the end of a day where either of us works we can merge the branches back to main
SPARKe
@ElementalSPARKe
freaking sweet... Justin, this may just work, lol.. let me try to open in my GMs... yah.. I think we just merge em... hahah
if you stick the main merge into our google drive folder on your desktop, that would keep a backup copy too.. .better safe than sorry I suppose?
maybe overkill idk
digitaldaimyo
@digitaldaimyo
no its a good idea
save it with a date or some such
if it loads up in GMs i will pretty much be happy with life for today :D
SPARKe
@ElementalSPARKe
yeah exactly, that's what I do on Dbox for all of my builds hahah ^ yah me too man
digitaldaimyo
@digitaldaimyo
(small caveat, and your able to push your changes)
yah i have quite a few folders full of incremental builds of projects lol
SPARKe
@ElementalSPARKe
Meeeee too.. disgusting amount really and Unity builds get to about 6-9 GB each... I have 500+ across several drives... one of these days I'm going to have to clean house, lol
digitaldaimyo
@digitaldaimyo
famous last words
SPARKe
@ElementalSPARKe
hereeee goes nothin' I'm going to open the clone in my GMS... it "should" work because the only diff between our copies is my export options..
digitaldaimyo
@digitaldaimyo
ah yes more possible snags i didnt think of :/
SPARKe
@ElementalSPARKe
wait.. b4 I open... what build are you on in GMS... standalone? steam?
digitaldaimyo
@digitaldaimyo
standalone
SPARKe
@ElementalSPARKe
I'm on steam copy... I WAS able to work between the two earlier.. that was my sneaky fix for the marketplace
digitaldaimyo
@digitaldaimyo
1.3.1386
haha nice
SPARKe
@ElementalSPARKe
opened in my pro copy SA, downloaded the dogControl thing... closed, opened project in steam full ed and worked fine... in fact, that controller software is badass btw
digitaldaimyo
@digitaldaimyo
i did peek at the link for a little while between jobs
SPARKe
@ElementalSPARKe
okay.. same physical versions.. so... eh.. here we go! have a backup right?
digitaldaimyo
@digitaldaimyo
yes i do
SPARKe
@ElementalSPARKe
okay.. blastoff
digitaldaimyo
@digitaldaimyo
too much anticipation :D
SPARKe
@ElementalSPARKe
:D :D
noway
totally worked
digitaldaimyo
@digitaldaimyo
way!
SPARKe
@ElementalSPARKe
even ported it to windows, played
digitaldaimyo
@digitaldaimyo
that went about 1000% better than any other time i tried to get a project going on SVN or the like
SPARKe
@ElementalSPARKe
making a build right now... hahah.. holy chit man
digitaldaimyo
@digitaldaimyo
sweet
it aint much lol, i'm having environment shock
i keep changing how i want to do things vs just doing them
SPARKe
@ElementalSPARKe
Well this is the first time I've done this and totally wasn't sure the two versions, cloned, git'd would work.. hahaha.. I think we also may have found a loop with this chat too.. keeps a nice track
digitaldaimyo
@digitaldaimyo
yes it does
SPARKe
@ElementalSPARKe
yeah, I get that... gamemaker is like that... well alright man... do you have the touch controls in? I gotta go find out where my 2yr old put the tablet