Commit Graph

884 Commits

Author SHA1 Message Date
Major- 4680f1a181 Use correct range operator to fix #72. 2015-08-27 22:03:28 +01: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
Major- 92ec907364 Add rubocop configuration file. 2015-08-27 18:18:53 +01:00
Major- 8f3fd75b33 Update all plugins to conform to Rubocop. 2015-08-27 18:17:58 +01:00
Major- 424d2bda29 Merge branch 'master' of https://github.com/apollo-rsps/apollo 2015-08-25 08:37:33 +01:00
Major- 2f166f8b99 Fix fishing skill. 2015-08-25 08:37:22 +01:00
Major- bf11a3567c Ensure login response is written immediately (thanks shamonj03). 2015-08-25 07:40:10 +01:00
Major 25b594cebc Merge pull request #71 from ryleykimmel/master
Fix issue #70.
2015-08-25 07:15:21 +01: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
Major- ed160ef70e Fix travelback implementation. 2015-08-24 14:41:19 +01:00
Major- d9c34cd9ed Allow interception at any level in the message class hierarchy. 2015-08-24 13:38:54 +01:00
Major ac27bacbc5 Fix item equipping.
Fix a bug reported by WizardJesse1 where ItemOptionMessage was being listened to instead of InventoryItemMessage.
2015-08-24 06:49:17 +01:00
Major bf97a4225c Update and rename README to README.md 2015-08-03 10:10:56 +01:00
Major- effcca0c3b Add GroupableEntity. 2015-08-01 14:18:10 +01:00
Major- 02a3170382 Implement toString for Release. 2015-08-01 14:17:39 +01:00
Major- 02fb07b871 Fix AStarPathfindingAlgorithm. 2015-08-01 14:10:07 +01:00
Major- 4665d7617d Move MapFileDecoder to the cache module. 2015-05-27 14:55:58 +01:00
Major- e1bb561f95 Fix doors opening when clicked, instead of when walked to. 2015-05-27 14:55:42 +01:00
Major- 0877805982 Fix two failing tests. 2015-05-27 14:53:42 +01:00
Major- e4778105f5 Modularise! Also add some unit tests. 2015-05-26 13:49:27 +01:00
Major- 902a203861 Move org.apollo.game.model.def to org.apollo.fs.def. 2015-05-25 15:37:07 +01:00
Major- bfac7c7d66 Move Entity.EntityType to a separate file, remove WeakReferencing in DynamicGameObject. 2015-05-25 15:35:14 +01:00
Major- fe65786f3c Improve doc message in ParallelClientSynchronizer. 2015-05-25 15:34:34 +01:00
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