]>
git.lizzy.rs Git - nothing.git/log
Alexey Kutepov [Sat, 30 Nov 2019 19:25:48 +0000 (02:25 +0700)]
Merge pull request #1165 from zhiayang/901
(#901) Support macOS in file/last_modified
Alexey Kutepov [Sat, 30 Nov 2019 19:23:40 +0000 (02:23 +0700)]
Merge pull request #1164 from zhiayang/1070
(#1070) Only actually select a list item when the mouse is correct
Alexey Kutepov [Sat, 30 Nov 2019 18:55:40 +0000 (01:55 +0700)]
Merge pull request #1162 from zhiayang/1068
(#1068) Reset player jump count on death
Alexey Kutepov [Sat, 30 Nov 2019 18:47:11 +0000 (01:47 +0700)]
Merge pull request #1163 from zhiayang/974
(#974) Support non-1x display resolution scale
rexim [Sat, 30 Nov 2019 18:38:40 +0000 (01:38 +0700)]
(#974) Remove debug logging
Alexey Kutepov [Sat, 30 Nov 2019 18:12:35 +0000 (01:12 +0700)]
Merge pull request #1158 from zhiayang/1153
(#1153) Option to fix Rect ratio when resizing
rexim [Sat, 30 Nov 2019 18:07:58 +0000 (01:07 +0700)]
(#1153) disable travis
rexim [Sat, 30 Nov 2019 18:00:13 +0000 (01:00 +0700)]
Merge branch 'master' into 1153
Alexey Kutepov [Sat, 30 Nov 2019 17:42:17 +0000 (00:42 +0700)]
Merge pull request #1159 from tsoding/1139
(#1139) Implement Move snap for Label Layer
rexim [Sat, 30 Nov 2019 17:40:08 +0000 (00:40 +0700)]
(#1153) Fix square ratio snapping
zhiayang [Sat, 30 Nov 2019 17:00:14 +0000 (01:00 +0800)]
(#1153) Remove TODO for #1157 (sorry!) and cleanup key handling.
Use builtin SDL stuff instead of doing dumb things. also, rename
`maybe_fix_to_ratio` to `fix_rect_ratio`.
rexim [Sat, 30 Nov 2019 16:23:12 +0000 (23:23 +0700)]
(#1139) Fix MSVC build
rexim [Sat, 30 Nov 2019 16:21:48 +0000 (23:21 +0700)]
(#1139) Add labels to the test level
zhiayang [Mon, 25 Nov 2019 04:39:04 +0000 (12:39 +0800)]
(#901) Use normal unix `struct stat` for macos in `last_modified`.
zhiayang [Mon, 25 Nov 2019 04:28:54 +0000 (12:28 +0800)]
(#1070) Only actually select a list item when the mouse is correct
zhiayang [Mon, 25 Nov 2019 03:53:41 +0000 (11:53 +0800)]
(#974) Revert that. I can't program, apparently.
zhiayang [Mon, 25 Nov 2019 03:45:37 +0000 (11:45 +0800)]
(#974) Skip rescaling the events if the scale is 1.
zhiayang [Mon, 25 Nov 2019 03:42:17 +0000 (11:42 +0800)]
(#974) Fix another oversight
zhiayang [Mon, 25 Nov 2019 03:35:11 +0000 (11:35 +0800)]
(#974) Fix float -> int casting
zhiayang [Mon, 25 Nov 2019 03:21:30 +0000 (11:21 +0800)]
(#974) Clean up redundant code checks.
PS: I don't think anybody manufactures a screen that has different
x and y pixel scale...
zhiayang [Mon, 25 Nov 2019 03:09:47 +0000 (11:09 +0800)]
(#974) Support non-1x display resolution scale
zhiayang [Mon, 25 Nov 2019 02:21:13 +0000 (10:21 +0800)]
(#1068) Reset player jump count on death
zhiayang [Sun, 24 Nov 2019 20:33:39 +0000 (04:33 +0800)]
(#1153) Fix snapping when ratio-resizing.
zhiayang [Sun, 24 Nov 2019 19:59:43 +0000 (03:59 +0800)]
(#1153) Properly update the ratio when entering ratio mode
zhiayang [Sun, 24 Nov 2019 19:54:39 +0000 (03:54 +0800)]
(#1153) Clean up the code a bit.
rexim [Sun, 24 Nov 2019 19:53:32 +0000 (02:53 +0700)]
Add TODO(#1161)
rexim [Sun, 24 Nov 2019 19:53:31 +0000 (02:53 +0700)]
Add TODO(#1160)
rexim [Sun, 24 Nov 2019 19:51:35 +0000 (02:51 +0700)]
(#1139) Implement Move snap for Label Layer
zhiayang [Sun, 24 Nov 2019 19:27:27 +0000 (03:27 +0800)]
(#1153) Implement ratio-resize for the other 3 corners
rexim [Sun, 24 Nov 2019 19:25:05 +0000 (02:25 +0700)]
(#1139) Put label id below label text
rexim [Sun, 24 Nov 2019 19:09:24 +0000 (02:09 +0700)]
(#1139) Decouple sprite_font_boundary_box from Sprite_font
zhiayang [Sun, 24 Nov 2019 18:55:53 +0000 (02:55 +0800)]
(#1153) Allow entering ratio-mode in the middle of resizing
zhiayang [Sun, 24 Nov 2019 18:39:42 +0000 (02:39 +0800)]
(#1153) Add fixed-ratio resizing to RectLayer
rexim [Sun, 24 Nov 2019 18:31:49 +0000 (01:31 +0700)]
(#1139) Implement Centralized Boundary Calculation (CBC)
rexim [Sun, 24 Nov 2019 18:09:14 +0000 (01:09 +0700)]
(#1139) Move rect snapping stuff to rect translation unit
rexim [Sun, 24 Nov 2019 17:56:44 +0000 (00:56 +0700)]
(#1139) Get rid of the libsystem
rexim [Sun, 24 Nov 2019 17:19:02 +0000 (00:19 +0700)]
Remove TODO(#1142)
Alexey Kutepov [Sun, 24 Nov 2019 17:17:41 +0000 (00:17 +0700)]
Merge pull request #1154 from tsoding/1142
(#1142) Implement resize snapping
rexim [Sun, 24 Nov 2019 17:00:48 +0000 (00:00 +0700)]
(#1142) snap_var4 -> snap_seg2seg
rexim [Sun, 24 Nov 2019 16:59:07 +0000 (23:59 +0700)]
(#1142) snap_var2 -> snap_var2seg
rexim [Sun, 24 Nov 2019 16:58:48 +0000 (23:58 +0700)]
(#1142) snap_var1 -> snap_var
rexim [Sun, 24 Nov 2019 16:52:20 +0000 (23:52 +0700)]
(#1142) explain snap_var1 a little bit better
rexim [Sun, 24 Nov 2019 16:48:29 +0000 (23:48 +0700)]
(#1142) Intermediate snap_var* names
rexim [Sun, 24 Nov 2019 16:25:53 +0000 (23:25 +0700)]
(#1142) Split temp_snap into even smaller pieces
rexim [Sat, 23 Nov 2019 19:18:07 +0000 (02:18 +0700)]
(#1142) Simplify snap_var implementation
rexim [Sat, 23 Nov 2019 18:57:00 +0000 (01:57 +0700)]
(#1142) Full resize snapping
rexim [Sat, 23 Nov 2019 18:51:09 +0000 (01:51 +0700)]
(#1142) Bot-left resize snapping
rexim [Sat, 23 Nov 2019 18:47:36 +0000 (01:47 +0700)]
(#1142) Bottom resize snapping
rexim [Sat, 23 Nov 2019 18:37:20 +0000 (01:37 +0700)]
(#1142) Top-left resize snapping
rexim [Sat, 23 Nov 2019 18:32:47 +0000 (01:32 +0700)]
(#1142) Add support for top and left resize snapping
rexim [Sat, 23 Nov 2019 18:02:20 +0000 (01:02 +0700)]
(#1142) introduce snap_var
rexim [Sat, 23 Nov 2019 17:47:19 +0000 (00:47 +0700)]
Remove TODO(#955)
rexim [Sat, 23 Nov 2019 17:47:19 +0000 (00:47 +0700)]
Remove TODO(#1129)
Alexey Kutepov [Sat, 23 Nov 2019 17:41:46 +0000 (00:41 +0700)]
Merge pull request #1151 from tsoding/1144
(#1144) Make the snapping threshold depending the camera zoom level
rexim [Sat, 23 Nov 2019 17:25:56 +0000 (00:25 +0700)]
(#1144) Make the snapping threshold depending the camera zoom level
rexim [Sat, 23 Nov 2019 17:10:37 +0000 (00:10 +0700)]
(#1144) Compress the rect snapping logic
Alexey Kutepov [Sat, 23 Nov 2019 16:54:35 +0000 (23:54 +0700)]
Merge pull request #1146 from kolumb/398a
(#398) Add blank credits screen
rexim [Sat, 23 Nov 2019 16:46:12 +0000 (23:46 +0700)]
Add TODO(#1150)
Alexey Kutepov [Sat, 23 Nov 2019 16:29:33 +0000 (23:29 +0700)]
Merge pull request #1149 from gooddoog/1148
(#1148) Disable pause mode after reloading the level
gooddoog [Fri, 22 Nov 2019 13:11:06 +0000 (16:11 +0300)]
(#1148) Disable pause mode after reloading the level
Danil Kolumbet [Thu, 21 Nov 2019 23:08:24 +0000 (01:08 +0200)]
add missing eol
Danil Kolumbet [Thu, 21 Nov 2019 23:06:53 +0000 (01:06 +0200)]
add missing eol
Danil Kolumbet [Thu, 21 Nov 2019 22:45:11 +0000 (00:45 +0200)]
add blank credits screen
Danil Kolumbet [Wed, 20 Nov 2019 20:17:08 +0000 (22:17 +0200)]
Merge remote-tracking branch 'upstream/master'
rexim [Wed, 20 Nov 2019 13:56:07 +0000 (20:56 +0700)]
Add TODO(#1145)
Alexey Kutepov [Tue, 19 Nov 2019 23:39:35 +0000 (06:39 +0700)]
Merge pull request #1138 from tsoding/946
(#946) Rect snapping implementation
rexim [Tue, 19 Nov 2019 22:35:05 +0000 (05:35 +0700)]
(#946) Reorder snapping conditions
rexim [Tue, 19 Nov 2019 22:29:03 +0000 (05:29 +0700)]
(#946) Merge snapping conditions
rexim [Tue, 19 Nov 2019 22:17:39 +0000 (05:17 +0700)]
(#946) Inline snap_rect
rexim [Tue, 19 Nov 2019 22:14:20 +0000 (05:14 +0700)]
(#946) Get rid of the loop in snap_rect()
rexim [Tue, 19 Nov 2019 22:09:03 +0000 (05:09 +0700)]
(#946) Fix typo
https://github.com/tsoding/nothing/pull/1138#discussion_r347156224
@sebsu Thank you so much!
Danil Kolumbet [Mon, 18 Nov 2019 02:30:59 +0000 (04:30 +0200)]
Merge pull request #1 from tsoding/master
update fork
rexim [Sun, 17 Nov 2019 20:02:34 +0000 (03:02 +0700)]
Add TODO(#1142)
rexim [Sun, 17 Nov 2019 20:02:33 +0000 (03:02 +0700)]
Add TODO(#1141)
rexim [Sun, 17 Nov 2019 20:02:32 +0000 (03:02 +0700)]
Add TODO(#1140)
rexim [Sun, 17 Nov 2019 20:02:31 +0000 (03:02 +0700)]
Add TODO(#1139)
rexim [Sun, 17 Nov 2019 19:55:39 +0000 (02:55 +0700)]
(#946) Additional work
rexim [Sun, 17 Nov 2019 19:52:16 +0000 (02:52 +0700)]
(#946) Reimplement rect snapping
rexim [Sun, 17 Nov 2019 18:44:08 +0000 (01:44 +0700)]
(#946) Fix assertion on moving a single rect
rexim [Sun, 17 Nov 2019 18:31:50 +0000 (01:31 +0700)]
(#946) Initial snapping implementation
Alexey Kutepov [Sun, 17 Nov 2019 19:56:13 +0000 (02:56 +0700)]
Merge pull request #1137 from tsoding/1136
(#1136) Don't trigger consolé if any modifiers are pressed
rexim [Sun, 17 Nov 2019 16:53:39 +0000 (23:53 +0700)]
(#1136) Don't trigger consolé if any modifiers are pressed
Alexey Kutepov [Sun, 17 Nov 2019 16:40:21 +0000 (23:40 +0700)]
Merge pull request #1135 from zhiayang/github-actions
Setup Github Actions for CI
zhiayang [Sun, 17 Nov 2019 16:31:03 +0000 (00:31 +0800)]
add badge for github-actions to README
zhiayang [Sun, 17 Nov 2019 16:23:32 +0000 (00:23 +0800)]
fix noisy warnings on cmake
use QUIET option so CMake doesn't complain if we don't find SDL2
through the system means.
zhiayang [Sun, 17 Nov 2019 09:29:14 +0000 (17:29 +0800)]
create github actions workflow for all 4 configs
Linux (Ubuntu), macOS, Windows (MSVC), and Windows (MinGW)
zhiayang [Sun, 17 Nov 2019 09:27:51 +0000 (17:27 +0800)]
search for sdl2 a little better on windows
instead of only looking for it with local files, use the `find_package` cmake
thing to look for it first (optionally). Helps when you wanna install SDL with
pacman on MSYS2 or something.
Alexey Kutepov [Sat, 16 Nov 2019 23:07:20 +0000 (06:07 +0700)]
Merge pull request #1133 from kolumb/cmake_file_order
(#1132) make file order for cmake consistent
Danil Kolumbet [Sat, 16 Nov 2019 20:18:18 +0000 (22:18 +0200)]
fix merge conflicts
Alexey Kutepov [Sat, 16 Nov 2019 19:52:42 +0000 (02:52 +0700)]
Merge pull request #1134 from tsoding/1129
(#1129) Introduce different cursor styles
rexim [Sat, 16 Nov 2019 18:22:54 +0000 (01:22 +0700)]
(#1129) Fix compilation on WindowsXP
rexim [Sat, 16 Nov 2019 18:20:59 +0000 (01:20 +0700)]
(#1129) Introduce cursor icon pivot
rexim [Sat, 16 Nov 2019 18:09:05 +0000 (01:09 +0700)]
(#1129) Remove redundant debug logging
rexim [Sat, 16 Nov 2019 18:07:19 +0000 (01:07 +0700)]
(#1129) Make Rect Layer use Cursor entity
Danil Kolumbet [Sat, 16 Nov 2019 17:16:36 +0000 (19:16 +0200)]
make file order consistent
rexim [Sat, 16 Nov 2019 17:02:14 +0000 (00:02 +0700)]
(#1129) Remove dependency on Game from Rect Layer
rexim [Sat, 16 Nov 2019 16:57:16 +0000 (23:57 +0700)]
(#1129) Extract Cursor entity
rexim [Sat, 16 Nov 2019 16:20:39 +0000 (23:20 +0700)]
(#1129) Change cursor style on rect layer resize
Alexey Kutepov [Tue, 12 Nov 2019 23:12:58 +0000 (06:12 +0700)]
Merge pull request #1131 from rafaelffilho/audio_crash_fix
Fix closing the game without audio
Rafael Froeschlin Filho [Mon, 11 Nov 2019 19:59:43 +0000 (16:59 -0300)]
Fix closing the game without audio