2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-10-01 18:15:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
605 Commits 18 Branches 1 Tag
da8626ce82c045e80b5ee0ca3ea475ba2004ab98
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
atomicint da8626ce82 Omit redundant null check 2015-04-28 11:32:52 -04:00
atomicint 670cf9d902 Revert 5207651 2015-04-28 11:27:47 -04:00
atomicint 470dbf3b9b Temporary fix for #13 2015-04-28 11:25:20 -04:00
atomicint 5207651b26 Potential fix for #16 2015-04-22 01:57:23 -04:00
atomicint fad1936ff6 Fixes #17 2015-04-21 19:54:17 -04:00
atomicint 2c37a61049 Merge branch 'master' of https://atomicint@bitbucket.org/Major-/apollo.git 
Conflicts:
	src/org/apollo/fs/IndexedFileSystem.java
 2015-04-13 16:12:25 -04:00
atomicint ad6f377ff0 Cache server CRCs 2015-04-13 16:11:34 -04:00
atomicint 39c75133b9 Cache server CRCs 2015-04-13 16:03:45 -04:00
atomicint 802d41306a Do not allow null objects to be passed to the ServerContext, use Guava stopwatch 2015-04-13 14:30:04 -04:00
atomicint 8d9c0d57a3 Use the context's Release rather than the LoginSessions, unnecessary propagation. 2015-04-13 14:29:30 -04:00
atomicint 3b7b0bdba2 Old-style poll, looks nicer, exceptions in lambda look funky. 2015-04-13 14:28:51 -04:00
atomicint a80086e726 Assign the SESSION_KEY to the connecting channel rather than the channel handler context 2015-04-13 14:28:29 -04:00
atomicint aba1dffa0e Verify CRCs on login, 2015-04-13 13:59:44 -04:00
atomicint 7a12a27c76 ThreadFactory utility 2015-04-13 13:57:59 -04:00
atomicint d5b99e72bc Merge branch 'feature/region-update' of https://atomicint@bitbucket.org/Major-/apollo.git 
Conflicts:
	src/org/apollo/game/model/World.java
	src/org/apollo/game/model/area/Region.java
 2015-04-10 15:43:02 -04:00
atomicint 7a2d933a5f Rebase the isaac random algorithm implementation. 2015-04-10 15:37:02 -04:00
atomicint b323a7625b Remove irrelevant documentation from MopPositionUpdateEvent 2015-04-09 17:17:32 -04:00
atomicint 433d4c359a Strict whitespace format, make private fields final that can be immutable 2015-04-08 16:40:15 -04:00
atomicint 08ffdf9f41 Format POM 2015-04-07 18:59:22 -04:00
atomicint 6ada19fdc4 Rewrite capitalize method 2015-04-07 18:58:58 -04:00
atomicint 725ada7878 Update Netty. http://netty.io/news/2015/04/02/4-0-27-Final.html 2015-04-07 18:57:55 -04:00
atomicint bdec06a4ca Let PlayerCredentials house the connecting remote address. 2015-03-31 19:45:20 -04:00
atomicint 218739a4ff Remove redundant MobRepository access 2015-03-29 18:59:25 -04:00
atomicint cf2f06c702 Fixed package location for message handlers in messages.xml 2015-03-29 18:25:56 -04:00
atomicint 8a558a8200 Use Guava for building thread factory, remove reudndant utility 2015-03-29 15:11:47 -04:00
atomicint 7ebed5802c Merge branch 'master' of https://atomicint@bitbucket.org/Major-/apollo.git 2015-03-29 12:53:15 -04:00
atomicint 654a1a6dfd Rebase the MessageHandler, MessageHandlerChain and MessageHandlerChainSet 
Rebased several other pieces of code
 2015-03-29 12:52:55 -04:00
atomicint 7f345fffac Better name for "tribyte" -> "medium" 2015-03-29 12:33:39 -04:00
atomicint 29f6524d14 Rebase OnDemandRequestWorker#service(T, Channel, V) 2015-03-27 16:42:55 -04:00
atomicint cff1184e33 Format interface method in RegionListener 2015-03-27 16:42:08 -04:00
atomicint eb8e4322b7 Simplify combat level and total level calculation 2015-03-23 18:47:10 -04:00
atomicint d52a3ae6c8 Prevent appearance being updated when non-combat skills are levelled up; only used to update combat level. 2015-03-23 18:44:57 -04:00
atomicint 9569bf374d Add GameService#shutdown, remove comment on overridden method, rebase some sloppy code. 2015-03-23 16:44:15 -04:00
atomicint e136d7847b Removed the hard coded index fix for the mob repository, properly fixed it and cleaned up some of the repository code itself. 2015-03-23 10:33:31 -07:00
atomicint 5aba2ab23e Add XXX message 2015-03-23 09:16:26 -07:00
atomicint 3875fae35a Tsk tsk, Major copying and pasting is bad. You forget things. Fixes issue #59 https://github.com/apollo-rsps/apollo/issues/59 2015-03-23 09:13:40 -07:00
atomicint 8981d19243 Fix private messaging issue #57 https://github.com/apollo-rsps/apollo/issues/57 2015-03-23 09:12:10 -07:00
atomicint b4176e8097 Format line endings 2015-03-23 09:04:37 -07:00
Ryley Kimmel 500c513e28 Improve poor/legacy code. 2015-03-04 15:51:07 -05: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
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
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
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
Ryley Kimmel 9a43317cef Merge branch 'master' of git@bitbucket.org:Major-/apollo.git into pathfinding. 2015-03-02 01:33:21 -05: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
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