Commit Graph

549 Commits

Author SHA1 Message Date
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
Major- c52b80c154 Fix Position#getHeight. 2015-03-04 06:31:48 +00: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
Major- 723fbac591 Improve error message when attempting to access an illegal index in CollisionMatrix. 2015-03-04 05:05:04 +00: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