2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-10-01 02:17:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
925 Commits 18 Branches 1 Tag
9bbfebcfb1cc35082543059cbd7eb62bbe5deb52
Commit Graph
80 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Major 9bbfebcfb1 Merge pull request #334 from Major-/magic-npc 
Register MagicOnNpcMessageDecoder in 317
 2017-05-25 15:40:55 +01:00
Major e4487458f6 Merge pull request #329 from Major-/heap-size 
Increase maximum heap size
 2017-05-25 14:44:08 +01:00
Major d315fff095 Merge pull request #324 from Major-/b308 
Fix #308
 2017-05-25 02:48:43 +01:00
Major 7e8bb67f93 Merge pull request #323 from Major-/sfix-literacy 
Condense some unnecessarily-long variable names
 2017-05-25 02:46:03 +01:00
Major 8393dd8322 Merge pull request #319 from Promises/patch-1 
Correct the button id for the "Protect from Melee" prayer
 2017-05-24 11:54:09 +01:00
Major b7a57fa973 Merge pull request #286 from CharlesVaneenoo/TemplateMethod-ChatMessage 
Make ChatMessage abstract
 2016-03-19 23:14:59 +00:00
Major 7124a2b9d8 Merge pull request #295 from WizardJesse1/patch-1 
Fix Distance check
 2016-03-19 13:58:18 +00:00
Major 407d44fd93 Merge pull request #289 from CharlesVaneenoo/rename_next_dialogue 
Rename get_next_dialogue
 2016-03-19 13:52:45 +00:00
Major 38d2bd1cee Merge pull request #291 from CharlesVaneenoo/TodoAlreadyDone 
Remove old TODOs
 2016-03-18 16:25:25 +00:00
Major dfa8ebed07 Merge pull request #284 from CharlesVaneenoo/remove_useless_if 
Remove useless if in GamePacketencoder
 2016-03-17 20:39:13 +00:00
Major cc63bce4f8 Merge pull request #285 from CharlesVaneenoo/improve_putBits 
improve putBits
 2016-03-17 20:38:17 +00:00
Major 7cc39b1685 Merge pull request #281 from CharlesVaneenoo/fix_issue_178 
Fix issue #178
 2016-03-14 13:15:57 +00:00
Major bb5c75fa4a Fix #272 2016-03-14 08:40:53 +00:00
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 2b7462bc98 Merge pull request #269 from apollo-rsps/enhancement/contributor-guidelines 
Add contributor guidelines
 2016-03-12 13:49:18 +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
Major 4c3b151012 Merge pull request #270 from apollo-rsps/feature/projectiles 
Add support for projectiles
 2016-03-12 04:33:02 +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
Major b539b26c83 Merge pull request #253 from CharlesVaneenoo/RefactorInventoryAdd 
Refactor Inventory#add()
 2016-03-11 15:31:54 +00:00
Major d597f3c584 Merge pull request #273 from CharlesVaneenoo/simplify_getIndefiniteArticle 
Simplify getIndefiniteArticle()
 2016-03-11 15:05:48 +00:00
Major ef2ae48d2f Merge pull request #264 from CharlesVaneenoo/create_drink.rb 
Create drink.rb
 2016-03-06 20:24:08 +00: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
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
Major f0af06f0c4 Merge pull request #254 from CharlesVaneenoo/refactor-wrap 
Refactor Dialogue#wrap()
 2016-02-26 19:10:24 +00: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
Major 6779a3983d Merge pull request #238 from CharlesVaneenoo/pom-new-version 
Update versions in pom.xml
 2016-02-16 20:52:56 +00: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
Major 27448bcdde Merge pull request #224 from Major-/377 
Fix #218
 2016-02-15 19:22:00 +00:00
Major 710c8c70d0 Merge pull request #230 from WizardJesse1/master 
Fix some incorrect messages
 2016-02-15 17:30:18 +00: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
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 9b91e6e650 Merge pull request #223 from Major-/issue_221 
Fix #221
 2016-02-14 03:47:19 +00:00
Major 4b901214c1 Merge pull request #220 from WizardJesse1/master 
Fix prayer burying and add Varrock shops
 2016-02-13 23:12:52 +00:00
Major 8e52dfb121 Merge pull request #216 from WizardJesse1/master 
Add Npcs to Falador
 2016-02-13 15:30:47 +00:00
Major baafad92f1 Merge pull request #215 from WizardJesse1/master 
Fix several issues in the Magic plugin
 2016-02-13 14:10:42 +00:00
Major 1923b21330 Merge pull request #214 from WizardJesse1/master 
Add Varrock Npcs
 2016-02-13 00:36:15 +00:00
Major 81c14c9054 Merge pull request #208 from WizardJesse1/patch-4 
Add more Edgeville Npcs
 2016-02-12 11:50:42 +00:00
Major 787e6c5d85 Merge pull request #207 from WizardJesse1/patch-3 
Add more Npcs to Al-Kharid
 2016-02-12 10:43:02 +00:00
Major d21d0e954b Merge pull request #206 from CharlesVaneenoo/improve-coverage-NameUtilTests 
Test for case insensitivity of encodeBase37
 2016-02-11 22:24:58 +00:00
Major ac671b32ed Merge pull request #205 from shubheksha/master 
Fix #204 (correct spelling of octet)
 2016-02-11 17:45:29 +00:00
Major 3fde7c0fd0 Merge pull request #191 from apollo-rsps/bugfix/106-fix-astar-pathfinder 
Fix the A* path finding implementation
 2016-02-10 13:48:06 +00:00
Major 19266360c4 Merge pull request #193 from WizardJesse1/patch-18 
Fix magic check issues
 2016-02-10 13:47:36 +00:00
