Commit Graph

768 Commits

Author SHA1 Message Date
Evan Debenham
9dab291797 Merging 1.7.5 Source: levels changes 2015-02-06 09:57:28 -05:00
Evan Debenham
e931525669 Merging 1.7.5 Source: actors/mobs/npcs changes 2015-02-06 09:57:17 -05:00
Evan Debenham
d7934760c5 Merging 1.7.5 Source: actors/mobs changes 2015-02-06 09:56:58 -05:00
Evan Debenham
e951b7aad8 Merging 1.7.5 Source: actors/hero changes 2015-02-06 09:56:39 -05:00
Evan Debenham
bbe6c79ab3 Merging 1.7.5 Source: further effects changes 2015-02-06 09:56:23 -05:00
Evan Debenham
9e79aab869 Merging 1.7.5 Source: actors/buffs changes 2015-02-06 09:56:12 -05:00
Evan Debenham
d50c566579 Merging 1.7.5 Source: actors/blobs changes 2015-02-06 09:56:04 -05:00
Evan Debenham
c467cb966c Merging 1.7.5 Source: actors/ changes 2015-02-06 09:55:55 -05:00
Evan Debenham
894f7d9d06 Merging 1.7.5 Source: ui changes 2015-02-06 09:55:45 -05:00
Evan Debenham
4499685b09 Merging 1.7.5 Source: mechanics changes 2015-02-06 09:55:36 -05:00
Evan Debenham
d6bcece8af Merging 1.7.5 Source: effect changes 2015-02-06 09:55:29 -05:00
Evan Debenham
1b10338b37 Merging 1.7.5 Source: plant changes 2015-02-06 09:55:00 -05:00
Evan Debenham
11d550cbe0 v0.2.3f: final commit 2015-01-26 21:40:23 -05:00
Evan Debenham
c105f655d4 Merge remote-tracking branch 'origin/master' 2015-01-26 20:28:27 -05:00
Evan Debenham
23c611a13e v0.2.3f: fixed wand recharging something multiplying due to the wand holster 2015-01-26 20:28:17 -05:00
Evan Debenham
c04a252a4f v0.2.3f: string corrections 2015-01-26 16:44:21 -05:00
Evan Debenham
9ff26f034c v0.2.3f: fixed a bug where the resume indicator was clickable after the hero had died. 2015-01-26 10:00:45 -05:00
Evan Debenham
49bab26d7b v0.2.3f: corrected issues with the dried rose 2015-01-26 09:18:29 -05:00
Evan Debenham
31bd42152e v0.2.3f: corrected crash involving quickslot placeholders, dungeon now loads them at the correct time. 2015-01-26 02:14:00 -05:00
Evan Debenham
944d2d33a2 v0.2.3f: fixed yet more quickslot issues, this should be all of them. 2015-01-26 02:11:39 -05:00
Evan Debenham
d0e6aa6c1f v0.2.3f: further tweaks to quickslot logic 2015-01-26 01:43:50 -05:00
Evan Debenham
93b066dfb2 v0.2.3f: corrected errors added in previous commit 2015-01-26 01:29:43 -05:00
Evan Debenham
9d90a24a95 v0.2.3f: corrected quickslot refresh logic across items 2015-01-26 01:20:39 -05:00
Evan Debenham
6a0776afcc v0.2.3f: removed unused import 2015-01-26 00:30:52 -05:00
Evan Debenham
78fd89cb01 v0.2.3f: tweaked behaviour of last shop level, also fixed bug involving shop generation. 2015-01-26 00:30:24 -05:00
Evan Debenham
520131fb2d v0.2.3e: fixes, actual final commit 2015-01-21 23:55:37 -05:00
Evan Debenham
8fa6b41427 v0.2.3e: final commit 2015-01-21 23:11:26 -05:00
Evan Debenham
fd77e8a923 v0.2.3e: commented out final line involving resume button 2015-01-21 23:00:54 -05:00
Evan Debenham
e7e289e666 v0.2.3e: removed resume button from toolbar, added icon for resume button 2015-01-21 22:57:47 -05:00
Evan Debenham
34a7b82f94 v0.2.3e: converted resume button to a tag 2015-01-21 22:54:58 -05:00
Evan Debenham
a4fe786f97 v0.2.3e: small fix to rankings window changes 2015-01-21 20:22:36 -05:00
Evan Debenham
a6bd3aae84 v0.2.3e: fixed a couple issues 2015-01-21 20:06:28 -05:00
Evan Debenham
97f6b2f67c v0.2.3e: fixed a bug with sewer boss level gen.. hopefully for real this time. 2015-01-21 16:23:46 -05:00
Evan Debenham
02693eef4d v0.2.3e: tied toolbar UI into quickslot settings (need to move 'continue' button to a tag) 2015-01-21 16:13:54 -05:00
Evan Debenham
f0fb0beb1a v0.2.3e: stopped 2nd quickslot being initialized on rogue when only one slot is enabled. 2015-01-21 15:47:26 -05:00
Evan Debenham
81a588e386 v0.2.3e: added setting in options menu for double quickslot 2015-01-21 14:02:01 -05:00
Evan Debenham
f68f8732b4 v0.2.3e: added sound effect to sandals of nature 2015-01-21 13:45:21 -05:00
Evan Debenham
0ae1b05b22 v0.2.3e: fixed a bug where Time Stasis would sometimes not drop invisibility. 2015-01-21 13:40:27 -05:00
Evan Debenham
951a0c918a v0.2.3e: further quickslot class refinements 2015-01-21 11:03:01 -05:00
Evan Debenham
06471b5bd2 v0.2.3e: refactored quickslot class to be cleaner overall and use an internal array instead of an arraylist 2015-01-21 11:01:05 -05:00
Evan Debenham
2cd9d59c7b v0.2.3e: improved/corrected multi-quickslot display in rankings page. 2015-01-21 08:59:39 -05:00
Evan Debenham
2b44154ac1 v0.2.3e: refactored quick slot button, should now support multiple instances of itself tied to different quickslots, needs testing 2015-01-20 17:26:53 -05:00
Evan Debenham
18580f7f0b v0.2.3e: scrolls can no longer appear on top of fire traps 2015-01-20 16:50:23 -05:00
Evan Debenham
e4d0017137 v0.2.3e: reworked night mode into a level feeling 2015-01-20 16:49:55 -05:00
Evan Debenham
66db278940 v0.2.3e: added support for 2x quickslot in rankings page 2015-01-20 09:40:01 -05:00
Evan Debenham
6e3c2223cd v0.2.3e: tonnes of fixes relating to WIP multi-quickslot implementation 2015-01-20 00:56:36 -05:00
Evan Debenham
e53c6b678f v0.2.3e: added backend support for multiple quickslots (needs testing!) 2015-01-19 12:04:23 -05:00
Evan Debenham
72cbc3440f v0.2.3e: corrected error in new pirahna logic 2015-01-18 01:45:45 -05:00
Evan Debenham
a1754cd68a v0.2.3e: Improved shop generation logic, fixes bugs and allows for much larger shops without error. 2015-01-17 04:38:18 -05:00
Evan Debenham
e4e12f74dd v0.2.3e: fixed a bug where pushing a shopkeeper would cause a crash 2015-01-17 04:00:05 -05:00