version=pmwiki-2.2.130 ordered=1 urlencoded=1 agent=Mozilla/5.0 (compatible; hjdicks) author=mkf charset=UTF-8 csum=monospaced commands ctime=1620817363 host=5.238.190.1 name=Minetest.Updating rev=2 targets= text=first, on your own computer, clone the repo https://gitlab.com/arcadeemulationserver/aes_game using the recursive option so you can edit the files locally.%0a%0a[@%0agit clone https://gitlab.com/arcadeemulationserver/aes_game --recursive%0a@]%0aThis will also download the submodules (mods) that are linked in the main game repo.%0a%0a++++%0a OR%0a++++%0a%0aIf you already have the aes_game downloaded with git, then you should pull it instead of cloning it.%0a%0a[@%0acd %3cpath_to_aes_game>%0agit pull%0agit submodule update%0a@]%0athat will pull the latest game files and mod files (submodules)%0a%0a=====================================%0a%0aEditing Mods (that we own in our group)%0a%0a=====================================%0a%0a1) cd into the mod that you want to edit%0a%0a2) checkout the branch "master" (or "main", occasionally!) using the command line, in the mod directory%0a%0a[@%0agit checkout master%0agit pull%0a@]%0a%0a3) Open the files you want to edit and edit them, or add files, or remove files as you like%0a%0a4) Go back to the command line, make sure you are in the mod directory (cd into it)%0a%0a5) add all changes to the commit%0a%0a[@%0agit add -A%0a@]%0a%0a6) make your commit, and label it with a message%0a%0a[@%0agit commit -m "your message here"%0a@]%0a%0a7) push the commit to the online repo%0a%0a[@ %0agit push%0a@]%0a%0athis will ask you for your gitlab username and password%0a%0a8) cd into the upper aes_game repo%0a%0a[@%0acd ..%0a@]%0a(moves you up one folder)%0a%0a9) to make the main game repo pull the submodule at the correct commit, you now have to add the changes to the main repo%0a%0a(in the main aes_game repo)%0a%0a[@%0agit add -A%0agit commit -m "your commit message here"%0agit push%0a@]%0a%0athis will ask you for your gitlab username and password%0a%0a%0a%0a%0a==========================================%0a%0aAdding submodules (new mods)%0a%0a==========================================%0a%0aMake sure aes_game is up-to-date on your local copy%0a%0a%0awe typically should have a copy of the repo under our gitlab group. Go to our Gitlab group:%0ahttps://gitlab.com/arcadeemulationserver%0a%0aClick New Project%0a%0aIf we are cloning an existing mod, then click "import project/repository" %0a%0aClick "Repo by URL"%0a%0aPaste the URL of the existing repo%0a%0aIf we will be editing the mod ourselves, then make sure the checkbox "Mirror Repository" IS NOT CHECKED%0a%0aIf we will just be using someone else's mod *without* editing it ourselves, then make sure that "Mirror Repository" IS CHECKED%0a%0aIt is better to Mirror the repository at first, because we can always stop mirroring in settings.%0a%0aMake sure the project is "public" (its the last option)%0a%0a%0a%0aGo ahead and make the project and COPY its repo location (the web address)%0a%0aFor example, the repo location of Arena_lib is https://gitlab.com/arcadeemulationserver/arena_lib%0a%0aYours will be different.%0a%0a%0aThen go to your terminal on your computer, cd into aes_game, make sure its up-to-date, and then run:%0a%0a[@%0agit submodule add %3cpath-to-the repo-you copied> mods/%3cmodname>%0a@]%0a%0aThat will put the mod in a submodule folder in aes_game/mods/%3cmodname> %0a%0aThen you have to add the change to the main repo%0a%0a[@%0agit add -A%0agit commit -m "your commit message here"%0agit push%0a@]%0a%0a==================================================%0a%0aUpdating the server%0a%0a==================================================%0a%0aAfter you have made changes to the game files, and uploaded them to the online repo, you can update the game files.%0a%0aon the server, %0a%0a[@%0acd /home/minetest/minetest4/games/aes_game%0agit pull%0agit submodule update%0a@]%0a%0a time=1621843801 author:1621843801=mkf csum:1621843801=monospaced commands diff:1621843801:1620817363:=0a1%0a> %0a3c4%0a%3c [@%0a---%0a> ```%0a5c6%0a%3c @]%0a---%0a> ```%0a14c15%0a%3c [@%0a---%0a> ```%0a15a17%0a> %0a16a19%0a> %0a18c21,23%0a%3c @]%0a---%0a> %0a> ```%0a> %0a31c36%0a%3c [@%0a---%0a> ```%0a34,35c39,40%0a%3c @]%0a%3c %0a---%0a> ```%0a> %0a42c47%0a%3c [@%0a---%0a> ```%0a44,45c49%0a%3c @]%0a%3c %0a---%0a> ```%0a48c52%0a%3c [@%0a---%0a> ```%0a50,51c54,55%0a%3c @]%0a%3c %0a---%0a> ```%0a> %0a54c58%0a%3c [@ %0a---%0a> ``` %0a56,57c60%0a%3c @]%0a%3c %0a---%0a> ```%0a62c65%0a%3c [@%0a---%0a> ```%0a64c67%0a%3c @]%0a---%0a> ```%0a71c74%0a%3c [@%0a---%0a> ```%0a75,76c78%0a%3c @]%0a%3c %0a---%0a> ```%0a121c123%0a%3c [@%0a---%0a> ```%0a123,124c125,126%0a%3c @]%0a%3c %0a---%0a> ```%0a> %0a129c131%0a%3c [@%0a---%0a> ```%0a133,134c135,136%0a%3c @]%0a%3c %0a---%0a> ```%0a> %0a145c147%0a%3c [@%0a---%0a> ```%0a146a149%0a> %0a147a151%0a> %0a149c153,154%0a%3c @]%0a---%0a> ```%0a> %0a host:1621843801=5.238.190.1 author:1620817363=AES diff:1620817363:1620817363:=1,155d0%0a%3c %0a%3c first, on your own computer, clone the repo https://gitlab.com/arcadeemulationserver/aes_game using the recursive option so you can edit the files locally.%0a%3c %0a%3c ```%0a%3c git clone https://gitlab.com/arcadeemulationserver/aes_game --recursive%0a%3c ```%0a%3c This will also download the submodules (mods) that are linked in the main game repo.%0a%3c %0a%3c ++++%0a%3c OR%0a%3c ++++%0a%3c %0a%3c If you already have the aes_game downloaded with git, then you should pull it instead of cloning it.%0a%3c %0a%3c ```%0a%3c cd %3cpath_to_aes_game>%0a%3c %0a%3c git pull%0a%3c %0a%3c git submodule update%0a%3c %0a%3c ```%0a%3c %0a%3c that will pull the latest game files and mod files (submodules)%0a%3c %0a%3c =====================================%0a%3c %0a%3c Editing Mods (that we own in our group)%0a%3c %0a%3c =====================================%0a%3c %0a%3c 1) cd into the mod that you want to edit%0a%3c %0a%3c 2) checkout the branch "master" (or "main", occasionally!) using the command line, in the mod directory%0a%3c %0a%3c ```%0a%3c git checkout master%0a%3c git pull%0a%3c ```%0a%3c %0a%3c 3) Open the files you want to edit and edit them, or add files, or remove files as you like%0a%3c %0a%3c 4) Go back to the command line, make sure you are in the mod directory (cd into it)%0a%3c %0a%3c 5) add all changes to the commit%0a%3c %0a%3c ```%0a%3c git add -A%0a%3c ```%0a%3c 6) make your commit, and label it with a message%0a%3c %0a%3c ```%0a%3c git commit -m "your message here"%0a%3c ```%0a%3c %0a%3c 7) push the commit to the online repo%0a%3c %0a%3c ``` %0a%3c git push%0a%3c ```%0a%3c this will ask you for your gitlab username and password%0a%3c %0a%3c 8) cd into the upper aes_game repo%0a%3c %0a%3c ```%0a%3c cd ..%0a%3c ```%0a%3c (moves you up one folder)%0a%3c %0a%3c 9) to make the main game repo pull the submodule at the correct commit, you now have to add the changes to the main repo%0a%3c %0a%3c (in the main aes_game repo)%0a%3c %0a%3c ```%0a%3c git add -A%0a%3c git commit -m "your commit message here"%0a%3c git push%0a%3c ```%0a%3c this will ask you for your gitlab username and password%0a%3c %0a%3c %0a%3c %0a%3c %0a%3c ==========================================%0a%3c %0a%3c Adding submodules (new mods)%0a%3c %0a%3c ==========================================%0a%3c %0a%3c Make sure aes_game is up-to-date on your local copy%0a%3c %0a%3c %0a%3c we typically should have a copy of the repo under our gitlab group. Go to our Gitlab group:%0a%3c https://gitlab.com/arcadeemulationserver%0a%3c %0a%3c Click New Project%0a%3c %0a%3c If we are cloning an existing mod, then click "import project/repository" %0a%3c %0a%3c Click "Repo by URL"%0a%3c %0a%3c Paste the URL of the existing repo%0a%3c %0a%3c If we will be editing the mod ourselves, then make sure the checkbox "Mirror Repository" IS NOT CHECKED%0a%3c %0a%3c If we will just be using someone else's mod *without* editing it ourselves, then make sure that "Mirror Repository" IS CHECKED%0a%3c %0a%3c It is better to Mirror the repository at first, because we can always stop mirroring in settings.%0a%3c %0a%3c Make sure the project is "public" (its the last option)%0a%3c %0a%3c %0a%3c %0a%3c Go ahead and make the project and COPY its repo location (the web address)%0a%3c %0a%3c For example, the repo location of Arena_lib is https://gitlab.com/arcadeemulationserver/arena_lib%0a%3c %0a%3c Yours will be different.%0a%3c %0a%3c %0a%3c Then go to your terminal on your computer, cd into aes_game, make sure its up-to-date, and then run:%0a%3c %0a%3c ```%0a%3c git submodule add %3cpath-to-the repo-you copied> mods/%3cmodname>%0a%3c ```%0a%3c %0a%3c That will put the mod in a submodule folder in aes_game/mods/%3cmodname> %0a%3c %0a%3c Then you have to add the change to the main repo%0a%3c %0a%3c ```%0a%3c git add -A%0a%3c git commit -m "your commit message here"%0a%3c git push%0a%3c ```%0a%3c %0a%3c ==================================================%0a%3c %0a%3c Updating the server%0a%3c %0a%3c ==================================================%0a%3c %0a%3c After you have made changes to the game files, and uploaded them to the online repo, you can update the game files.%0a%3c %0a%3c on the server, %0a%3c %0a%3c ```%0a%3c cd /home/minetest/minetest4/games/aes_game%0a%3c %0a%3c git pull%0a%3c %0a%3c git submodule update%0a%3c ```%0a%3c %0a%3c %0a host:1620817363=198.251.81.119