2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-03 00:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
876 Commits 18 Branches 1 Tag
a59bbe68f63c8f0589446919fff3000d99e037e9
Commit Graph

876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Major a59bbe68f6 Merge pull request #252 from CharlesVaneenoo/RefactorHandle 
refactor method handle in EquipItemHandler.java
 2016-03-13 09:28:05 +00:00
Major d533051acb Merge pull request #279 from Major-/master 
Ignore some bad rubocops
 2016-03-13 09:25:47 +00:00
Major- dccfd38227 Ignore some bad rubocops 2016-03-13 09:21:10 +00:00
Major 2b7462bc98 Merge pull request #269 from apollo-rsps/enhancement/contributor-guidelines 
Add contributor guidelines
 2016-03-12 13:49:18 +00:00
Gary Tierney 43e522b1ba Update contributors guidelines 2016-03-12 13:39:47 +00:00
CharlesVaneenoo 47884419fb Create initial contributors guidelines 2016-03-12 13:39:47 +00:00
Major 0f3fca0372 Merge pull request #278 from CharlesVaneenoo/add_text_instruction 
Add missing Survival Guide text
 2016-03-12 13:36:25 +00:00
CharlesVaneenoo 168e8c44a1 Add text in instruction.rb 
Add text in instruction.rb
 2016-03-12 10:35:10 +01:00
Major 4c3b151012 Merge pull request #270 from apollo-rsps/feature/projectiles 
Add support for projectiles
 2016-03-12 04:33:02 +00:00
Gary Tierney f2aced1bca Add support for projectiles 
* Adds support for short-lived entities, which are never added to the
  entity sets of the region they belong in.

* Adds support for checking the number of tiles a Mob occupies.

* Adds a ProjectileBuilder class to simplify creating projectiles.
 2016-03-11 20:03:33 +00:00
Major 761af6d97b Merge pull request #275 from CharlesVaneenoo/typoCorrection 
Change conversation name in survival.rb
 2016-03-11 15:56:07 +00:00
munggs bf41915bcd Correct typo in survival.rb 2016-03-11 16:38:18 +01:00
Major b539b26c83 Merge pull request #253 from CharlesVaneenoo/RefactorInventoryAdd 
Refactor Inventory#add()
 2016-03-11 15:31:54 +00:00
munggs 5aa7e0f90d Refactor add method in Inventory 2016-03-11 16:26:53 +01:00
Major d597f3c584 Merge pull request #273 from CharlesVaneenoo/simplify_getIndefiniteArticle 
Simplify getIndefiniteArticle()
 2016-03-11 15:05:48 +00:00
CharlesVaneenoo 449ba14b42 Simplify the method getIndefiniteArticle 
Fix bug
 2016-03-11 14:15:14 +01:00
Hequette Pierre 172e347912 refactor method handle in EquipItemHandler.java 2016-03-08 22:24:58 +01:00
Gary Tierney 8c6f25380c Merge pull request #263 from cubeee/move-rsa-keys 
Move RSA keys to their own file and use a pem file for them
 2016-03-08 13:18:06 +00:00
Cube d45b8ef846 Remove bouncycastle dependency from util 2016-03-08 13:56:12 +02:00
Cube bde4061b8a Store RSA in a PEM file instead of xml 
- RsaKeyGenerator automatically saves the RSA keys in a PEM file
- Corrects key bit size suggestion
 2016-03-08 13:55:08 +02:00
Cube 0eb8a6e7e6 Move RSA keys to their own file 
RSA keys are sensitive information that should not be stored in git repositories.
This commit moves them to their own file, adds it to .gitignore and provides a template file.
 2016-03-08 13:55:07 +02:00
Gary Tierney a02eceb436 Merge pull request #258 from CharlesVaneenoo/SkillSetTests 
Add SkillSet unit tests
 2016-03-07 22:03:36 +00:00
