Leaderboard

Fork & Pull Request on rAthena >>>> Fork & Make New Pull Request <<<< >>>> How to update your fork <<<< Introducing (a short guide to) GitHub Pull Requests Submitting a Pull Request 1. Once you've commited and squashed your changes, push them to your remote like this: git push origin newfeature 2. Then go to that page on GitHub and change branches to the one for your new feature. Submit a Pull Request! 3. Then, click on the little button that says 'Pull Request'. This will bring you to a page asking you to describe your change. Describe it thoroughly. Describe your Pull Request. 4. Then press 'Submit Pull Request'. Now, you're not quite done yet. If the maintainer finds some problems with your code, they won't want to pull your changes until you fix them. Fortunately, whenever you commit and push more things to that branch of your code, they will be included in that pull request until it is closed. Accepting And Merging a Pull Request If you're on the receiving end of a pull request, how do you merge the changes? Easy - press the button! GitHub now has an auto-merge button which does everything for you in one click. However, it doesn't always work, in which case you'll have to do the merge on your own machine, like so: And then their changes will be properly merged into your main master branch. So, Your Pull Request Was Rejected. Now What? Some forks are unavoidable. Sometimes, for technical or organizational reasons, your pull request will be rejected. This can feel really frustrating, and there are a few different ways you can proceed. Just remember to act rationally. The simplest thing is to simply accept their judgement. It's their project, and a good maintainer knows when to say "no." If their argument is logically sound, you should accept it. If you don't think it's a particularly important feature, hopefully whoever is looking at the project will check the Network and Issues tabs of the upstream project and will notice your changes. Easy to follow video http://www.youtube.com/watch?v=-CpllxXPsvw ELI5 http://www.youtube.com/watch?v=4ocbq8vx4vI Other Resources https://help.github.com/articles/using-pull-requests Original Article If you have any questions, please feel free to ask! We will try and assist you as best as we can. Users who are knowledgeable with GitHub Pull Requests are also welcome to help!

I see many people getting hyped with recent script release for instances by someone. (no asking for link please) However, those scripts are not usable in rAthena. I guess I will release this script function to help them port the scripts without having to edit much of them. [Download] Gist snippet

Update: Live version can now be seen here: https://x-r.online/ Just thought I'd share a design I'm currently working with. I'm by no means any professional designer, but just know my way around Photoshop a bit. At the moment, it's nowhere done, there's so much more to re-touch and add. Maybe it can give some inspiration. Enjoy! * Potentially looking for a coder to slice it up and finalize it into a FluxCP integrated design, since I have no clue how that's going to work. Version 1: http://i.imgur.com/cnW2imw.jpg Version 2: http://i.imgur.com/nv8gMGt.jpg Latest:

Looks like EF_DRAGONFEAR (668)

Yup, that'll work

Im not advertising gepard. I just use it.

I got mine yesterday, thank you! And the wait was no issue, it was well worth it! (Will post pics when it is done drying, I wash any new garments as I am allergic to dyes.) Edit: Pic (Finally. Was going to post back pic but looks exactly like image in first post so meh.) It was bigger than I was expecting but after the wash fit just fine.

