 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 |
|
|
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 |
|
|
Ryley Kimmel
|
9a43317cef
|
Merge branch 'master' of git@bitbucket.org:Major-/apollo.git into pathfinding.
|
2015-03-02 01:33:21 -05:00 |
|
|
Major-
|
2d7a3033c2
|
Commit CollisionFlag so apollo builds again...
|
2015-03-02 06:32:43 +00:00 |
|
|
Ryley Kimmel
|
4e0ffded2a
|
Merge branch 'master' into pathfinding.
|
2015-03-02 01:31:06 -05:00 |
|
|
Ryley Kimmel
|
6b03aabcfe
|
Start on collision matrix.
|
2015-03-02 01:28:45 -05: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 |
|
|
Ryley Kimmel
|
dd9111a0ba
|
Merge branch 'master' of git@bitbucket.org:Major-/apollo.git.
|
2015-03-01 15:09:27 -05:00 |
|