 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 |
|
|
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 |
|
|
Ryley Kimmel
|
0e1e195557
|
Merge branch 'net'.
|
2015-03-01 15:09:20 -05:00 |
|
|
Ryley Kimmel
|
1899a92915
|
Rebase the StatefulFrameDecoder and write response codes for invalid received data.
|
2015-03-01 15:06:17 -05:00 |
|
|
Major-
|
d74d2fc987
|
Make server exit if it could not bind to a port.
|
2015-03-01 19:40:00 +00:00 |
|
|
Ryley Kimmel
|
794bd49607
|
Basic implementation of player context menu action management.
|
2015-03-01 14:38:00 -05:00 |
|
|
Ryley Kimmel
|
d6437469c7
|
Merge branch 'master' into resource.
|
2015-03-01 14:09:41 -05: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 |
|
|
Ryley Kimmel
|
884dd440e9
|
Fix events only being sent on re-connect.
|
2015-03-01 13:41:17 -05:00 |
|
|
Ryley Kimmel
|
aa400a271c
|
Merge branch 'master' into resource.
|
2015-03-01 11:07:26 -05:00 |
|
|
Ryley Kimmel
|
9089b57e62
|
Fix documentation typo.
|
2015-03-01 11:07:12 -05:00 |
|
|
Ryley Kimmel
|
4ebb592eac
|
Merge branch 'resource'.
|
2015-03-01 11:05:08 -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-
|
785e3a82aa
|
Don't send the initial events if the player is reconnecting.
|
2015-03-01 06:02:35 +00:00 |
|