2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-03 08:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
608 Commits 18 Branches 1 Tag
83cff19e823e2bfd9443d9525b7ab19d0c60fdea
Commit Graph

608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Major 83cff19e82 Merged in atomicint/apollo (pull request #5) 
Temporary fix #13
 2015-04-29 04:34:51 +01: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
thispixel 7e648cb7f4 Fix game session not being disposed with correctly when an exception occurs in the pipeline. 2015-04-28 12:39:01 +01: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
Major- 1390da0d0f Remove actions at the correct time. 2015-04-15 18:55:52 +01:00
Major- 080e5091fc Improve ThreadUtil. 2015-04-15 18:44:58 +01:00
Major- c82368bb30 Resolve merge conflict. 2015-04-15 18:36:00 +01:00
Major- bae1f387fd Resolve merge conflict. 2015-04-15 18:35:37 +01: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
Steve a658e1e8c7 Slight change in logic, we only need to snapshot static objects during a REMOVE update, and any other entities during an ADD update. 2015-04-10 08:16:58 -04:00
Steve 48b6dc7122 Changed 'region snapshots' from a list to a map, allowing for the removal of previous update operations. (They were stacking before this commit, leading to problems for players just entering the region) It appears that object updating is now functional. :) 2015-04-10 08:01:08 -04:00
Steve 84373635a1 Fix the re-addition of StaticObjects to the game world. 2015-04-10 07:00:36 -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
John Major db12b1f6c6 Merged feature/region-update into master 2015-04-06 05:22:47 +01:00
Steve 6bffd5c0a1 Fix grouped region updating. Will need to account for re-adding StaticObjects after they have been removed from the game world. Also commented out some broken functionality in bootstrap involving first/second/third/etc message handlers. Should revisit with fix. 2015-04-05 20:18:58 -04:00
Major- f4c181c0f9 Merge branch 'master' of bitbucket.org:Major-/apollo 2015-04-01 22:06:06 +01:00
Major- 32c74c260a Rename DialogueContinueEventEncoder to DialogueContinueMessageDecoder. 2015-04-01 22:05:51 +01: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
Major- e598e95c50 Change RSA public key to 65537 (thanks Lmctruck). 2015-03-28 20:57:23 +00:00
Major- fdfd4c6f32 Add RSA key generator. 2015-03-28 20:48:15 +00:00
Major- 1f2fde61a8 Resolve merge conflict. 2015-03-28 13:52:59 +00:00
Major- 3bd3ddd226 Remove the World singleton. 2015-03-28 13:46:50 +00: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