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
550 Commits 18 Branches 1 Tag
3e8500695072dc9d05fb2dd75ef67a2d506d357d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Major- 3e85006950 Revert net.xml to previous state. 2015-03-14 18:32:35 +00:00
John Major 2b04017ce6 Merged in Snoopya1a/apollo-jeremy (pull request #2) 
Fix potion formulae and item ids.
 2015-03-14 17:55:44 +00:00
John Major 5286e3a5cf Merged in Snoopya1a/apollo (pull request #1) 
Add more food consumables.
 2015-03-11 23:42:19 +00:00
Major- 7c51df4206 Fix Javadoc warnings. 2015-03-10 16:18:19 +00:00
Major- b4b6e0df65 Rename 'rsa.xml' to 'net.xml' and define port values in the aforementioned. 2015-03-09 18:19:45 +00:00
Major- 053e3a30be Add acronym support (e.g. NPC) to LanguageUtil#getIndefiniteArticle. 2015-03-09 12:57:30 +00:00
Major- 3d00cf9251 Flush on OnDemand write. 2015-03-09 08:24:05 +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- 4f880c7bed Add exec support. 2015-03-07 15:08:54 +00:00
Major- 3f616a2043 Properly encode StringAttributes. 2015-03-07 15:07:33 +00:00
Major- f0424d66fe Correct variable name in Fishing skill. 2015-03-07 14:21:00 +00:00
Major- d787906514 Fix poor usage of compareTo. 2015-03-06 22:32:17 +00:00
Major- 91f9005954 Resolve merge conflict. 2015-03-06 22:09:41 +00:00
Major- 9208ac6490 Improve MapFileDecoder decode, add ObjectGroup and ObjectType. 2015-03-06 08:47:26 +00:00
Major- 5111fe9b24 Use unsigned right shift operator instead of ANDing. 2015-03-06 08:45:59 +00:00
Major- 2a6fffabbb Correct documentation comment. 2015-03-06 08:45:39 +00:00
Major- 297657cda6 Decode morphisms so ObjectDefinitions are actually correct. 2015-03-06 08:44:13 +00:00
Major- c8e7d710f0 Merge branch 'master' of bitbucket.org:Major-/apollo into pathfinding. 2015-03-04 15:09:39 +00:00
Major- 4984ecfa62 Use latest netty version. 2015-03-04 15:09:04 +00:00
Major- c52b80c154 Fix Position#getHeight. 2015-03-04 06:31:48 +00:00
Major- 723fbac591 Improve error message when attempting to access an illegal index in CollisionMatrix. 2015-03-04 05:05:04 +00:00
Major- ee7cba054c Remove unnecessary whitespace in WalkMessageDecoder, fix RemoveObjectMessageEncoders. 2015-03-03 21:11:18 +00:00
Major- b8016e16c1 Limit internal GameObject values. 2015-03-03 21:06:03 +00:00
Major- de697d99f4 Add RemoveObjectMessage. 2015-03-03 20:12:09 +00:00
Major- 2f1310c8b6 Remove unused constant from FileSystemConstants. 2015-03-03 10:55:44 +00:00
Major- 7a6132d856 Resolve a number of TODOs. 2015-03-03 07:43:45 +00:00
Major- f2130076b7 Remove debug message from NpcMovementTask. 2015-03-03 07:43:34 +00:00
Major- 65ecd1b5fc Merge PlayerSaver and PlayerLoader into PlayerSerializer. 2015-03-03 07:25:20 +00:00
Major- 1859276a22 Reorder methods in StatefulFrameDecoder, make minor name changes to local variables in LoginDecoder. 2015-03-03 05:31:02 +00:00
Major- b5b439d267 Merge branch 'master' of bitbucket.org:Major-/apollo. 2015-03-03 01:25:03 +00: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
Major- 05e0afa83a Order CollisionFlags. 2015-03-03 01:05:11 +00:00
Major- 782563267a Reformat MessageHandlerContext. 2015-03-02 13:27:54 +00:00
Major- 248b6a6c06 Fix QuestStage bug where it would not propery get the attribute. 2015-03-02 10:53:00 +00:00
Major- 73bc1e9666 Update pom dependencies to latest versions. 2015-03-02 10:03:09 +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- caf4cc6d96 Use lambda expressions in CollisionMatrix. 2015-03-02 07:27:05 +00:00
Major- 2d7a3033c2 Commit CollisionFlag so apollo builds again... 2015-03-02 06:32:43 +00:00
Major- 4ae78658df Add Sector#getMatrix method. 2015-03-02 06:27:38 +00:00
Major- 0591256fbf Add height level support to matrices in Sector. 2015-03-02 06:25:38 +00:00
Major- 29cafba387 Merge branch 'master' of bitbucket.org:Major-/apollo. 2015-03-02 03:57:39 +00:00
Major- 01f227f071 Remove AVATAR_DESIGN constant from InterfaceConstants. 2015-03-02 03:57:32 +00:00
Major- 03c1fe16ac Improve attributes code. 2015-03-02 03:57:15 +00:00
Major- d74d2fc987 Make server exit if it could not bind to a port. 2015-03-01 19:40:00 +00:00
Major- 23b000a981 Merge branch 'master' of bitbucket.org:Major-/apollo. 2015-03-01 18:42:39 +00:00
Major- 25a41d392a Make MembershipStatus an enumeration. 2015-03-01 18:42:31 +00: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- 785e3a82aa Don't send the initial events if the player is reconnecting. 2015-03-01 06:02:35 +00:00
Major- 406329c295 Listen for the PositionUpdateEvent so area listeners now function. 2015-03-01 02:31:55 +00:00
Major- 3982c3b5f8 Correct opcode of the 377 OpenDialogueOverlayMessage. 2015-03-01 02:31:05 +00:00
Major- f528987019 Change PlayerPositionUpdateEvent to MobPositionUpdateEvent. 2015-02-28 12:42:16 +00:00
Major- 603f76d2c2 Add PlayerPositionUpdateEvent. 2015-02-28 11:59:00 +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- dc8b093bf3 Add CollisionMatrix and CollisionFlag. 2015-02-28 03:41:29 +00:00
Major- 94ba986f02 Merged net into master. 2015-02-27 19:29:31 +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- dabca79661 Add /lib/ to gitignore. 2015-02-27 18:27:49 +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
Major- 7f7656112d Rename 'OpenDialogueOverlayInterfaceMessage' to 'OpenDialogueOverlayMessage'. 2015-02-27 17:45:03 +00:00
Major- 7648abcd8f Add FlashingTabClickedMessage. 2015-02-27 05:56:09 +00:00
Major- 4cf2af762d Remove debug message from attributes.rb. 2015-02-27 05:55:35 +00:00
Major- d81f0feaf7 Move EventContext functionality into Event, remove EventContext, add LogoutEvent support. 2015-02-27 04:34:09 +00:00
Major- 06b6f5fb74 Move login and logout listening to the new Event system and update plugins to reflect this move, remove previous listening system, fix minor bug in EventListenerChainSet. 2015-02-27 04:11:08 +00:00
Major- 3e4ecb5c73 Fix missing return type of World#submit. 2015-02-27 03:36:28 +00:00
Major- 3d2484c42d Finish custom Events. 2015-02-27 03:35:26 +00:00
Major- d60075dcf6 Rename previously-named classes from 'Overlay' to 'Sidebar', add actual Overlay interface support. 2015-02-27 03:21:47 +00:00
Major- 78136c4eaa Add custom Event support. 2015-02-27 03:20:30 +00:00
Major- b8716008ca Merge branch 'master' of bitbucket.org:Major-/apollo. 2015-02-27 03:18:12 +00:00
Major- 7e8deb62f1 Resolve compilation error. 2015-02-27 03:18:00 +00:00
Major- 4e99d16520 Merge branch 'master' of bitbucket.org:Major-/apollo. 2015-02-27 03:00:53 +00:00
Major- b4cc7aa2bd Fix rather serious bug from moving the location the GameSession was set. 2015-02-27 03:00:08 +00:00
Major- 0b6b6ccd03 Move potion constants into a module. 2015-02-26 22:32:59 +00:00
Major- 5fe5aa3940 Add support for simple overlay interfaces. 2015-02-26 21:23:37 +00:00
Major- 441bc9eb77 Fix IdAssignment issue. 2015-02-26 21:03:59 +00:00
Major- 50d53d3c37 Merge branch 'master' of bitbucket.org:Major-/apollo. 2015-02-26 18:40:50 +00:00
Major- 540319c496 Add FlashTabInterfaceMessage. 2015-02-26 18:40:20 +00:00
Major- 5f2b1566de Make minor code improvements to bootstrap, make spawn_npc return the spawned npc. 2015-02-26 04:30:09 +00:00
Major- 8afc8479ec Add pathfinding. 2015-02-26 04:29:15 +00:00
Major- dc40a72f02 Merge branch 'master' of bitbucket.org:Major-/apollo. 2015-02-26 04:27:26 +00:00
Major- d7f909b1a0 Fix merge conflict. 2015-02-26 04:27:19 +00:00
Major- 4d452dbf1e Improve HintIconMessage. 2015-02-26 03:24:08 +00:00
Major- cd5eafe7ac Correct HintIconMessageEncoders. 2015-02-25 21:13:00 +00:00
Major- b3befcac51 Remove debug message from HintIconMessageEncoder. 2015-02-25 21:02:41 +00:00
Major- e076fdf74f Change getSigned -> getUnsigned in NpcActionMessages, resolve merge conflict. 2015-02-25 21:02:04 +00:00
Major- 9e5f454aa5 Add dialogue support. 2015-02-25 16:40:36 +00:00
Major- 612ed89ba7 Add 'MOVE' operation type to Sector, make minor code improvements to Mob and Npc. 2015-02-25 16:37:34 +00:00
Major- 341ea1e422 Rename 'p' to 'other' in PlayerSynchronizationTask. 2015-02-25 16:36:41 +00:00
Major- a089569606 Use Optional in InterfaceSet. 2015-02-25 16:36:02 +00:00
Major- 649dcfc239 Parse release number properly, use Preconditions in IndexedFileSystem. 2015-02-25 16:35:10 +00:00
Major- 5814c5b44f Correct typo in name-lookup plugin. 2015-02-25 16:33:57 +00:00