2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-10-01 02:17:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
761 Commits 18 Branches 1 Tag
d2b54bde4d6ab537e96f693c8e4fb6948bb27385
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
atomicint d2b54bde4d Made test class names consistent with other tests 
Make test classes final

Ensure all test method names are consistent
 2016-02-09 10:21:34 -05:00
atomicint 0bac265a06 Fix issue #153 2016-02-05 12:35:16 -05:00
atomicint 2e9a7ddaaf Fix issue #142 
Add unit test for MobRepository#remove(null)

Add explicit null check

Remove empty line, change useless exception message
 2016-02-05 12:23:13 -05:00
atomicint 6bb0c70c07 Fixed "It heals some health" food consumable message. 2016-02-03 19:21:53 -05:00
atomicint 86ed50da12 Resolves issue #155, resolves issue #154, resolves issue #107 2016-02-03 18:21:04 -05:00
atomicint 848a6780e2 Add Region#getEntities and Region#getSurrounding for issue #150 
Remove includeSelf param
 2016-02-03 14:56:09 -05:00
atomicint 32ef506211 Fixes issue #65, adds support for emotes/anims in dialogue 
Use block instead of lambda, add emotes.rb

Proper tutorial island emote

Add newline at end of emotes.rb

Use block instead of lambda, fix send_generic_dialogue method to accept block
 2016-01-29 15:53:52 -05:00
atomicint 837460da39 Fixes issue #93 2016-01-24 03:45:17 -05:00
atomicint 088d872f93 Fixes issue #74 2016-01-23 15:52:43 -05:00
atomicint 5156e0bc19 Removed inline comments 2016-01-22 15:55:40 -05:00
atomicint cebdb811cb Clean up hasCachedAppearance 
- Remove useless inline comment
- Remove blank line after param declaration
- Only call getIndex() once
 2016-01-22 15:51:52 -05:00
atomicint c7d1a5a732 Fixes issue #84 2016-01-22 02:01:21 -05:00
atomicint 637a18d155 Fixes issue #98 (also adds unit test for MobRepository) 2016-01-22 01:11:03 -05:00
atomicint c3ba803e30 Merge branch 'master' of git@github.com:ryleykimmel/apollo.git 2015-08-27 17:08:48 -04:00
atomicint 5bbd482a19 Do not fail startup when HTTP cannot bind 2015-08-27 17:08:41 -04:00
atomicint 64c99b22cd Update dependencies 2015-08-27 17:06:56 -04:00
Ryley Kimmel 5612bd24e9 Merge pull request #2 from apollo-rsps/master 
Use correct range operator to fix #72.
 2015-08-27 17:02:51 -04:00
atomicint f2fce42ba4 Merge branch 'master' of git@github.com:ryleykimmel/apollo.git 2015-08-27 14:45:04 -04:00
Ryley Kimmel fc821133a2 Merge pull request #1 from apollo-rsps/master 
merge from apollo-rsps/apollo
 2015-08-27 14:44:46 -04:00
atomicint 7e64f9805d Better exception propagation when failing to bind 2015-08-24 23:39:32 -04:00
atomicint 592b993d9b Fixes issue #70 2015-08-24 21:29:50 -04:00
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
Ryley Kimmel bacb708d26 Merged in atomicint/apollo (pull request #3) 
Fixes #17
 2015-04-21 20:02:03 -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