2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-03 00:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 5bbd482a19 Do not fail startup when HTTP cannot bind atomicint 2015-08-27 17:08:41 -04:00
  • 64c99b22cd Update dependencies atomicint 2015-08-27 17:06:56 -04:00
  • 5612bd24e9 Merge pull request #2 from apollo-rsps/master Ryley Kimmel 2015-08-27 17:02:51 -04:00
  • 4680f1a181 Use correct range operator to fix #72. Major- 2015-08-27 22:03:28 +01:00
  • f2fce42ba4 Merge branch 'master' of git@github.com:ryleykimmel/apollo.git atomicint 2015-08-27 14:45:04 -04:00
  • fc821133a2 Merge pull request #1 from apollo-rsps/master Ryley Kimmel 2015-08-27 14:44:46 -04:00
  • 92ec907364 Add rubocop configuration file. Major- 2015-08-27 18:18:53 +01:00
  • 8f3fd75b33 Update all plugins to conform to Rubocop. Major- 2015-08-27 18:17:58 +01:00
  • 424d2bda29 Merge branch 'master' of https://github.com/apollo-rsps/apollo Major- 2015-08-25 08:37:33 +01:00
  • 2f166f8b99 Fix fishing skill. Major- 2015-08-25 08:37:22 +01:00
  • bf11a3567c Ensure login response is written immediately (thanks shamonj03). Major- 2015-08-25 07:40:10 +01:00
  • 25b594cebc Merge pull request #71 from ryleykimmel/master Major 2015-08-25 07:15:21 +01:00
  • 7e64f9805d Better exception propagation when failing to bind atomicint 2015-08-24 23:39:32 -04:00
  • 592b993d9b Fixes issue #70 atomicint 2015-08-24 21:29:50 -04:00
  • ed160ef70e Fix travelback implementation. Major- 2015-08-24 14:41:19 +01:00
  • d9c34cd9ed Allow interception at any level in the message class hierarchy. Major- 2015-08-24 13:38:54 +01:00
  • ac27bacbc5 Fix item equipping. Major 2015-08-24 06:49:17 +01:00
  • bf97a4225c Update and rename README to README.md Major 2015-08-03 10:10:56 +01:00
  • effcca0c3b Add GroupableEntity. Major- 2015-08-01 14:18:10 +01:00
  • 02a3170382 Implement toString for Release. Major- 2015-08-01 14:17:39 +01:00
  • 02fb07b871 Fix AStarPathfindingAlgorithm. Major- 2015-08-01 14:10:07 +01:00
  • 4665d7617d Move MapFileDecoder to the cache module. Major- 2015-05-27 14:55:58 +01:00
  • e1bb561f95 Fix doors opening when clicked, instead of when walked to. Major- 2015-05-27 14:55:42 +01:00
  • 0877805982 Fix two failing tests. Major- 2015-05-27 14:53:42 +01:00
  • e4778105f5 Modularise! Also add some unit tests. Major- 2015-05-26 13:49:27 +01:00
  • 902a203861 Move org.apollo.game.model.def to org.apollo.fs.def. Major- 2015-05-25 15:37:07 +01:00
  • bfac7c7d66 Move Entity.EntityType to a separate file, remove WeakReferencing in DynamicGameObject. Major- 2015-05-25 15:35:14 +01:00
  • fe65786f3c Improve doc message in ParallelClientSynchronizer. Major- 2015-05-25 15:34:34 +01:00
  • 83cff19e82 Merged in atomicint/apollo (pull request #5) John Major 2015-04-29 04:34:51 +01:00
  • da8626ce82 Omit redundant null check atomicint 2015-04-28 11:32:52 -04:00
  • 670cf9d902 Revert 5207651 atomicint 2015-04-28 11:27:47 -04:00
  • 470dbf3b9b Temporary fix for #13 atomicint 2015-04-28 11:25:20 -04:00
  • 7e648cb7f4 Fix game session not being disposed with correctly when an exception occurs in the pipeline. thispixel 2015-04-28 12:39:01 +01:00
  • 5207651b26 Potential fix for #16 atomicint 2015-04-22 01:57:23 -04:00
  • bacb708d26 Merged in atomicint/apollo (pull request #3) Ryley Kimmel 2015-04-21 20:02:03 -04:00
  • fad1936ff6 Fixes #17 atomicint 2015-04-21 19:54:17 -04:00
  • 1390da0d0f Remove actions at the correct time. Major- 2015-04-15 18:55:52 +01:00
  • 080e5091fc Improve ThreadUtil. Major- 2015-04-15 18:44:58 +01:00
  • c82368bb30 Resolve merge conflict. Major- 2015-04-15 18:36:00 +01:00
  • bae1f387fd Resolve merge conflict. Major- 2015-04-15 18:35:37 +01:00
  • 2c37a61049 Merge branch 'master' of https://atomicint@bitbucket.org/Major-/apollo.git atomicint 2015-04-13 16:12:25 -04:00
  • ad6f377ff0 Cache server CRCs atomicint 2015-04-13 16:11:34 -04:00
  • 39c75133b9 Cache server CRCs atomicint 2015-04-13 16:03:45 -04:00
  • 802d41306a Do not allow null objects to be passed to the ServerContext, use Guava stopwatch atomicint 2015-04-13 14:30:04 -04:00
  • 8d9c0d57a3 Use the context's Release rather than the LoginSessions, unnecessary propagation. atomicint 2015-04-13 14:29:30 -04:00
  • 3b7b0bdba2 Old-style poll, looks nicer, exceptions in lambda look funky. atomicint 2015-04-13 14:28:51 -04:00
  • a80086e726 Assign the SESSION_KEY to the connecting channel rather than the channel handler context atomicint 2015-04-13 14:28:29 -04:00
  • aba1dffa0e Verify CRCs on login, atomicint 2015-04-13 13:59:44 -04:00
  • 7a12a27c76 ThreadFactory utility atomicint 2015-04-13 13:57:59 -04:00
  • d5b99e72bc Merge branch 'feature/region-update' of https://atomicint@bitbucket.org/Major-/apollo.git atomicint 2015-04-10 15:43:02 -04:00
  • 7a2d933a5f Rebase the isaac random algorithm implementation. atomicint 2015-04-10 15:37:02 -04:00
  • a658e1e8c7 Slight change in logic, we only need to snapshot static objects during a REMOVE update, and any other entities during an ADD update. Steve 2015-04-10 08:16:58 -04:00
  • 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. :) Steve 2015-04-10 08:01:08 -04:00
  • 84373635a1 Fix the re-addition of StaticObjects to the game world. Steve 2015-04-10 07:00:36 -04:00
  • b323a7625b Remove irrelevant documentation from MopPositionUpdateEvent atomicint 2015-04-09 17:17:32 -04:00
  • 433d4c359a Strict whitespace format, make private fields final that can be immutable atomicint 2015-04-08 16:40:15 -04:00
  • 08ffdf9f41 Format POM atomicint 2015-04-07 18:59:22 -04:00
  • 6ada19fdc4 Rewrite capitalize method atomicint 2015-04-07 18:58:58 -04:00
  • 725ada7878 Update Netty. http://netty.io/news/2015/04/02/4-0-27-Final.html atomicint 2015-04-07 18:57:55 -04:00
  • db12b1f6c6 Merged feature/region-update into master John Major 2015-04-06 05:22:47 +01:00
  • 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. Steve 2015-04-05 20:18:58 -04:00
  • f4c181c0f9 Merge branch 'master' of bitbucket.org:Major-/apollo Major- 2015-04-01 22:06:06 +01:00
  • 32c74c260a Rename DialogueContinueEventEncoder to DialogueContinueMessageDecoder. Major- 2015-04-01 22:05:51 +01:00
  • bdec06a4ca Let PlayerCredentials house the connecting remote address. atomicint 2015-03-31 19:45:20 -04:00
  • 218739a4ff Remove redundant MobRepository access atomicint 2015-03-29 18:59:25 -04:00
  • cf2f06c702 Fixed package location for message handlers in messages.xml atomicint 2015-03-29 18:25:56 -04:00
  • 8a558a8200 Use Guava for building thread factory, remove reudndant utility atomicint 2015-03-29 15:11:47 -04:00
  • 7ebed5802c Merge branch 'master' of https://atomicint@bitbucket.org/Major-/apollo.git atomicint 2015-03-29 12:53:15 -04:00
  • 654a1a6dfd Rebase the MessageHandler, MessageHandlerChain and MessageHandlerChainSet Rebased several other pieces of code atomicint 2015-03-29 12:52:55 -04:00
  • 7f345fffac Better name for "tribyte" -> "medium" atomicint 2015-03-29 12:33:39 -04:00
  • e598e95c50 Change RSA public key to 65537 (thanks Lmctruck). Major- 2015-03-28 20:57:23 +00:00
  • fdfd4c6f32 Add RSA key generator. Major- 2015-03-28 20:48:15 +00:00
  • 1f2fde61a8 Resolve merge conflict. Major- 2015-03-28 13:52:59 +00:00
  • 3bd3ddd226 Remove the World singleton. Major- 2015-03-28 13:46:50 +00:00
  • 29f6524d14 Rebase OnDemandRequestWorker#service(T, Channel, V) atomicint 2015-03-27 16:42:55 -04:00
  • cff1184e33 Format interface method in RegionListener atomicint 2015-03-27 16:42:08 -04:00
  • eb8e4322b7 Simplify combat level and total level calculation atomicint 2015-03-23 18:47:10 -04:00
  • d52a3ae6c8 Prevent appearance being updated when non-combat skills are levelled up; only used to update combat level. atomicint 2015-03-23 18:44:57 -04:00
  • 9569bf374d Add GameService#shutdown, remove comment on overridden method, rebase some sloppy code. atomicint 2015-03-23 16:44:15 -04:00
  • e136d7847b Removed the hard coded index fix for the mob repository, properly fixed it and cleaned up some of the repository code itself. atomicint 2015-03-23 10:33:31 -07:00
  • 5aba2ab23e Add XXX message atomicint 2015-03-23 09:16:26 -07:00
  • 3875fae35a Tsk tsk, Major copying and pasting is bad. You forget things. Fixes issue #59 https://github.com/apollo-rsps/apollo/issues/59 atomicint 2015-03-23 09:13:40 -07:00
  • 8981d19243 Fix private messaging issue #57 https://github.com/apollo-rsps/apollo/issues/57 atomicint 2015-03-23 09:12:10 -07:00
  • b4176e8097 Format line endings atomicint 2015-03-23 09:04:37 -07:00
  • 7cf31a2888 Add half-done grouped region frame stuff so Ryley can take a look. This is in master because I'm an idiot. Major- 2015-03-22 11:07:24 +00:00
  • 30045a6f10 Rename 'Sector' to 'Region'. Major- 2015-03-15 18:54:47 +00:00
  • 3e85006950 Revert net.xml to previous state. Major- 2015-03-14 18:32:35 +00:00
  • 2b04017ce6 Merged in Snoopya1a/apollo-jeremy (pull request #2) John Major 2015-03-14 17:55:44 +00:00
  • af4be4b916 Add graphic height support to npcs thispixel 2015-03-13 14:34:51 +00:00
  • da4040ab5c Merged Major-/apollo into master Jeremy Conklin 2015-03-12 22:04:02 -06:00
  • 9fb65be3a8 Fixed issue with super str and def (4) turning into regular str and def pots. Also fixed super combat formula, range pot formula, and mage pot formula Jeremy Conklin 2015-03-13 04:01:04 +00:00
  • 9c0cf17141 Fix player index in PlayerActionMessage thispixel 2015-03-12 14:31:47 +00:00
  • 5286e3a5cf Merged in Snoopya1a/apollo (pull request #1) John Major 2015-03-11 23:42:19 +00:00
  • be8bcc2fd0 food.rb edited online with Bitbucket Jeremy Conklin 2015-03-11 22:44:11 +00:00
  • 378b6f2a81 food.rb edited online with Bitbucket Jeremy Conklin 2015-03-11 18:31:20 +00:00
  • c245516599 formatting Jeremy Conklin 2015-03-11 18:27:10 +00:00
  • 2088b49a34 added more consumables (edited formatting) Jeremy Conklin 2015-03-11 03:28:01 +00:00
  • e5e423d52c added more food (edit: formatting) Jeremy Conklin 2015-03-11 03:20:28 +00:00
  • 29bee05233 added more food Jeremy Conklin 2015-03-11 03:05:44 +00:00
  • 4b3e771e41 added more food consumables Jeremy Conklin 2015-03-11 02:48:10 +00:00