]>
git.localhorst.tv Git - l2e.git/log
Daniel Karbach [Mon, 10 Dec 2012 21:51:54 +0000 (22:51 +0100)]
implemented capsule renaming
Daniel Karbach [Sun, 9 Dec 2012 14:33:14 +0000 (15:33 +0100)]
Merge branch 'master' into feature-33-capsules
I am a dork
Daniel Karbach [Sun, 9 Dec 2012 14:30:43 +0000 (15:30 +0100)]
Merge branch 'master' into feature-33-capsules
needed for fixed cbp file
Janek Schäfer [Sun, 9 Dec 2012 14:20:53 +0000 (15:20 +0100)]
Updated CodeBlocks project file
Daniel Karbach [Wed, 5 Dec 2012 20:30:19 +0000 (21:30 +0100)]
added capsule name menu stub
Daniel Karbach [Wed, 5 Dec 2012 19:55:47 +0000 (20:55 +0100)]
added capsule change menu stub
Daniel Karbach [Wed, 5 Dec 2012 19:46:51 +0000 (20:46 +0100)]
added capsule feed menu dummy
Daniel Karbach [Tue, 4 Dec 2012 21:48:07 +0000 (22:48 +0100)]
added most of the capsule main menu's features
Daniel Karbach [Tue, 4 Dec 2012 21:47:17 +0000 (22:47 +0100)]
more accessors in common::Capsule
Daniel Karbach [Tue, 4 Dec 2012 21:44:35 +0000 (22:44 +0100)]
made third column hack of menus configurable
Daniel Karbach [Tue, 4 Dec 2012 21:11:43 +0000 (22:11 +0100)]
dynamic width right aligned rendering with Font
Daniel Karbach [Tue, 4 Dec 2012 20:15:33 +0000 (21:15 +0100)]
added capsule menu stub
Daniel Karbach [Tue, 4 Dec 2012 19:33:41 +0000 (20:33 +0100)]
load capsule in battles created by MapState
Daniel Karbach [Sun, 2 Dec 2012 23:01:08 +0000 (00:01 +0100)]
use stable_sort for sorting inventory
Daniel Karbach [Sun, 2 Dec 2012 20:36:13 +0000 (21:36 +0100)]
extracted common capsule base
Daniel Karbach [Sun, 2 Dec 2012 18:49:03 +0000 (19:49 +0100)]
added capsule attack/animation handling
also revamped animation related code for debugability
Daniel Karbach [Sun, 2 Dec 2012 16:49:17 +0000 (17:49 +0100)]
added capsule mockup (battle)
Daniel Karbach [Sat, 1 Dec 2012 09:51:05 +0000 (10:51 +0100)]
lousy implementation of "array of identifiers" type
see bug #34
Daniel Karbach [Fri, 30 Nov 2012 15:38:21 +0000 (16:38 +0100)]
moved menu resources to data files
Daniel Karbach [Fri, 30 Nov 2012 14:15:52 +0000 (15:15 +0100)]
removed stupid file headers that eclipse put in
Daniel Karbach [Fri, 30 Nov 2012 14:00:50 +0000 (15:00 +0100)]
Merge branch 'menus'
* stalled capsule menu until capsule monsters are implemented
* item using and spell invocation also stalled
Daniel Karbach [Fri, 30 Nov 2012 13:59:38 +0000 (14:59 +0100)]
added new files to code blocks project
Daniel Karbach [Fri, 30 Nov 2012 13:49:22 +0000 (14:49 +0100)]
added scenario menu
Daniel Karbach [Fri, 30 Nov 2012 13:47:04 +0000 (14:47 +0100)]
added scenario items to inventory
Daniel Karbach [Thu, 29 Nov 2012 14:25:35 +0000 (15:25 +0100)]
completed config menu
I didn't clone the music bug, as I don't think anyone would want that ;)
Daniel Karbach [Thu, 29 Nov 2012 14:24:28 +0000 (15:24 +0100)]
made vector components writable
Daniel Karbach [Thu, 29 Nov 2012 14:23:55 +0000 (15:23 +0100)]
added string dimensions calculation functions
Daniel Karbach [Thu, 29 Nov 2012 13:34:42 +0000 (14:34 +0100)]
added basic config menu
Daniel Karbach [Thu, 29 Nov 2012 13:34:01 +0000 (14:34 +0100)]
handle line breaks in Font::DrawString
note that Font::DrawStringRight does _not_ handle line breaks as of now
Daniel Karbach [Thu, 29 Nov 2012 13:00:49 +0000 (14:00 +0100)]
added (currently uninterpreted) config to state
Daniel Karbach [Thu, 29 Nov 2012 12:56:31 +0000 (13:56 +0100)]
added config menu dummy
Daniel Karbach [Thu, 29 Nov 2012 12:05:08 +0000 (13:05 +0100)]
warp equipment action menu
Daniel Karbach [Thu, 29 Nov 2012 12:02:10 +0000 (13:02 +0100)]
activated shoulder buttons in equip menu
Daniel Karbach [Tue, 27 Nov 2012 13:04:09 +0000 (14:04 +0100)]
added inactive menu font
Daniel Karbach [Tue, 27 Nov 2012 12:50:36 +0000 (13:50 +0100)]
implemented item equipping
Daniel Karbach [Tue, 27 Nov 2012 12:33:45 +0000 (13:33 +0100)]
added inventory menu to EquipMenu
Daniel Karbach [Tue, 27 Nov 2012 11:57:03 +0000 (12:57 +0100)]
converted equipment from explicit members to array
Daniel Karbach [Tue, 27 Nov 2012 11:28:27 +0000 (12:28 +0100)]
made HeroGroup data-only
Daniel Karbach [Sun, 25 Nov 2012 13:45:01 +0000 (14:45 +0100)]
implemented equipment removing and dropping
Daniel Karbach [Sun, 25 Nov 2012 13:32:16 +0000 (14:32 +0100)]
implemented "remove all" in equipment menu
Daniel Karbach [Tue, 20 Nov 2012 19:34:51 +0000 (20:34 +0100)]
added action menu to equipment menu
Daniel Karbach [Tue, 20 Nov 2012 19:22:38 +0000 (20:22 +0100)]
started implementation of equipment menu
Daniel Karbach [Sun, 18 Nov 2012 16:15:19 +0000 (17:15 +0100)]
lousy but working implementation of spell swapping
Daniel Karbach [Sun, 18 Nov 2012 16:13:24 +0000 (17:13 +0100)]
implemented spell sorting
sorting order is cost for now, need to find out the real order
Daniel Karbach [Sun, 18 Nov 2012 16:00:55 +0000 (17:00 +0100)]
added spell menu dummy
Daniel Karbach [Sat, 17 Nov 2012 13:28:56 +0000 (14:28 +0100)]
implemented item dropping
Daniel Karbach [Sat, 17 Nov 2012 13:28:25 +0000 (14:28 +0100)]
third column menu hack for cursor
Daniel Karbach [Sat, 17 Nov 2012 13:19:03 +0000 (14:19 +0100)]
implemented inventory item swapping
Daniel Karbach [Sat, 17 Nov 2012 13:18:08 +0000 (14:18 +0100)]
added 'dual' menu state
in this state, the selected cursor is saved and another cursor can be moved
Daniel Karbach [Sat, 17 Nov 2012 13:17:38 +0000 (14:17 +0100)]
ignore local build configuration
Daniel Karbach [Mon, 12 Nov 2012 20:44:55 +0000 (21:44 +0100)]
fixed flags in makefiles
Daniel Karbach [Mon, 12 Nov 2012 20:44:17 +0000 (21:44 +0100)]
hooked Inventory::Sort into InventoryMenu
Daniel Karbach [Mon, 12 Nov 2012 20:42:49 +0000 (21:42 +0100)]
added Sort function to Inventory
also specified the equipability of items in test-data
Daniel Karbach [Sun, 11 Nov 2012 17:50:07 +0000 (18:50 +0100)]
fixed dependency file generation
Daniel Karbach [Sun, 11 Nov 2012 17:49:40 +0000 (18:49 +0100)]
hook alternate cursor in inventory menu
Daniel Karbach [Sun, 11 Nov 2012 17:49:17 +0000 (18:49 +0100)]
removed old subdir makefiles
Daniel Karbach [Sun, 11 Nov 2012 15:36:25 +0000 (16:36 +0100)]
Merge branch 'master' into menus
I'm not putting up with changing build settings on every checkout
Conflicts:
Debug/makefile
Debug/sources.mk
Debug/src/graphics/subdir.mk
Release/makefile
Release/sources.mk
Release/src/graphics/subdir.mk
Daniel Karbach [Sun, 11 Nov 2012 15:33:18 +0000 (16:33 +0100)]
switched to hand-written makefiles
Build configurations are now in `/build'.
See readme file for further build instructions.
Janek Schäfer [Thu, 8 Nov 2012 19:13:00 +0000 (20:13 +0100)]
Added CodeBlocks project file with Windows build target
Daniel Karbach [Tue, 6 Nov 2012 21:56:44 +0000 (22:56 +0100)]
recognize '\\' as a possible directory separator
libgen.h confirmed to work with mingw, thanks foxblock
fixes #28
Daniel Karbach [Tue, 6 Nov 2012 21:51:02 +0000 (22:51 +0100)]
added menu cursor "active" sprite
Daniel Karbach [Mon, 5 Nov 2012 19:52:28 +0000 (20:52 +0100)]
typo in file name
silly me
Daniel Karbach [Sun, 4 Nov 2012 17:15:02 +0000 (18:15 +0100)]
fixed clear call in battle state
Daniel Karbach [Sun, 4 Nov 2012 17:13:38 +0000 (18:13 +0100)]
added basic (non-functional) inventory menu
Daniel Karbach [Sun, 4 Nov 2012 14:13:59 +0000 (15:13 +0100)]
added 'change' menu state
Daniel Karbach [Sat, 3 Nov 2012 11:27:06 +0000 (12:27 +0100)]
added menu to status screen
Daniel Karbach [Wed, 31 Oct 2012 22:26:19 +0000 (23:26 +0100)]
added button mapping to readme file
Daniel Karbach [Wed, 31 Oct 2012 21:47:58 +0000 (22:47 +0100)]
added ikari level to status menu
Daniel Karbach [Wed, 31 Oct 2012 21:47:45 +0000 (22:47 +0100)]
added percent sign to character table
Daniel Karbach [Wed, 31 Oct 2012 21:32:07 +0000 (22:32 +0100)]
show next level in status screen
Daniel Karbach [Wed, 31 Oct 2012 21:31:38 +0000 (22:31 +0100)]
added hero's level ladder
Daniel Karbach [Wed, 31 Oct 2012 21:09:41 +0000 (22:09 +0100)]
added experience display in status screen
Daniel Karbach [Wed, 31 Oct 2012 21:06:58 +0000 (22:06 +0100)]
added right aligning font drawing functions
Daniel Karbach [Wed, 31 Oct 2012 21:06:15 +0000 (22:06 +0100)]
added experience as a common hero property
Daniel Karbach [Tue, 23 Oct 2012 21:04:27 +0000 (23:04 +0200)]
added hero's stats in status screen
Daniel Karbach [Tue, 23 Oct 2012 20:31:37 +0000 (22:31 +0200)]
added equipment in stats screen
Daniel Karbach [Mon, 22 Oct 2012 20:19:56 +0000 (22:19 +0200)]
added hero selection state + status stub
Daniel Karbach [Sun, 21 Oct 2012 19:45:06 +0000 (21:45 +0200)]
added party main menu stub
Daniel Karbach [Sun, 21 Oct 2012 19:43:11 +0000 (21:43 +0200)]
added wrap options for menu properties
Daniel Karbach [Sun, 21 Oct 2012 18:01:09 +0000 (20:01 +0200)]
added frames for status menu
Daniel Karbach [Sun, 21 Oct 2012 18:00:47 +0000 (20:00 +0200)]
changed Frame implementation
Daniel Karbach [Sun, 21 Oct 2012 17:09:39 +0000 (19:09 +0200)]
added hero status tags in party menu
Daniel Karbach [Sun, 21 Oct 2012 14:08:32 +0000 (16:08 +0200)]
added party menu state stub
Daniel Karbach [Sun, 21 Oct 2012 14:06:12 +0000 (16:06 +0200)]
added texture class
Daniel Karbach [Sat, 20 Oct 2012 16:15:38 +0000 (18:15 +0200)]
revised implementation of script text
Daniel Karbach [Sat, 20 Oct 2012 13:29:09 +0000 (15:29 +0200)]
introduced a small delay after flip if the screen is not a hardware surface
Daniel Karbach [Thu, 18 Oct 2012 21:01:00 +0000 (23:01 +0200)]
fixed map2 data
Daniel Karbach [Thu, 18 Oct 2012 20:48:44 +0000 (22:48 +0200)]
list type ID in wiki export
Daniel Karbach [Thu, 18 Oct 2012 20:40:48 +0000 (22:40 +0200)]
switched to static type IDs
Daniel Karbach [Thu, 18 Oct 2012 19:04:10 +0000 (21:04 +0200)]
some commenting on the map classes
Daniel Karbach [Wed, 17 Oct 2012 19:40:24 +0000 (21:40 +0200)]
removed debug output from main
Daniel Karbach [Wed, 17 Oct 2012 19:34:48 +0000 (21:34 +0200)]
removed now superfluous Application parameter to State callbacks
Daniel Karbach [Wed, 17 Oct 2012 19:14:31 +0000 (21:14 +0200)]
store an application handle in each state
Daniel Karbach [Wed, 17 Oct 2012 18:44:51 +0000 (20:44 +0200)]
wrapped some virtual State methods in non-virtual calls
Daniel Karbach [Wed, 17 Oct 2012 18:21:56 +0000 (20:21 +0200)]
renamed app::State's Resize -> OnResize
Daniel Karbach [Tue, 16 Oct 2012 21:02:42 +0000 (23:02 +0200)]
renamed state callbacks
Daniel Karbach [Tue, 16 Oct 2012 20:41:01 +0000 (22:41 +0200)]
commented headers in geometry directory ^^
Daniel Karbach [Tue, 16 Oct 2012 20:33:33 +0000 (22:33 +0200)]
commented headers in app/ directory
Daniel Karbach [Sun, 14 Oct 2012 21:42:59 +0000 (23:42 +0200)]
handle compare/jump instructions in script assembler
Daniel Karbach [Sun, 14 Oct 2012 21:19:58 +0000 (23:19 +0200)]
added script labels in parser/interpreter