Add Ryan's changes

This commit is contained in:
GregF 2024-08-30 17:43:00 +00:00 committed by Ceikry
parent 59174abf53
commit 01615aa625
3 changed files with 17 additions and 6 deletions

View file

@ -44,7 +44,7 @@ This forking process will take a while, but once it's done you'll be taken to yo
## Clone the Project ## Clone the Project
Now that you have your own fork, you can get your fork cloned and set up locally! Now that you have your own fork, you can get your fork cloned and set up locally!
First, we need to get the link to **your fork.** On the page for your fork, e.g. gitlab.com/You/2009scape, click the "Clone" button, and copy the link provided in the "**Clone with HTTPS**" box: First, we need to get the link to **your fork.** On the page for your fork, e.g. gitlab.com/You/2009scape, click the "Clone" button, and copy the link provided in the "**Clone with SSH**" box:
![image](uploads/3b752da1686c884d2e5f8b1d0644ae18/image.png) ![image](uploads/3b752da1686c884d2e5f8b1d0644ae18/image.png)
@ -80,17 +80,16 @@ Updating your fork doesn't have to be painful, in fact assuming you follow the b
``` ```
$ git checkout master $ git checkout master
$ git fetch -ap upstream $ git fetch -ap upstream
$ git pull --ff-only upstream $ git pull --ff-only upstream master
$ git push --force origin master $ git push origin
``` ```
And just that easily, your fork is completely up to date! And just that easily, your fork is completely up to date!
Now, the next thing you should do is ***rebase*** your branches. Now, the next thing you should do is ***rebase*** your branches.
Let's say you had a branch open for cider, called `cider`. Let's say you had a branch open for cider, called `cider`.
Simply do: Simply do:
``` ```
$ git checkout cider $ git rebase master cider
$ git rebase master $ git push --force origin
$ git push origin cider
``` ```
And now your `cider` branch is updated onto the changes present in the updated master branch. And now your `cider` branch is updated onto the changes present in the updated master branch.

11
Queue-Strengths.md Normal file
View file

@ -0,0 +1,11 @@
For queues used in server logic:
WEAK - cleared if the player interacts with anything else or moves anywhere else. Also cleared when STRONG scripts are added to the queue.
NORMAL - same as weak but persists in the queue with STRONG scripts. pauses execution if an interface is open.
STRONG - clears any weak scripts in the queue for as long as it is present. closes any open interfaces prior to executing. cannot be cleared by any means other than finishing.
-----------All strengths above this line pause if the entity is affected by `delayEntity`-----------
SOFT - does not clear any script. does not close interfaces. cannot be cleared by any means other than finishing.

View file

@ -8,6 +8,7 @@ This will serve a few purposes, but largely aims to help introduce people to the
- [Git Basics](git-basics) - [Git Basics](git-basics)
- [IntelliJ Setup](Setup-for-IntelliJ-IDEA-IDE) - [IntelliJ Setup](Setup-for-IntelliJ-IDEA-IDE)
- [ContentAPI Introduction](contentapi) - [ContentAPI Introduction](contentapi)
- [Queue Strengths](queue-strengths)
## Tutorials ## Tutorials
- [Writing Listeners (Handling Interactions)](https://gitlab.com/2009scape/2009scape/-/wikis/writing-listeners) - [Writing Listeners (Handling Interactions)](https://gitlab.com/2009scape/2009scape/-/wikis/writing-listeners)