Commit Graph

521 Commits

Author SHA1 Message Date
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
Ryley Kimmel 76b5f6deb5 Merge branch 'master' of git@bitbucket.org:Major-/apollo.git. 2015-03-04 03:08:10 -05:00
Ryley Kimmel 556253abb2 Move wilderness plguin to combat package, remove explicit return and fix typo. 2015-03-04 03:07:55 -05:00
Major- c52b80c154 Fix Position#getHeight. 2015-03-04 06:31:48 +00:00
Ryley Kimmel 0b1134b5c9 Fix IOOBE when decoding object data, clean-up time, Major!. 2015-03-04 00:31:57 -05:00
Ryley Kimmel 4cacdc9891 Add support for objects that lie within 2 different sectors. 2015-03-04 00:06:35 -05:00
Ryley Kimmel a69431c46c Merge branch 'master' of git@bitbucket.org:Major-/apollo.git into pathfinding. 2015-03-04 00:05:51 -05:00
Major- 723fbac591 Improve error message when attempting to access an illegal index in CollisionMatrix. 2015-03-04 05:05:04 +00:00
Ryley Kimmel bc974d74cb Improve UpdateService by making it use a Logger and method referencing.
- Use correct thrown exception.
- Use forEach and method referencing where possible.
2015-03-03 23:28:15 -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 6f95ba8d2e Fix potential latency issue with on-demand and login writes, constantly writing and flushing is an expensive syscall and should only be done when the channel has been fully read, other instant flushes such as for the game session or initializing HTTP requests must remain untouched as it will potentially block the entire server (and it's nice to have in-game actions done instantly anyway). 2015-03-03 21:18:52 -05:00
Ryley Kimmel 26d1def1c6 Fix, format and rebase wilderness and player-action plugins. 2015-03-03 21:12:32 -05:00
Ryley Kimmel 598b839d67 Merge branch 'master' into pathfinding. 2015-03-03 18:36:10 -05:00
Ryley Kimmel 69b79ae1e0 Merge branch 'master' of git@bitbucket.org:Major-/apollo.git. 2015-03-03 18:20:54 -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 69b4e967ab Merge branch 'master' of git@bitbucket.org:Major-/apollo.git. 2015-03-03 17:45:28 -05:00
Ryley Kimmel 683da91204 Fix bridge matrix collisions, some refactoring. 2015-03-03 17:44:55 -05:00
Ryley Kimmel 26c43677d0 Merge branch 'master' into pathfinding.
Conflicts:.
	src/org/apollo/game/model/area/Sector.java.
2015-03-03 15:03:51 -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- 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
thispixel 3c9d6f0910 Add height checking to isWithinDistance check. 2015-03-02 19:34:37 +00:00
Ryley Kimmel 012073584f Strict source and documentation format. 2015-03-02 13:01:00 -05:00
Ryley Kimmel 777bd13ebb More matrix collision data. 2015-03-02 12:48:25 -05:00
thispixel ad7e2de3e5 interacting entity now resets upon walking. 2015-03-02 15:31:32 +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- 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