Commit Graph
40 Commits
Author SHA1 Message Date
Ryley Kimmel 012073584f Strict source and documentation format. 2015-03-02 13:01:00 -05: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
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
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
Ryley Kimmel 3c6ff3b370 Rename buf -> buffer, fixed documentation. 2015-02-27 16:39:41 -05: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
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
Ryley Kimmel ac70cdeef4 Fix a typo within the bootstrap. 2015-02-26 19:27:57 -05:00
Ryley Kimmel be4a4ea7c9 Add default dependencies tag to the consumable plugin. 2015-02-26 17:26:23 -05: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
Ryley Kimmel 36fe2933b5 Add support for 'slices' of food (pizza, cakes).
Fix skill constant that did not exist.
Add support for different food delays.
2015-02-26 17:15:48 -05:00
Ryley Kimmel 369fa6e661 Remove unnecessary skill dependency from consumable Potions. 2015-02-26 17:14:10 -05:00
Ryley Kimmel 00627e0f48 Use player#openBank() over BankUtils#openBank(Player). 2015-02-26 13:56:01 -05:00
Ryley Kimmel 52eb84930d Remove unused imports. 2015-02-26 13:52:21 -05:00
Ryley Kimmel e6301dd6b6 Remove duplicate openBank method. 2015-02-26 13:50:28 -05:00
Ryley Kimmel e2d150b6ca Fix an issue where the mob interaction index was set incorrectly for players. 2015-02-26 01:01:50 -05:00
Ryley Kimmel 7c09ab1433 Add object obstruction to object definitions. 2015-02-26 00:25:05 -05:00
Ryley Kimmel e26ed8c8a1 Login/Logout listener formatting. 2015-02-26 00:03:17 -05:00
Ryley Kimmel 28a3d8464a Remove redundant note information and binary note information updater, ItemDefinition already manages this. 2015-02-25 23:58:49 -05:00
Ryley Kimmel f0b6208d95 Remove the redundant createIfAbsent method within the AStarPathfindingAlgorithm. 2015-02-25 23:51:14 -05:00
Ryley Kimmel 750b200d90 Use the Positions hashcode implementation and utilize toStringHelper within Node. 2015-02-25 23:50:42 -05:00
Ryley Kimmel c046324421 Merge branch 'master' of git@bitbucket.org:Major-/apollo.git. 2015-02-25 23:24:15 -05:00
Ryley Kimmel 68addd2fa1 Ignore bin directory. 2015-02-25 23:24:13 -05:00
Ryley Kimmel 7617bc4622 Fix the broken equipment weilding event. 2015-02-25 23:23:57 -05:00
Ryley Kimmel edd7b483af Don't map item amount in Inventory#add(int, int). 2015-02-25 15:30:46 -05:00
Ryley Kimmel 87ff14c4d7 Inventory improvements: (expand commit for details).
- Fixed a bug with Inventory#add(Item) not handling integer overflow properly.
- Fixed a bug with Inventory#add(Item) returning an Item object with an amount of 0 instead of null.
- Inventory#add(Item) now returns an Optional<Item> object and cleaned up portions of the method.
- code clean-up to Inventory#remove(int, int).
- Inventory#remove(int, int) now supports stopping and refiring of listeners while the inventory is being updated (prevents flickering and unnecessary updating of the inventory for batch updates).
2015-02-25 15:17:41 -05:00