Commit Graph

Select branches

Hide Pull Requests

AndroidX-Migration

OMGeeky-patch-1

OMGeeky-patch-2

OMGeeky-patch-3

OMGeeky-patch-4

OMGeeky-patch-5

V0.8.8

actor-condition-descriptions

add-tick-debug-button

agp-upgrade

android-upgrade

anti-cheat-checksum

at-reference-corrections

auto-build

auto_build

base

blank_engine

code-analysis-bot

f-show-zero-ac

fix-duplicate-tilesets-in-maps

fix-item-drop-amount

fix-use-item-cost-with-skill

fix-visual-bugs

github_pages

gitignore-1

gitignore-fix-1

gra

gradle-copy-v2

gradle-update

gradle-update-v-8.0

gradle_auto_copy

gradle_copy_v1

hotfix-freeze-animations

import-export

import_implementation

master

no-empty-dialogues

on-miss-effects

remove-duplicate-entries

respawnspeed

savegame-hash

savegame-names

tiled_worlds

v0.8.7(new)

#1

#2

#3

#4

#5

#6

#7

Mono Color

• 37ae3b6c69 WIP moving conversation flow logic from Activity to testable state machine. Oskar Wiksten 2013-02-20 16:07:01 +00:00
• 6261c499ff Renamed "ViewContext" -> "ControllerContext" to better reflect its responsibility. Oskar Wiksten 2013-02-20 15:30:53 +00:00
• f5ff29a0fe Refactored results of phrase rewards, in preparation of displaying more results when gaining rewards. Oskar Wiksten 2013-02-18 07:43:38 +00:00
• 24ab3b95f0 Updated IntelliJ Idea project file to work with any Android API version. Oskar Wiksten 2013-02-15 15:14:49 +00:00
• 8575e89dee Update R.layout.inventoryitemview to a single TextView instead of a combined ImageView & TextView. Oskar Wiksten 2013-02-15 12:04:05 +00:00
• 9bb1e73f07 Reduce compilation warnings from code inspection rules. (Reduce visibilities to private, add final where applicable) Oskar Wiksten 2013-02-15 09:59:57 +00:00
• 59df54f1bb Remove compilation warnings about showDialog() and removeDialog() being deprecated. Oskar Wiksten 2013-02-15 07:50:45 +00:00
• a8b21461de Minor refactoring CombatController. Oskar Wiksten 2013-02-14 14:57:40 +00:00
• f16cfa3ab0 Remove compilation warnings about "new BitmapDrawable(Bitmap)" being deprecated. Oskar Wiksten 2013-02-14 14:57:00 +00:00
• d2428ad36c Add IntelliJ Idea project file. Add Android v4 support library. Oskar Wiksten 2013-02-14 14:47:46 +00:00
• 91015e5ea7 Rearrange .gitignore. Oskar Wiksten 2013-02-14 14:47:09 +00:00
• 668993c01b Add clear() method to event listener queues. Oskar Wiksten 2013-02-13 15:31:11 +00:00
• 2bc06041ad Remove trailing spaces in some conversation phrase texts. Oskar Wiksten 2013-02-12 13:58:46 +00:00
• fb45d7e372 Add support for "description" field on items, for lore/background text that should be displayed on the item. Oskar Wiksten 2013-02-11 11:10:00 +00:00
• 48d93fbbd0 Only apply "more criticals" skill if the player has CS>0. (Thanks to TriangleGM for reporting it!) Oskar Wiksten 2013-02-09 17:02:33 +01:00
• a32595c645 Refactor content editor - Correct spelling on tooltips. Oskar Wiksten 2013-02-09 12:42:01 +01:00
• 370c62dc65 Merge branch 'revamped_editor' Oskar Wiksten 2013-02-09 12:35:30 +01:00
• 4476d77a73 Refactor content editor - Added hints for most editable fields. Oskar Wiksten 2013-02-09 10:35:58 +01:00
• cfeffe45f5 Refactor content editor - remove unused files. Oskar Wiksten 2013-02-09 09:23:17 +01:00
• dadf68da42 Refactor content editor - Updated description for "isStacking" on actor conditions. Oskar Wiksten 2013-02-02 11:21:24 +01:00
• 059a68ddbe Refactor content editor - Minor layout issue on item table editor. Oskar Wiksten 2013-01-30 19:57:36 +01:00
• 7dbbcc45d0 Refactor content editor - Minor layout issue on item table editor. Oskar Wiksten 2013-01-30 19:55:34 +01:00
• a3ff6fb722 Refactor content editor - Add table editor for items. Oskar Wiksten 2013-01-30 19:50:47 +01:00
• 09d4d39fe5 Refactor content editor - Provide table-based editor for monsters. Oskar Wiksten 2013-01-30 18:50:56 +01:00
• 7ef0152e4c Refactor content editor - Simplify item cost calculations. Oskar Wiksten 2013-01-30 18:28:52 +01:00
• 9f9d1ae5d5 Refactor content editor - Simplify monster exp calculation. Oskar Wiksten 2013-01-30 17:52:41 +01:00
• d08af3a089 Refactor content editor - Removed old files. Oskar Wiksten 2013-01-30 14:31:14 +01:00
• 4a4450d20d Refactor content editor - Remove conversation tree. Provide links to follow conversation topics. Oskar Wiksten 2013-01-30 14:22:53 +01:00
• 8ec233096a Refactor content editor - Display (buggy) treeview for editing conversation phrases. Oskar Wiksten 2013-01-30 13:47:39 +01:00
• f2b9e6a9f3 Refactor content editor - Reorganized files into separate directories. Oskar Wiksten 2013-01-30 08:22:06 +01:00
• feb05838f8 Refactor content editor - work in progress on editor for dialogue. Oskar Wiksten 2013-01-30 00:31:03 +01:00
• 30d8cb3a0d Refactor content editor - Allow loading resources from existing json files. Oskar Wiksten 2013-01-29 19:42:44 +01:00
• 948bd2c215 Refactor content editor - Actually remove things from model when pressing "remove". Oskar Wiksten 2013-01-29 18:51:25 +01:00
• 889c607f9a Refactor content editor - provide hovering hint on clickable icons. Oskar Wiksten 2013-01-29 18:44:37 +01:00
• bb33261d21 Refactor content editor - Enable popup to select icon for items, monsters and actor conditions. Oskar Wiksten 2013-01-29 18:30:05 +01:00
• d1412d8c9d Refactor content editor - Handle unique monsters correctly. Oskar Wiksten 2013-01-29 16:53:28 +01:00
• f9e0a3e591 Refactor content editor - display icons of items, monsters and actor conditions. Oskar Wiksten 2013-01-29 14:20:57 +01:00
• cc0ff7bdb1 Refactor content editor - Remove unused files. Oskar Wiksten 2013-01-29 14:20:08 +01:00
• 3dfd070d0b Refactor content editor - More basic styling on import/export. Oskar Wiksten 2013-01-29 12:49:29 +01:00
• 5970a584f5 Refactor content editor - More baic styling Oskar Wiksten 2013-01-29 12:25:53 +01:00
• aa9480448d Refactor content editor - Basic ui styling Oskar Wiksten 2013-01-29 12:13:05 +01:00
• 8f73b28979 Refactor content editor - Hide some item fields on standard layout. Oskar Wiksten 2013-01-29 09:26:44 +01:00
• 1d712006df Refactor content editor - Use default values correctly. Oskar Wiksten 2013-01-29 08:16:14 +01:00
• d54c1ab6f8 Refactor content editor - Add support for loading actual content with http get. Oskar Wiksten 2013-01-28 22:35:45 +01:00
• f80157a0d0 Refactor content editor - Add support for editing items and item categories. Oskar Wiksten 2013-01-28 20:06:58 +01:00
• 8570d4d760 Refactor content editor - Add support for editing droplists. Oskar Wiksten 2013-01-28 18:31:04 +01:00
• c33cd6bd2a Refactor content editor - Added views for updating, exporting and importing quests and actor conditions. Oskar Wiksten 2013-01-28 18:25:47 +01:00
• 004a67f2c9 Refactor content editor - More work on default values for import/export. Oskar Wiksten 2013-01-28 15:56:45 +01:00
• b9d36db162 Refactor content editor - Updated editor to use module pattern. Implemented import/export of json formats. Oskar Wiksten 2013-01-28 14:01:07 +01:00
• 6d05129384 Work in progress on updated Content editor that uses angular.js instead of jqueryui. Oskar Wiksten 2013-01-28 00:51:12 +01:00
• bc1fb7daa5 Merge branch 'resource_as_json' Oskar Wiksten 2013-02-09 12:34:57 +01:00
• 52a5b8f387 Converted all resource files to json instead of our previous custom format. Oskar Wiksten 2013-02-09 12:34:03 +01:00
• 76eaf13772 Minor fix to loading json files from raw/. Oskar Wiksten 2013-01-21 21:04:08 +01:00
• 8e75512cfa Fixes to JSON parsing of resource files. Oskar Wiksten 2013-01-21 00:20:03 +01:00
• 9ff01745d0 Read JSON resources from raw/ folder instead of encoded in string blocks from values/ folder. Oskar Wiksten 2013-01-20 23:36:08 +01:00
• 89759f77f4 Updated parsers for reading resources as JSON. Oskar Wiksten 2013-01-20 23:35:37 +01:00
• 81665520c0 WIP on parsing resource data as json instead of the old resource format. Oskar Wiksten 2013-01-20 00:19:38 +01:00
• 4b8577e690 Increased exp reward for most quests tenfold. (Issue 283, thanks to jrozek!) Oskar Wiksten 2013-02-09 11:08:27 +01:00
• 3bbd38548f Updated Polish translation by tobik9090siemens. Oskar Wiksten 2013-02-09 09:10:46 +01:00
• f358741d99 Merge branch 'healfood' Oskar Wiksten 2013-02-06 07:54:22 +00:00
• 3da6d0808c Updated translations of itemlist with changes to how food is healing. Oskar Wiksten 2013-02-06 07:53:37 +00:00
• 7a3e167bc5 Bugfix: Food poisoning should have an effect every round. Oskar Wiksten 2012-08-02 13:45:52 +02:00
• 429429e63f Doubled the amount of health provided by all food items. Oskar Wiksten 2012-08-02 12:52:43 +02:00
• 7c38e0337d Changed all food to slowly heal over time instead of healing instantaneously. Oskar Wiksten 2012-08-01 21:47:25 +02:00
• d0552dad83 Merge branch 'updated_tileset' Oskar Wiksten 2013-02-03 10:37:45 +01:00
• fbe7312e1c Updated maps from master. Oskar Wiksten 2013-02-03 10:25:50 +01:00
• 278c605bdb Updated some map tiles. Oskar Wiksten 2012-12-30 12:04:34 +01:00
• eb8232af1f Updated tileset map_wall_1 Oskar Wiksten 2012-12-29 21:36:07 +01:00
• ff3fb12a50 Updated tile size for cave walls. Oskar Wiksten 2012-12-29 20:36:40 +01:00
• 91fc3a7745 Updated tmx files with new tileset files. Oskar Wiksten 2012-12-29 20:33:48 +01:00
• 2ecd64c003 Updated map tileset image files. Updated template.tmx . Oskar Wiksten 2012-12-29 17:49:30 +01:00
• 939a406b88 Realign waterway2 & waterway4 on worldmap. Oskar Wiksten 2013-02-03 10:00:01 +01:00
• 3e5f77d891 Updated copyright notice to "2010-2013". Oskar Wiksten 2013-02-02 13:56:26 +01:00
• c4a10c5d7d Updated German translation from SamuelPlentz. (From issue 331) Oskar Wiksten 2013-02-02 13:25:29 +01:00
• 7d5084312a Updated list of authors with Polish translator tobik9090siemens. Oskar Wiksten 2013-02-02 13:16:38 +01:00
• 8f5c35fabb Updated Russian translation from istasman. Added istasman to list of authors for Russian translation. (From issue 332 and issue 333) Oskar Wiksten 2013-02-02 13:11:53 +01:00
• 8f3a22beb4 Changed visibility of methods used in unit tests. Oskar Wiksten 2013-01-28 01:30:37 +01:00
• 109fb5ecfb Merge branch 'refactor_listener' Oskar Wiksten 2013-01-28 01:27:31 +01:00
• 159bc8799f Merge branch 'actortraits_refactoring' Oskar Wiksten 2013-01-28 01:27:20 +01:00
• 33345acabd Add public visibility for methods used in unit tests. Oskar Wiksten 2013-01-28 01:25:40 +01:00
• 215dd4e31f Updated .gitignore Oskar Wiksten 2013-01-13 19:03:21 +01:00
• be2e54978d Refactor: moved "Savegames" class into savegames package. Moved ListOfListeners into util package. Oskar Wiksten 2013-01-13 16:22:49 +01:00
• 16a69bf48c Bugfix: clone list of monster loot bags when picking up items (prevents double drops). Oskar Wiksten 2013-01-13 16:10:16 +01:00
• ad36da6418 Code cleanup: make classes final where possible. Oskar Wiksten 2013-01-13 15:48:27 +01:00
• e3406df935 Emit "new map" events on calling thread, and not inside the async maploading handler. Oskar Wiksten 2013-01-13 13:34:36 +01:00
• e2446d153e Only redraw game screen when something inside the view has actually changed. Oskar Wiksten 2013-01-13 13:03:13 +01:00
• 1032b2ee51 Provide reference to current map object when emitting monster spawned events. Oskar Wiksten 2013-01-13 10:56:37 +01:00
• 6a59f5d99e Use correct previousPosition when moving monsters. Oskar Wiksten 2013-01-13 00:18:36 +01:00
• 5d437db461 Use WeakReference<> for references to application instance. Oskar Wiksten 2013-01-12 20:45:17 +01:00
• 32e9a92fef Work in progress on moving ui dependencies away from model. Oskar Wiksten 2013-01-12 20:29:19 +01:00
• e3ea3342c5 Work in progress on moving UI dependencies into being pubsub instead of direct calls from model->ui. Oskar Wiksten 2013-01-12 20:02:38 +01:00
• a99b0fc96f Initialize Player & Monster health correctly when respawning either one. Oskar Wiksten 2012-11-10 15:25:53 +01:00
• a50c1a1279 Actor traits refactoring - Reworked UI for displaying the actor stats tableview. Oskar Wiksten 2012-11-08 23:42:27 +01:00
• 2ac6762f2f Actor traits refactoring - Remove ActorTraits & CombatTraits. Oskar Wiksten 2012-11-08 20:15:32 +01:00
• 2770d2156f Actor traits refactoring - Make sure Monster and Player objects are serialized and deserialized correctly. Cleanup dead code. Oskar Wiksten 2012-11-08 19:51:42 +01:00
• ca4ad69f36 WIP 6 - Moved around lots of properties. Oskar Wiksten 2012-11-08 00:55:15 +01:00
• be5298c247 WIP 5 refactor actor traits - Moved name & tileSize from ActorTraits to Actor. Oskar Wiksten 2012-10-28 15:17:20 +01:00
• 844afc2a95 WIP 4 actor traits refactoring - Created savegame loaders for pre-versioncode-33. Oskar Wiksten 2012-10-21 13:24:21 +02:00
• 21fca91ca7 WIP 3 refactoring actor traits - moved iconID && tileSize to Actor. Oskar Wiksten 2012-10-21 09:56:53 +02:00
• bf809df44f WIP 2 moved fields from ActorTraits onto ActorTraits. Oskar Wiksten 2012-10-20 20:49:19 +02:00