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
658 Commits 18 Branches 1 Tag
f7661a7fc8a7171c8d20ca6178bbb9f21f1019da
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Major- f7661a7fc8 Add shops support. 2015-08-29 22:40:08 +01:00
Major- cdffc15dfc Reformat files modified in previous commit. 2015-08-29 22:38:03 +01:00
Major- 2bc9854ea1 Merge. 2015-08-29 22:30:59 +01:00
Major- 38af001083 Optimise definition decoding for faster start-up. 2015-08-29 19:57:57 +01:00
Major- b134f6fdf5 Merge branch 'master' of https://github.com/apollo-rsps/apollo 2015-08-29 16:12:57 +01:00
Major- c066742588 Fix issue #82. 2015-08-29 16:12:52 +01:00
Major- 81a763cd69 Fix npc spawning command. 2015-08-29 12:36:08 +01:00
Major- 888230b768 Remove unused BinaryFileUtils class. 2015-08-28 18:25:58 +01:00
Major- f0910afb6f Combine (First|Second|Third|Fourth|Fifth)XMessages into a single class. 2015-08-28 18:16:24 +01:00
Major- 6f5a910d70 Fix issue #64. 2015-08-28 16:33:06 +01:00
Major- 0a3574eb20 Fix ScheduledTask timer. 2015-08-27 23:29:27 +01:00
Major- 493c5010e8 Cache already-decoded Archives. 2015-08-27 22:25:22 +01:00
Major- 4680f1a181 Use correct range operator to fix #72. 2015-08-27 22:03:28 +01:00
Major- 92ec907364 Add rubocop configuration file. 2015-08-27 18:18:53 +01:00
Major- 8f3fd75b33 Update all plugins to conform to Rubocop. 2015-08-27 18:17:58 +01:00
Major- 424d2bda29 Merge branch 'master' of https://github.com/apollo-rsps/apollo 2015-08-25 08:37:33 +01:00
Major- 2f166f8b99 Fix fishing skill. 2015-08-25 08:37:22 +01:00
Major- bf11a3567c Ensure login response is written immediately (thanks shamonj03). 2015-08-25 07:40:10 +01:00
Major- ed160ef70e Fix travelback implementation. 2015-08-24 14:41:19 +01:00
Major- d9c34cd9ed Allow interception at any level in the message class hierarchy. 2015-08-24 13:38:54 +01:00
Major- effcca0c3b Add GroupableEntity. 2015-08-01 14:18:10 +01:00
Major- 02a3170382 Implement toString for Release. 2015-08-01 14:17:39 +01:00
Major- 02fb07b871 Fix AStarPathfindingAlgorithm. 2015-08-01 14:10:07 +01:00
Major- 4665d7617d Move MapFileDecoder to the cache module. 2015-05-27 14:55:58 +01:00
Major- e1bb561f95 Fix doors opening when clicked, instead of when walked to. 2015-05-27 14:55:42 +01:00
Major- 0877805982 Fix two failing tests. 2015-05-27 14:53:42 +01:00
Major- e4778105f5 Modularise! Also add some unit tests. 2015-05-26 13:49:27 +01:00
Major- 902a203861 Move org.apollo.game.model.def to org.apollo.fs.def. 2015-05-25 15:37:07 +01:00
Major- bfac7c7d66 Move Entity.EntityType to a separate file, remove WeakReferencing in DynamicGameObject. 2015-05-25 15:35:14 +01:00
Major- fe65786f3c Improve doc message in ParallelClientSynchronizer. 2015-05-25 15:34:34 +01:00
John Major 83cff19e82 Merged in atomicint/apollo (pull request #5) 
Temporary fix #13
 2015-04-29 04:34:51 +01:00
Major- 1390da0d0f Remove actions at the correct time. 2015-04-15 18:55:52 +01:00
Major- 080e5091fc Improve ThreadUtil. 2015-04-15 18:44:58 +01:00
Major- c82368bb30 Resolve merge conflict. 2015-04-15 18:36:00 +01:00
Major- bae1f387fd Resolve merge conflict. 2015-04-15 18:35:37 +01:00
John Major db12b1f6c6 Merged feature/region-update into master 2015-04-06 05:22:47 +01:00
Major- f4c181c0f9 Merge branch 'master' of bitbucket.org:Major-/apollo 2015-04-01 22:06:06 +01:00
Major- 32c74c260a Rename DialogueContinueEventEncoder to DialogueContinueMessageDecoder. 2015-04-01 22:05:51 +01:00
Major- e598e95c50 Change RSA public key to 65537 (thanks Lmctruck). 2015-03-28 20:57:23 +00:00
Major- fdfd4c6f32 Add RSA key generator. 2015-03-28 20:48:15 +00: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
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
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