]> git.lizzy.rs Git - nothing.git/log
nothing.git
4 years agoMerge pull request #972 from tsoding/965
Alexey Kutepov [Sun, 21 Jul 2019 18:11:01 +0000 (01:11 +0700)]
Merge pull request #972 from tsoding/965

 (#965) Make LabelLayer render edit_field inside of the world

4 years ago(#965) Make LabelLayer render edit_field inside of the world
rexim [Sun, 21 Jul 2019 17:47:42 +0000 (00:47 +0700)]
(#965) Make LabelLayer render edit_field inside of the world

4 years ago(#965) edit_field_render -> edit_field_render_screen
rexim [Sun, 21 Jul 2019 17:44:09 +0000 (00:44 +0700)]
(#965) edit_field_render -> edit_field_render_screen

4 years agoMerge pull request #971 from tsoding/966
Alexey Kutepov [Sun, 21 Jul 2019 17:42:17 +0000 (00:42 +0700)]
Merge pull request #971 from tsoding/966

(#966) Improve edit_field interface

4 years agoMerge pull request #969 from TheKnarf/fix/title-screen-size
Alexey Kutepov [Sun, 21 Jul 2019 17:26:44 +0000 (00:26 +0700)]
Merge pull request #969 from TheKnarf/fix/title-screen-size

(#967) Fix for title screen looking weird without resizing

4 years ago(#966) Improve edit_field interface
rexim [Sun, 21 Jul 2019 17:20:44 +0000 (00:20 +0700)]
(#966) Improve edit_field interface

4 years ago(#967) Fix for title screen looking weird without resizing
Frank Lyder Bredland [Sun, 21 Jul 2019 17:09:03 +0000 (19:09 +0200)]
(#967) Fix for title screen looking weird without resizing

4 years agoMerge pull request #962 from tsoding/892
Alexey Kutepov [Sun, 21 Jul 2019 11:55:54 +0000 (18:55 +0700)]
Merge pull request #962 from tsoding/892

(#892) Label Layer enhancements

4 years agoAdd TODO(#966)
rexim [Sat, 20 Jul 2019 19:54:35 +0000 (02:54 +0700)]
Add TODO(#966)

4 years agoAdd TODO(#965)
rexim [Sat, 20 Jul 2019 19:54:35 +0000 (02:54 +0700)]
Add TODO(#965)

4 years agoAdd TODO(#964)
rexim [Sat, 20 Jul 2019 19:54:34 +0000 (02:54 +0700)]
Add TODO(#964)

4 years agoAdd TODO(#963)
rexim [Sat, 20 Jul 2019 19:54:33 +0000 (02:54 +0700)]
Add TODO(#963)

4 years ago(#892) Introduce Edit Text state for Label Layer
rexim [Sat, 20 Jul 2019 19:53:06 +0000 (02:53 +0700)]
(#892) Introduce Edit Text state for Label Layer

4 years ago(#892) Remove refactoring leftovers
rexim [Sat, 20 Jul 2019 19:33:17 +0000 (02:33 +0700)]
(#892) Remove refactoring leftovers

4 years ago(#892) Store label's texts continuously
rexim [Sat, 20 Jul 2019 19:22:48 +0000 (02:22 +0700)]
(#892) Store label's texts continuously

4 years ago(#892) Add color changing to Label Layer
rexim [Sat, 20 Jul 2019 18:51:50 +0000 (01:51 +0700)]
(#892) Add color changing to Label Layer

4 years ago(#892) Make slider correctly identify its changes
rexim [Sat, 20 Jul 2019 18:51:29 +0000 (01:51 +0700)]
(#892) Make slider correctly identify its changes

4 years ago(#892) Render selection in Label Layer
rexim [Sat, 20 Jul 2019 18:27:06 +0000 (01:27 +0700)]
(#892) Render selection in Label Layer

4 years ago(#892) Introduce move_anchor for LabelLayer
rexim [Sat, 20 Jul 2019 18:09:25 +0000 (01:09 +0700)]
(#892) Introduce move_anchor for LabelLayer

4 years ago(#892) Add ColorPicker to LabelLayer
rexim [Sat, 20 Jul 2019 17:57:56 +0000 (00:57 +0700)]
(#892) Add ColorPicker to LabelLayer

4 years ago(#892) Implement label relocation in label layer
rexim [Sat, 20 Jul 2019 17:51:39 +0000 (00:51 +0700)]
(#892) Implement label relocation in label layer

4 years ago(#892) Hide WASD tutorial label
rexim [Sat, 20 Jul 2019 16:51:05 +0000 (23:51 +0700)]
(#892) Hide WASD tutorial label

4 years agoMerge pull request #961 from tsoding/960
Alexey Kutepov [Sat, 20 Jul 2019 23:30:25 +0000 (06:30 +0700)]
Merge pull request #961 from tsoding/960

(#960) Exit id editing state on Escape

4 years ago(#960) Exit id editing state on Escape
rexim [Sat, 20 Jul 2019 16:47:09 +0000 (23:47 +0700)]
(#960) Exit id editing state on Escape

4 years agoMerge pull request #959 from tsoding/957
Alexey Kutepov [Sat, 20 Jul 2019 16:48:25 +0000 (23:48 +0700)]
Merge pull request #959 from tsoding/957

(#957) Don't reload levels that have no associated filename

4 years ago(#957) Don't reload levels that have no associated filename
rexim [Sat, 20 Jul 2019 16:30:46 +0000 (23:30 +0700)]
(#957) Don't reload levels that have no associated filename

4 years agoMerge pull request #954 from tsoding/950
Alexey Kutepov [Mon, 15 Jul 2019 13:34:10 +0000 (20:34 +0700)]
Merge pull request #954 from tsoding/950

(#950) Improve RectLayer selection overlay

4 years agoAdd TODO(#956)
rexim [Mon, 15 Jul 2019 13:24:14 +0000 (20:24 +0700)]
Add TODO(#956)

4 years agoAdd TODO(#955)
rexim [Mon, 15 Jul 2019 13:24:13 +0000 (20:24 +0700)]
Add TODO(#955)

4 years ago(#950) Additional work
rexim [Mon, 15 Jul 2019 13:23:40 +0000 (20:23 +0700)]
(#950) Additional work

4 years ago(#950) Extract camera_draw_thicc_rect_screen
rexim [Sun, 14 Jul 2019 19:44:32 +0000 (02:44 +0700)]
(#950) Extract camera_draw_thicc_rect_screen

4 years ago(#950) Make overlay thiccness the same regardless of the zoom
rexim [Sun, 14 Jul 2019 19:37:14 +0000 (02:37 +0700)]
(#950) Make overlay thiccness the same regardless of the zoom

4 years ago(#950) Draw the overlay always on top
rexim [Sun, 14 Jul 2019 18:00:04 +0000 (01:00 +0700)]
(#950) Draw the overlay always on top

4 years agoMerge pull request #952 from tsoding/948
Alexey Kutepov [Sun, 14 Jul 2019 17:32:58 +0000 (00:32 +0700)]
Merge pull request #952 from tsoding/948

 (#948) Split rect_layer_event into several functions

4 years ago(#948) Get rid of event_handlers array
rexim [Sun, 14 Jul 2019 17:20:17 +0000 (00:20 +0700)]
(#948) Get rid of event_handlers array

4 years ago(#948) Split rect_layer_event into several functions
rexim [Sun, 14 Jul 2019 17:06:03 +0000 (00:06 +0700)]
(#948) Split rect_layer_event into several functions

4 years agoRemove TODO(#886)
rexim [Sun, 14 Jul 2019 11:47:26 +0000 (18:47 +0700)]
Remove TODO(#886)

4 years agoRemove TODO(#943)
rexim [Sun, 14 Jul 2019 11:47:26 +0000 (18:47 +0700)]
Remove TODO(#943)

4 years agoMerge pull request #947 from tsoding/886
Alexey Kutepov [Sat, 13 Jul 2019 23:24:44 +0000 (06:24 +0700)]
Merge pull request #947 from tsoding/886

 (#886) introduce RECT_LAYER_ID_RENAME state

4 years agoAdd TODO(#948)
rexim [Sat, 13 Jul 2019 19:45:43 +0000 (02:45 +0700)]
Add TODO(#948)

4 years ago(#886) introduce RECT_LAYER_ID_RENAME state
rexim [Sat, 13 Jul 2019 19:44:32 +0000 (02:44 +0700)]
(#886) introduce RECT_LAYER_ID_RENAME state

4 years ago(#886) Make RectLayer display the ids
rexim [Sat, 13 Jul 2019 18:57:44 +0000 (01:57 +0700)]
(#886) Make RectLayer display the ids

4 years agoRemove TODO(#920)
rexim [Sat, 13 Jul 2019 17:51:11 +0000 (00:51 +0700)]
Remove TODO(#920)

4 years agoRemove TODO(#942)
rexim [Sat, 13 Jul 2019 17:51:11 +0000 (00:51 +0700)]
Remove TODO(#942)

4 years agoRemove TODO(#933)
rexim [Sat, 13 Jul 2019 17:51:08 +0000 (00:51 +0700)]
Remove TODO(#933)

4 years agoRemove TODO(#930)
rexim [Sat, 13 Jul 2019 17:51:08 +0000 (00:51 +0700)]
Remove TODO(#930)

4 years agoRemove TODO(#931)
rexim [Sat, 13 Jul 2019 17:51:08 +0000 (00:51 +0700)]
Remove TODO(#931)

4 years agoMerge pull request #945 from tsoding/rect-layer-refactor
Alexey Kutepov [Sat, 13 Jul 2019 17:47:53 +0000 (00:47 +0700)]
Merge pull request #945 from tsoding/rect-layer-refactor

Rect Layer refactor

4 years agoPROTO -> CREATE
rexim [Sat, 13 Jul 2019 17:37:34 +0000 (00:37 +0700)]
PROTO -> CREATE

4 years agoRefactor IDLE state dispatching
rexim [Sat, 13 Jul 2019 17:34:58 +0000 (00:34 +0700)]
Refactor IDLE state dispatching

4 years agoMerge pull request #944 from tsoding/942
Alexey Kutepov [Sat, 13 Jul 2019 17:12:53 +0000 (00:12 +0700)]
Merge pull request #944 from tsoding/942

(#942) Introduce RECT_LAYER_MOVE state

4 years ago(#942) Introduce RECT_LAYER_MOVE state
rexim [Sat, 13 Jul 2019 16:58:06 +0000 (23:58 +0700)]
(#942) Introduce RECT_LAYER_MOVE state

4 years agoMerge pull request #941 from tsoding/938
Alexey Kutepov [Sun, 7 Jul 2019 20:40:33 +0000 (03:40 +0700)]
Merge pull request #941 from tsoding/938

(#938) More RectLayer editing features

4 years agoAdd TODO(#943)
rexim [Sun, 7 Jul 2019 19:05:22 +0000 (02:05 +0700)]
Add TODO(#943)

4 years agoAdd TODO(#942)
rexim [Sun, 7 Jul 2019 19:05:21 +0000 (02:05 +0700)]
Add TODO(#942)

4 years ago(#938) Separate issue for movement
rexim [Sun, 7 Jul 2019 19:03:24 +0000 (02:03 +0700)]
(#938) Separate issue for movement

4 years ago(#938) Implement resize for RectLayer
rexim [Sun, 7 Jul 2019 19:02:40 +0000 (02:02 +0700)]
(#938) Implement resize for RectLayer

4 years ago(#938) Implement delete operation for RectLayer
rexim [Sun, 7 Jul 2019 18:02:15 +0000 (01:02 +0700)]
(#938) Implement delete operation for RectLayer

4 years ago(#938) Make RectLayer selection more visible
rexim [Sun, 7 Jul 2019 17:55:51 +0000 (00:55 +0700)]
(#938) Make RectLayer selection more visible

4 years ago(#938) Implement Selection for RectLayer
rexim [Sun, 7 Jul 2019 17:40:23 +0000 (00:40 +0700)]
(#938) Implement Selection for RectLayer

4 years ago(#938) encapsulate RectLayer deeper
rexim [Sun, 7 Jul 2019 17:08:32 +0000 (00:08 +0700)]
(#938) encapsulate RectLayer deeper

4 years ago(#938) proto_
rexim [Sun, 7 Jul 2019 17:01:40 +0000 (00:01 +0700)]
(#938) proto_

4 years ago(#938) Merge rect_layer and proto_rect together
rexim [Sun, 7 Jul 2019 17:00:01 +0000 (00:00 +0700)]
(#938) Merge rect_layer and proto_rect together

4 years agoMerge pull request #937 from tsoding/930
Alexey Kutepov [Sat, 6 Jul 2019 20:03:57 +0000 (03:03 +0700)]
Merge pull request #937 from tsoding/930

 (#930) Introduce color preview to ColorPicker

4 years ago(#930) Introduce padding between color picker sliders
rexim [Sat, 6 Jul 2019 19:00:34 +0000 (02:00 +0700)]
(#930) Introduce padding between color picker sliders

4 years ago(#930) Introduce color preview to ColorPicker
rexim [Sat, 6 Jul 2019 18:57:44 +0000 (01:57 +0700)]
(#930) Introduce color preview to ColorPicker

4 years agoMerge pull request #935 from tsoding/931
Alexey Kutepov [Sat, 6 Jul 2019 18:52:21 +0000 (01:52 +0700)]
Merge pull request #935 from tsoding/931

(#931) Implement labels for sliders

4 years ago(#931) Extract label_size
rexim [Sat, 6 Jul 2019 18:36:31 +0000 (01:36 +0700)]
(#931) Extract label_size

4 years ago(#931) Implement labels for sliders
rexim [Sat, 6 Jul 2019 18:31:18 +0000 (01:31 +0700)]
(#931) Implement labels for sliders

4 years agoMerge pull request #934 from tsoding/910
Alexey Kutepov [Sat, 6 Jul 2019 18:20:23 +0000 (01:20 +0700)]
Merge pull request #934 from tsoding/910

 (#910) Introduce Lt adapters (#933) Refactor ColorPicker sliders

4 years ago(#910) Move file unit to libsystem
rexim [Sat, 6 Jul 2019 18:06:46 +0000 (01:06 +0700)]
(#910) Move file unit to libsystem

It didn't compile on Windows

4 years ago(#910) Use gcc8Stdenv in NixOS dev environment
rexim [Sat, 6 Jul 2019 17:39:22 +0000 (00:39 +0700)]
(#910) Use gcc8Stdenv in NixOS dev environment

4 years ago(#910) Introduce Lt adapters
rexim [Sat, 6 Jul 2019 17:39:13 +0000 (00:39 +0700)]
(#910) Introduce Lt adapters

4 years ago(#910) fix filedump dtor
rexim [Sat, 6 Jul 2019 17:20:13 +0000 (00:20 +0700)]
(#910) fix filedump dtor

4 years ago(#910) Remove redundant dependencies
rexim [Sat, 6 Jul 2019 17:19:34 +0000 (00:19 +0700)]
(#910) Remove redundant dependencies

4 years ago(#910) Remove useless trace_assert
rexim [Sat, 6 Jul 2019 17:06:29 +0000 (00:06 +0700)]
(#910) Remove useless trace_assert

4 years ago(#910) CMAKE_CXX_COMPILER_ID -> CMAKE_C_COMPILER_ID
rexim [Sat, 6 Jul 2019 17:06:17 +0000 (00:06 +0700)]
(#910) CMAKE_CXX_COMPILER_ID -> CMAKE_C_COMPILER_ID

4 years agoMerge pull request #927 from tsoding/788
Alexey Kutepov [Mon, 1 Jul 2019 18:51:29 +0000 (01:51 +0700)]
Merge pull request #927 from tsoding/788

(#788) Make Color Picker more powerful

4 years ago(#788) Uninitialized variable
rexim [Mon, 1 Jul 2019 18:39:27 +0000 (01:39 +0700)]
(#788) Uninitialized variable

4 years agoAdd TODO(#933)
rexim [Mon, 1 Jul 2019 18:23:18 +0000 (01:23 +0700)]
Add TODO(#933)

4 years agoAdd TODO(#932)
rexim [Mon, 1 Jul 2019 18:23:17 +0000 (01:23 +0700)]
Add TODO(#932)

4 years agoAdd TODO(#931)
rexim [Mon, 1 Jul 2019 18:23:17 +0000 (01:23 +0700)]
Add TODO(#931)

4 years agoAdd TODO(#930)
rexim [Mon, 1 Jul 2019 18:23:16 +0000 (01:23 +0700)]
Add TODO(#930)

4 years agoAdd TODO(#929)
rexim [Mon, 1 Jul 2019 18:23:15 +0000 (01:23 +0700)]
Add TODO(#929)

4 years agoAdd TODO(#928)
rexim [Mon, 1 Jul 2019 18:23:14 +0000 (01:23 +0700)]
Add TODO(#928)

4 years ago(#788) Additional work
rexim [Mon, 1 Jul 2019 18:21:23 +0000 (01:21 +0700)]
(#788) Additional work

4 years ago(#788) make slider cursor opaque
rexim [Mon, 1 Jul 2019 18:21:09 +0000 (01:21 +0700)]
(#788) make slider cursor opaque

4 years ago(#788) Make Slider only consume SDL_MOUSEBUTTONDOWN
rexim [Mon, 1 Jul 2019 16:38:42 +0000 (23:38 +0700)]
(#788) Make Slider only consume SDL_MOUSEBUTTONDOWN

4 years ago(#788) Introduced bugs
rexim [Mon, 1 Jul 2019 15:53:41 +0000 (22:53 +0700)]
(#788) Introduced bugs

4 years ago(#788) Make ColorPicker work across all of the layers
rexim [Mon, 1 Jul 2019 15:49:11 +0000 (22:49 +0700)]
(#788) Make ColorPicker work across all of the layers

4 years ago(#788) Remove alpha-channel from color picker for now
rexim [Mon, 1 Jul 2019 14:37:16 +0000 (21:37 +0700)]
(#788) Remove alpha-channel from color picker for now

We don't really use transparent colors in an actual gameplay

4 years ago(#788) Add HSLA sliders to Color Picker
rexim [Mon, 1 Jul 2019 13:50:54 +0000 (20:50 +0700)]
(#788) Add HSLA sliders to Color Picker

4 years ago(#788) Forward events to Slider
rexim [Sun, 30 Jun 2019 19:17:46 +0000 (02:17 +0700)]
(#788) Forward events to Slider

4 years ago(#788) Finish Slider implementation
rexim [Sun, 30 Jun 2019 18:43:39 +0000 (01:43 +0700)]
(#788) Finish Slider implementation

4 years ago(#788) Don't render Color Pickers of inactive Layers
rexim [Sun, 30 Jun 2019 18:43:12 +0000 (01:43 +0700)]
(#788) Don't render Color Pickers of inactive Layers

4 years ago(#788) Implement HSL -> RGB conversion
rexim [Sun, 30 Jun 2019 17:23:54 +0000 (00:23 +0700)]
(#788) Implement HSL -> RGB conversion

4 years ago(#788) Add testing slider to color picker
rexim [Sun, 30 Jun 2019 17:23:23 +0000 (00:23 +0700)]
(#788) Add testing slider to color picker

4 years ago(#788) Make Background layer the default one
rexim [Sun, 30 Jun 2019 17:22:43 +0000 (00:22 +0700)]
(#788) Make Background layer the default one

4 years ago(#788) Introduce Slider UI element
rexim [Sun, 30 Jun 2019 17:21:52 +0000 (00:21 +0700)]
(#788) Introduce Slider UI element

4 years ago(#788) Don't enter relative mouse in Level Editor
rexim [Sun, 30 Jun 2019 16:54:57 +0000 (23:54 +0700)]
(#788) Don't enter relative mouse in Level Editor