Commit Graph

197 Commits

Author SHA1 Message Date
atomicint 654a1a6dfd Rebase the MessageHandler, MessageHandlerChain and MessageHandlerChainSet
Rebased several other pieces of code
2015-03-29 12:52:55 -04:00
Major- 1f2fde61a8 Resolve merge conflict. 2015-03-28 13:52:59 +00:00
Major- 3bd3ddd226 Remove the World singleton. 2015-03-28 13:46:50 +00:00
atomicint 8981d19243 Fix private messaging issue #57 https://github.com/apollo-rsps/apollo/issues/57 2015-03-23 09:12:10 -07:00
Major- 7cf31a2888 Add half-done grouped region frame stuff so Ryley can take a look. This is in master because I'm an idiot. 2015-03-22 11:07:24 +00:00
Major- 30045a6f10 Rename 'Sector' to 'Region'. 2015-03-15 18:54:47 +00:00
Jeremy Conklin 9fb65be3a8 Fixed issue with super str and def (4) turning into regular str and def pots. Also fixed super combat formula, range pot formula, and mage pot formula 2015-03-13 04:01:04 +00:00
Jeremy Conklin be8bcc2fd0 food.rb edited online with Bitbucket 2015-03-11 22:44:11 +00:00
Jeremy Conklin 378b6f2a81 food.rb edited online with Bitbucket 2015-03-11 18:31:20 +00:00
Jeremy Conklin c245516599 formatting 2015-03-11 18:27:10 +00:00
Jeremy Conklin 2088b49a34 added more consumables (edited formatting) 2015-03-11 03:28:01 +00:00
Jeremy Conklin e5e423d52c added more food (edit: formatting) 2015-03-11 03:20:28 +00:00
Jeremy Conklin 29bee05233 added more food 2015-03-11 03:05:44 +00:00
Jeremy Conklin 4b3e771e41 added more food consumables 2015-03-11 02:48:10 +00:00
Major- 021d14472b Fix missing rparen in Survival Expert dialogue. 2015-03-09 08:23:50 +00:00
Major- e0d01c970e Correct one of the preconditions in the runescape guide dialogue. 2015-03-08 11:18:42 +00:00
Major- a6ac0610e5 Add support for executing blocks when directly using close() in a dialogue. 2015-03-08 10:57:25 +00:00
Major- f0424d66fe Correct variable name in Fishing skill. 2015-03-07 14:21:00 +00:00
Ryley Kimmel 556253abb2 Move wilderness plguin to combat package, remove explicit return and fix typo. 2015-03-04 03:07:55 -05:00
Ryley Kimmel 25c13213e6 Merge branch 'master' of git@bitbucket.org:Major-/apollo.git. 2015-03-03 21:19:06 -05:00
Ryley Kimmel 26d1def1c6 Fix, format and rebase wilderness and player-action plugins. 2015-03-03 21:12:32 -05:00
Ryley Kimmel a68502637a Use square brackets for arrays in wilderness plugin. 2015-03-03 18:20:38 -05:00
Ryley Kimmel 5c482766f2 Merge. 2015-03-03 18:20:08 -05:00
Ryley Kimmel e82075a8b7 Merge branch 'master' of git@bitbucket.org:Major-/apollo.git. 2015-03-03 15:02:22 -05:00
Ryley Kimmel 1f1a2b3639 Add wilderness area plugin. 2015-03-03 15:02:17 -05:00
shiver474 040a460942 Merge branch 'master' of https://bitbucket.org/Major-/apollo. 2015-03-03 14:42:29 -05:00
shiver474 af605f41a0 Fix small issue with door plugin. 2015-03-03 14:39:54 -05:00
shiver474 af911b032d Add door plugin. Note that this will need to be revisited when local object synchronization is complete. 2015-03-03 12:38:18 -05:00
Major- 2d5d484c18 Add NpcMovementTask which randomly moves bounded NPCs around the map, fix Npc#equals, bug fixes for Pathfinding and CollisionMatrix. 2015-03-03 01:24:34 +00:00
thispixel ba834e53c3 Fix dialogue issue. 2015-03-02 15:28:50 +00:00
thispixel 2520e1c420 Add npc distance checking to dialogue opening. 2015-03-02 14:52:50 +00:00
shed- 98372858c4 Properly pass variadic arguments in the dialogue plugin. 2015-03-02 17:25:43 +03:00
Major- 248b6a6c06 Fix QuestStage bug where it would not propery get the attribute. 2015-03-02 10:53:00 +00:00
Major- 77ecb34109 Change the functionality of :bounds. 2015-03-02 09:37:59 +00:00
Major- 57f3c49188 Add get_dialogue method in dialogue.rb. 2015-03-02 09:10:29 +00:00
Major- dea1ab1198 Finished Runescape Guide, add partial Survival Expert support in Tutorial Island plugin. 2015-03-02 08:55:28 +00:00
Major- e73c4e150e Add Quest plugin. 2015-03-02 08:54:54 +00:00
Major- 7487526ee8 Minor code improvements to the dialogue plugin. 2015-03-02 08:40:51 +00:00
Major- 29cafba387 Merge branch 'master' of bitbucket.org:Major-/apollo. 2015-03-02 03:57:39 +00:00
Major- 03c1fe16ac Improve attributes code. 2015-03-02 03:57:15 +00:00
Ryley Kimmel 794bd49607 Basic implementation of player context menu action management. 2015-03-01 14:38:00 -05:00
Major- 8968786c01 Move 'org.apollo.game.model.setting' to 'org.apollo.game.model.entity.setting'. 2015-03-01 08:46:55 +00:00
Major- 406329c295 Listen for the PositionUpdateEvent so area listeners now function. 2015-03-01 02:31:55 +00:00
Major- 6d0b832bfd Remove statement dialogue type, automatically infer that type if no continue option is specified. 2015-02-28 09:45:44 +00:00
Major- 30deffa7bc Use Mob instead of Entity in attributes.rb. 2015-02-28 05:32:15 +00:00
Major- 42f9456a97 Raise errors if conversation or dialogues already exist. 2015-02-27 19:13:53 +00:00
Major- 8bb537ce7c Add Conversation support, make numerous bug fixes and code improvements. 2015-02-27 19:07:22 +00:00
Major- fd9009aecb Add imports to command.rb. 2015-02-27 19:03:03 +00:00
Major- f6046cce23 Add basic prayer support. 2015-02-27 18:27:23 +00:00
Major- fd04bd4e53 Rename ':serialized' attribute type to ':persistent'. 2015-02-27 18:26:47 +00:00