• Hey! Guest! The 39th GMC Jam will take place between November 26th, 12:00 UTC and November 30th, 12:00 UTC. Why not join in! Click here to find out more!

scm

  1. Brenden

    Legacy GM Source control with git [Solved]

    I followed a tutorial from the official GM:S page https://help.yoyogames.com/hc/en-us/articles/216754908-SCM-Part-1-GameMaker-Studio-Source-Control-Management, finished but when I add all resources from source control box I get an error in the compiler window "fatal: not a git repository (or any...
  2. Donald Harris

    GMS 2 Source Control should I use internal or GHDesktop?

    So my team has expanded to 3 people. And on my first merge I spent the better half of a day fixing conflicts on the new branch. I was able to get everything cleaned up by the use of SourceTree and GitHub Desktop. SourceTree has a conflict editor built in. My question is how good is the built-in...
  3. M

    Question - IDE SCM questions

    1) Can anyone shed some light on what the Diff option is intended for within the Git plugin settings window? 2) Can anyone recommend a git merge tool? Thanks!
  4. Daniel Mallett

    Question - IDE Source control trouble

    I'm desperately hoping someone can help me with setting up source control in game maker 2. Firstly I checked out some youtube videos on how to do this. However everyone seems to be bypassing game maker by installing a 3rd party client for there PC, pointing there save directory to the...
  5. J

    Git SCM issues - assets not being recognized as part of the project after pulling

    Hello, So my team mate and I have been working on a project together, and we manage our versions on github. There's an issue that occurs whenever my team mate commits and pushes his work to the repository. What happens is that any changes either of us make are not successfully reflected after...
  6. HayManMarc

    Setting up GameMaker Studio with SCM?

    So, I've successfully installed TortoiseSVN and created an account with Assembla. I have read through @Nocturne 's blog post about SCM (http://help.yoyogames.com/hc/en-us/articles/216754908-SCM-Part-1-GameMaker-Studio-Source-Control-Management). But there's one little bit of information that I...
  7. var

    Legacy GM Is it possible to integrate git with GM:S (not GM:S Pro)?

    Me and a friend are trying to work on games together, so we want to use git (we both have experience with it). However, I can't find any of GameMaker's integrated SCM stuff. Is this because I'm using the free version of GM:S? I'm assuming so, because my friend has the full version and he can see...
Top