Jeremy MATHIAS ca82ad5e4e Add unit tests for SkillSet 2016-03-07 16:14:52 +01:00
Major ef2ae48d2f Merge pull request #264 from CharlesVaneenoo/create_drink.rb 
Create drink.rb
 2016-03-06 20:24:08 +00:00
CharlesVaneenoo 82f28b070e creation of drink.rb 
fix bad name
 2016-03-05 23:01:22 +01:00
Major 38454dde0c Merge pull request #239 from CharlesVaneenoo/add_facial_emote 
Name the rest of the facial emotes
 2016-03-04 16:53:33 +00:00
CharlesVaneenoo cd3596ee61 name properly the rest of the facial emotes 2016-02-27 11:16:53 +01:00
Major 7731eedf3d Merge pull request #256 from CharlesVaneenoo/remove-useless-if2 
Remove a useless if in GameObjectDecoder
 2016-02-27 08:21:03 +00:00
CharlesVaneenoo 5fd8640d62 new PR after bad rebase 2016-02-26 21:25:20 +01:00
Major f0af06f0c4 Merge pull request #254 from CharlesVaneenoo/refactor-wrap 
Refactor Dialogue#wrap()
 2016-02-26 19:10:24 +00:00
AymericDu 92f3d91cb4 refactor wrap in dialogue.rb 2016-02-26 16:49:04 +01:00
Major 51df75bd16 Merge pull request #246 from CharlesVaneenoo/simplify-Crcs-getter 
Simplify the getter of Crcs
 2016-02-26 08:57:33 +00:00
CharlesVaneenoo b2c0d94db1 Simplify the getter of Crcs 2016-02-25 16:58:41 +01:00
Major 6779a3983d Merge pull request #238 from CharlesVaneenoo/pom-new-version 
Update versions in pom.xml
 2016-02-16 20:52:56 +00:00
AymericDu fd1d3f578a POM : new plugin version 2016-02-16 14:44:44 +01:00
Major f085636a12 Merge pull request #234 from WizardJesse1/master 
Add prayer level requirements for equipping items
 2016-02-16 07:27:54 +00:00
Jesse Woolsey ddaa505c6a * Fix Several Items that were glitched when worn. 
* Fix items that were not able to be worn due to the name.
* Added prayer check in due to one of the items using it during 377
 2016-02-15 21:47:25 -05:00
Major 27448bcdde Merge pull request #224 from Major-/377 
Fix #218
 2016-02-15 19:22:00 +00:00
Major- d3c5417403 Fix #218 2016-02-15 17:32:00 +00:00
Major 710c8c70d0 Merge pull request #230 from WizardJesse1/master 
Fix some incorrect messages
 2016-02-15 17:30:18 +00:00
Jesse Woolsey fd855263a4 * Fix messages that were wrong 2016-02-15 09:23:51 -05:00
Major 0417939b56 Merge pull request #228 from WizardJesse1/master 
Ensure beards are displayed with med helms
 2016-02-15 02:18:42 +00:00
Jesse Woolsey 08d797d907 Fixed beards for helmets. 2016-02-14 20:59:22 -05:00
Major 420fe587da Merge pull request #226 from Major-/issue_170 
Fix #170
 2016-02-14 19:44:46 +00:00
Major c545015501 Merge pull request #225 from Major-/shops 
Create shops using npc/item names instead of ids
 2016-02-14 19:40:16 +00:00
Major- 8f5ddb0761 Fix #170 2016-02-14 16:25:38 +00:00
Major- 1a86e286bb Require shops to use names instead of ids 2016-02-14 16:12:57 +00:00
Major- 6eebdd1f11 Improve Falador/Varrock npcs.rb formatting 2016-02-14 16:11:31 +00:00
Major 9b91e6e650 Merge pull request #223 from Major-/issue_221 
Fix #221
 2016-02-14 03:47:19 +00:00
Major- 3a926c6173 Fix #221 2016-02-14 03:42:50 +00:00