Commit Graph

564 Commits

Author SHA1 Message Date
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
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
Major- 7cf31a2888 Add half-done grouped region frame stuff so Ryley can take a look. This is in master because I'm an idiot. 2015-03-22 11:07:24 +00:00
Major- 30045a6f10 Rename 'Sector' to 'Region'. 2015-03-15 18:54:47 +00:00
Major- 3e85006950 Revert net.xml to previous state. 2015-03-14 18:32:35 +00:00
John Major 2b04017ce6 Merged in Snoopya1a/apollo-jeremy (pull request #2)
Fix potion formulae and item ids.
2015-03-14 17:55:44 +00:00
thispixel af4be4b916 Add graphic height support to npcs 2015-03-13 14:34:51 +00:00
Jeremy Conklin da4040ab5c Merged Major-/apollo into master 2015-03-12 22:04:02 -06:00
Jeremy Conklin 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 2015-03-13 04:01:04 +00:00
thispixel 9c0cf17141 Fix player index in PlayerActionMessage 2015-03-12 14:31:47 +00:00
John Major 5286e3a5cf Merged in Snoopya1a/apollo (pull request #1)
Add more food consumables.
2015-03-11 23:42:19 +00:00
Jeremy Conklin be8bcc2fd0 food.rb edited online with Bitbucket 2015-03-11 22:44:11 +00:00
Jeremy Conklin 378b6f2a81 food.rb edited online with Bitbucket 2015-03-11 18:31:20 +00:00
Jeremy Conklin c245516599 formatting 2015-03-11 18:27:10 +00:00
Jeremy Conklin 2088b49a34 added more consumables (edited formatting) 2015-03-11 03:28:01 +00:00
Jeremy Conklin e5e423d52c added more food (edit: formatting) 2015-03-11 03:20:28 +00:00
Jeremy Conklin 29bee05233 added more food 2015-03-11 03:05:44 +00:00
Jeremy Conklin 4b3e771e41 added more food consumables 2015-03-11 02:48:10 +00:00
Major- 7c51df4206 Fix Javadoc warnings. 2015-03-10 16:18:19 +00:00
Major- b4b6e0df65 Rename 'rsa.xml' to 'net.xml' and define port values in the aforementioned. 2015-03-09 18:19:45 +00:00
thispixel 7d80709a8c Add XmlNode#getOptionalValue 2015-03-09 14:22:24 +00:00
Major- 053e3a30be Add acronym support (e.g. NPC) to LanguageUtil#getIndefiniteArticle. 2015-03-09 12:57:30 +00:00
Major- 3d00cf9251 Flush on OnDemand write. 2015-03-09 08:24:05 +00:00
Major- 021d14472b Fix missing rparen in Survival Expert dialogue. 2015-03-09 08:23:50 +00:00
Major- e0d01c970e Correct one of the preconditions in the runescape guide dialogue. 2015-03-08 11:18:42 +00:00
Major- a6ac0610e5 Add support for executing blocks when directly using close() in a dialogue. 2015-03-08 10:57:25 +00:00
Major- 4f880c7bed Add exec support. 2015-03-07 15:08:54 +00:00
Major- 3f616a2043 Properly encode StringAttributes. 2015-03-07 15:07:33 +00:00
Major- f0424d66fe Correct variable name in Fishing skill. 2015-03-07 14:21:00 +00:00
Major- d787906514 Fix poor usage of compareTo. 2015-03-06 22:32:17 +00:00
Major- 91f9005954 Resolve merge conflict. 2015-03-06 22:09:41 +00:00
Major- 9208ac6490 Improve MapFileDecoder decode, add ObjectGroup and ObjectType. 2015-03-06 08:47:26 +00:00
Major- 5111fe9b24 Use unsigned right shift operator instead of ANDing. 2015-03-06 08:45:59 +00:00
Major- 2a6fffabbb Correct documentation comment. 2015-03-06 08:45:39 +00:00
Major- 297657cda6 Decode morphisms so ObjectDefinitions are actually correct. 2015-03-06 08:44:13 +00:00
Ryley Kimmel 500c513e28 Improve poor/legacy code. 2015-03-04 15:51:07 -05:00
Major- c8e7d710f0 Merge branch 'master' of bitbucket.org:Major-/apollo into pathfinding. 2015-03-04 15:09:39 +00:00
Major- 4984ecfa62 Use latest netty version. 2015-03-04 15:09:04 +00: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