Commit Graph

301 Commits

Author SHA1 Message Date
Major- 77ecb34109 Change the functionality of :bounds. 2015-03-02 09:37:59 +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
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 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
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- dc8b093bf3 Add CollisionMatrix and CollisionFlag. 2015-02-28 03:41:29 +00:00
Ryley Kimmel 3c6ff3b370 Rename buf -> buffer, fixed documentation. 2015-02-27 16:39:41 -05:00
Major- 94ba986f02 Merged net into master. 2015-02-27 19:29:31 +00:00
Ryley Kimmel bb2ef1435f Rename attr -> attribute, remove unnecessary whitespace. 2015-02-27 14:26:59 -05:00
Ryley Kimmel 39ccf3ae2b Fix typo and remove thrown exception. 2015-02-27 14:26:04 -05:00
Ryley Kimmel f059d8da03 Fix resource leak and unnecessary recursion when invalid requests are received. 2015-02-27 14:22:26 -05:00
Ryley Kimmel da967209c0 Reformat using 120 character line width rather than 80. 2015-02-27 13:18:44 -05:00
Ryley Kimmel 46ffb75626 Explicitly close jag grab request channel if no resource is provided. 2015-02-27 13:15:20 -05:00
Ryley Kimmel 4efdfe79c7 Rebase the resource provider; use NIO2 for HttpRequests. 2015-02-27 13:11:43 -05: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- 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
Ryley Kimmel 15fc9a73c2 Merge branch 'master' of git@bitbucket.org:Major-/apollo.git. 2015-02-26 22:12:54 -05:00
Ryley Kimmel b7edf786a5 Formatted and cleaned up the MessageHandlerChain. 2015-02-26 22:11:59 -05:00
Ryley Kimmel 6ce4fe198a Format author tag, for consistency with other authors. 2015-02-26 22:11:32 -05:00
Major- b4cc7aa2bd Fix rather serious bug from moving the location the GameSession was set. 2015-02-27 03:00:08 +00:00
Ryley Kimmel 6c31c0379f Merge branch 'master' of git@bitbucket.org:Major-/apollo.git. 2015-02-26 17:16:03 -05:00
Ryley Kimmel ae24e40b48 Merge branch 'pathfinding'. 2015-02-26 17:15:54 -05:00
Major- 5fe5aa3940 Add support for simple overlay interfaces. 2015-02-26 21:23:37 +00:00