June Digest 2016 The following digest covers the month of June, 2016. Staff Changes NoneDevelopment Highlights CORE:Cleaned up item group & monster group parsing, now it use sv_readdb and import (1591e9a, 48a4ee1) Fixed incorrect map-server buffer allocation size (b8d4761, e2d3819) Fixed monster with cast sensor not working (63e8fa0) Resolved a potential map crash on instance destruction (5ef2000) Resolved a memory leak in the channel system (323bd72) Implemented recalculatestat command (98fdf31, 0d43d26) Cleaned up do_reload_instance (e219dd9, 407fd01, f61535b) Updated item database job mask to 64 bit (15fdc12, a14e21f) Improved char-bound instance mode (195a525) Fixed error on atcommand ii (abf939c, 604e805) Fixed error on atcommand monsterinfo and whereis (93c01ee) Fixed error on atcommand bodystyle (247217e) Fixed error on atcommand showexp (cccb740) Fixed Reflect Damage versus Emperium (7a84b53) Expands pc_bonus warnings to give more info when unknown bonus type is detected (33270ed, c658ea2) Moved 'mob random groups' constants into script_constants.h (9558ef0) Removed some hardcoded mob IDs (65b716f, 562a1a7) Added const support to mob race2 db (2534588) Fixed issue with 0 experience (d2bbd91, 6412c82, mb95df50) Refactored clif damage type calls (82af619, c2035f0) Streamlined renewal ASPD skill and potion calculations (fe11416, d6d92a4) DATABASE:Skill Update: Earth Quake, Warmer, Knuckle Arrow, Phantasmic Arrow, Soul Breaker, Rebirth Spirit, Blastmine, Claymore Trap, Swing Dance, Impressive Riff (e39293f, 3817bb3, ab576e9, aa5d7a4, e4ac1ee, d4824c3, 9b3a581, 1d09abe, ec042e9, b2fedb8, 574f69e, b99114c, 06eab75) Updated Item DB (c6df701, 520a840, 90c6d7a, 29ae472, 9cf7cae, 124572e, b3ab05d, b1d8271, 16ad1fc) Resolve error in quest_db (14587cc, ac2009b) Added some more missing placeholders to mobdb (bea47ea) ECL_SQUOIA now removes SC_DECREASEAGI (26aa69d) SCRIPT:Add official quest condition for Guillotine Cross job change quest (25c4334) Updated Old Glast Heim instance (b8898cd) Fixed PLAYTIME issue in guillotine_cross.txt (a667fc0) Added weight check in Ring of the Wise King Quest (055ee42) Fixed Pintados Festival never ends (aed00e0) Fixed warning on Hunting Mission (673a93c, 6546566, 14d93ff) Added support to Para_Team_Mark_ item in Eden Group (274232f) Added use of F_HasEdenGroupMark function (815368a) Removed useless lines from several scripts (85f44a5) Fixed issue with Quest Error (94b866e) Added duplicate NPCs to Novice Grounds (1dd674f) Fixed wrong usage of close in Thor Volcano Base Quest (933d687) OTHERS:Resolved compile warning and errors (46f1a6f, 7cf7a54, dfd9bde) Remove webtatic repo reference for CentOS5 (66cda76) Updated the SQL conversion script (5892e5e) Updated bSkillUseSP item bonus documentation (33f83e0) Update .gitignore to ignore *.VC.opendb (0798ace) Updated script documentation (2e98ff6) Added appveyor for windows build tests (7316c45, 4ad8eb0) Fixed Full Throttle status icon (f031741) Statistics 9 authors have pushed 92 commits during this period. On master, 100 files have changed. There have been 2,074 additions and 1,380 deletions. There are 7 merged Pull Requests and 0 Proposed Pull Requests. There are 24 new Issues and 69 Closed Issues. List of Contributors @admkakaroto, @aleos89, @Akaineko-astasi, @Akkarinage, @anacondaqq, @Atemo, @AtlantisRO, @CairoLee, @cydh, @dragonis1701, @dynaraan, @Everade, @exneval, @iubantot, @jezznar, @Jeybla, @julia40124009, @Lemongrass3110, @LiamKarlMitchell, @lighta, @MishimaHaruna, @MrAntares, @nykuz85, @Paoly28, @Playtester, @RadianFord, @rubie123, @secretdataz, @stealth62, @Stolao, @spinzaku, @technoken, @tlacson7, @tmav94, @VXPlay, @wilkemeyer, @zackdreaver Show your support to rAthena by submitting your Issue or Pull Requests! By providing enough useful info (Git Hash, Client Date, RE/Pre-RE, crashdump, how to reproduce, etc) you will help us to solve the issues faster

the first step for u is, "install SmartGit" EDIT: How to update fork by using TortoiseGit See this album Right-click your local fork, choose Settings On the left menu-list, click on Git -> Remote. (pic) Need to new remote for rAthena, just type 'rAthena' on remote textfield (it gives the remote name) and the URL is https://github.com/rathena/rathena.git (pic) Click Add New/Save. U will get new remote, named rAthena. (pic) After adding the new remote, there is prompt "Do you want to fetch remote branches from newly added remote?" Yes! (pic) Look at this picture, and OK Wait until it done, you will see some it works, fetching from rAthena. (pic) If it's done, right-click on your local fork, choose Merge, Select remotes/rAthena/master on the Branch from (look at this picture), then OK. (pic) Wait until it done (it should be fast, it just merging ur local fork). (pic) Then u need to push it. Right-click on ur local repo, choose Push. On the Ref, select for local is ur master, and Remote is master too. And the Destination Remote is origin (it will be pointed to ur https://github.com/<username>rathena. OK. (pic) Wait it done, and look by browser on ur repo, it should be no different between urs and rAthena's repo. (pic) *bump*