Major b76445bad3 Merge pull request #190 from WizardJesse1/patch-16 
Fix issue #186
 2016-02-09 22:58:46 +00:00
Major 67c2fd2d7b Merge pull request #188 from WizardJesse1/patch-15 
Fix enchant ring animation
 2016-02-09 22:09:04 +00:00
Major 4526797095 Merge pull request #180 from ryleykimmel/issue142 
Queue npcs before unregistering
 2016-02-09 21:13:18 +00:00
Major b99b20fbb4 Merge pull request #171 from ryleykimmel/consistent-tests 
Make test class and method names consistent
 2016-02-09 16:10:43 +00:00
Major 3e08a62672 Merge pull request #167 from ryleykimmel/issue165 
Fix String attribute encoding delimiter
 2016-02-09 16:09:12 +00:00
Major d9cf285f5e Merge pull request #172 from ryleykimmel/issue169 
Pass the new Position of Players to area listeners
 2016-02-09 16:02:29 +00:00
Major 732cb35dc7 Fix incorrect doc comment 2016-02-08 17:55:47 +00:00
Major b11d38a673 Merge pull request #166 from ryleykimmel/issue164 
Notify area listeners upon login
 2016-02-07 11:20:39 +00:00
Major 54f6d41165 Merge pull request #168 from WizardJesse1/patch-14 
Fix PlayerAction order
 2016-02-07 11:20:14 +00:00
Major e4d01e6e54 Merge pull request #163 from apollo-rsps/add-developer-info 
Add developer information section to README
 2016-02-06 20:16:18 +00:00
Major 02a40c39f8 Merge pull request #159 from ryleykimmel/issue153 
Fix issue #153
 2016-02-05 17:42:55 +00:00
Major 3da0e37add Merge pull request #157 from ryleykimmel/issue142 
Fix issue #142
 2016-02-05 17:27:51 +00:00
Major ee529c12a8 Merge pull request #158 from ryleykimmel/foodmessage 
Fix "It heals some health" message
 2016-02-04 15:34:40 +00:00
Major 8e7af9b8de Merge pull request #145 from thispixel/master 
Fix issue #143
 2016-01-31 16:34:37 +00:00
Major 2525ecd0ce Update LICENSE year 2016-01-26 02:02:00 +00:00
Major a86a03b930 Fix unexpected return in magic plugin 2016-01-06 13:52:55 +00:00
Major d7234f1294 Merge pull request #120 from WizardJesse1/patch-7 
Fixed Attack Skill Id.
 2016-01-01 21:42:49 +00:00
Major 74783f805c Merge pull request #121 from WizardJesse1/patch-8 
Fixed Herblore Skill Id.
 2016-01-01 21:42:31 +00:00
Major a21a1acb15 Merge pull request #116 from WizardJesse1/patch-3 
Fix issue #113
 2015-12-30 16:18:43 +00:00
Major ab2f856790 Merge pull request #119 from WizardJesse1/patch-6 
Finalize player registration only on success
 2015-12-30 16:17:34 +00:00
Major 293012abaa Merge pull request #118 from WizardJesse1/patch-4 
Fixed Adding xp to teleporting
 2015-12-30 16:16:31 +00:00
Major 5b01c311c1 Merge pull request #115 from WizardJesse1/patch-2 
Fixed Wilderness level 0
 2015-12-30 16:11:38 +00:00
Major ba1537a9e4 Merge pull request #112 from garyttierney/bugfix/equip-2h-stop-action 
Fix actions continuing when equipping 2h swords
 2015-12-26 19:21:08 +00:00
Major d79278973e Merge pull request #110 from garyttierney/bugfix/walking-height-levels 
Correct the height levels of steps in a path
 2015-12-22 04:02:42 +00:00
Major 7eab485447 Merge pull request #108 from garyttierney/bugfix/item-definition-decoder 
Fix short circuit logic in ItemDefinitionDecoder
 2015-12-21 04:14:09 +00:00
Major 442ac44a08 Merge pull request #104 from garyttierney/bugfix/catch-decoder-errors 
Handle errors thrown by SynchronousDecoder tasks
 2015-10-05 13:29:40 +01:00
Major bea652589b Merge pull request #101 from garyttierney/enhancement/dot-editorconfig 
Add .editorconfig file to override IDE defaults
 2015-09-21 21:48:19 +01:00
Major 9343246d60 Merge pull request #99 from garyttierney/feature/message-handler-testing 
Add simple tests for 'important' Message verification handlers.
 2015-09-14 12:06:47 +01:00
Major 22c72ef35c Merge pull request #95 from lare96/master 
Addban and mute support.
 2015-09-02 19:27:18 +01:00
Major a4eb31bab7 Merge pull request #90 from lare96/master 
Use Preconditions in GamePacketBuilder.
 2015-08-30 16:52:04 +01:00
Major c3443521f4 Merge pull request #85 from lare96/master 
Queue new players.
 2015-08-29 22:16:33 +01:00
Major 94e6f0bf38 Merge pull request #83 from lare96/master 
Moved Animation constants from Animation.class to emote_tab.rb.
 2015-08-29 15:52:24 +01:00
Major bbde7fd9e8 Merge pull request #73 from ryleykimmel/master 
Update dependencies, do not fail startup when we cannot bind to HTTP (just use jaggrab as a fallback)
 2015-08-27 22:28:27 +01:00
Major 25b594cebc Merge pull request #71 from ryleykimmel/master 
Fix issue #70.
 2015-08-25 07:15:21 +01:00
Major ac27bacbc5 Fix item equipping. 
Fix a bug reported by WizardJesse1 where ItemOptionMessage was being listened to instead of InventoryItemMessage.
 2015-08-24 06:49:17 +01:00
Major bf97a4225c Update and rename README to README.md 2015-08-03 10:10:56 +01:00