]> git.lizzy.rs Git - nothing.git/log
nothing.git
4 years ago(#1142) snap_var2 -> snap_var2seg
rexim [Sun, 24 Nov 2019 16:59:07 +0000 (23:59 +0700)]
(#1142) snap_var2 -> snap_var2seg

4 years ago(#1142) snap_var1 -> snap_var
rexim [Sun, 24 Nov 2019 16:58:48 +0000 (23:58 +0700)]
(#1142) snap_var1 -> snap_var

4 years ago(#1142) explain snap_var1 a little bit better
rexim [Sun, 24 Nov 2019 16:52:20 +0000 (23:52 +0700)]
(#1142) explain snap_var1 a little bit better

4 years ago(#1142) Intermediate snap_var* names
rexim [Sun, 24 Nov 2019 16:48:29 +0000 (23:48 +0700)]
(#1142) Intermediate snap_var* names

4 years ago(#1142) Split temp_snap into even smaller pieces
rexim [Sun, 24 Nov 2019 16:25:53 +0000 (23:25 +0700)]
(#1142) Split temp_snap into even smaller pieces

4 years ago(#1142) Simplify snap_var implementation
rexim [Sat, 23 Nov 2019 19:18:07 +0000 (02:18 +0700)]
(#1142) Simplify snap_var implementation

4 years ago(#1142) Full resize snapping
rexim [Sat, 23 Nov 2019 18:57:00 +0000 (01:57 +0700)]
(#1142) Full resize snapping

4 years ago(#1142) Bot-left resize snapping
rexim [Sat, 23 Nov 2019 18:51:09 +0000 (01:51 +0700)]
(#1142) Bot-left resize snapping

4 years ago(#1142) Bottom resize snapping
rexim [Sat, 23 Nov 2019 18:47:36 +0000 (01:47 +0700)]
(#1142) Bottom resize snapping

4 years ago(#1142) Top-left resize snapping
rexim [Sat, 23 Nov 2019 18:37:20 +0000 (01:37 +0700)]
(#1142) Top-left resize snapping

4 years ago(#1142) Add support for top and left resize snapping
rexim [Sat, 23 Nov 2019 18:32:47 +0000 (01:32 +0700)]
(#1142) Add support for top and left resize snapping

4 years ago(#1142) introduce snap_var
rexim [Sat, 23 Nov 2019 18:02:20 +0000 (01:02 +0700)]
(#1142) introduce snap_var

4 years agoRemove TODO(#955)
rexim [Sat, 23 Nov 2019 17:47:19 +0000 (00:47 +0700)]
Remove TODO(#955)

4 years agoRemove TODO(#1129)
rexim [Sat, 23 Nov 2019 17:47:19 +0000 (00:47 +0700)]
Remove TODO(#1129)

4 years agoMerge pull request #1151 from tsoding/1144
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

4 years ago(#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

4 years ago(#1144) Compress the rect snapping logic
rexim [Sat, 23 Nov 2019 17:10:37 +0000 (00:10 +0700)]
(#1144) Compress the rect snapping logic

4 years agoMerge pull request #1146 from kolumb/398a
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

4 years agoAdd TODO(#1150)
rexim [Sat, 23 Nov 2019 16:46:12 +0000 (23:46 +0700)]
Add TODO(#1150)

4 years agoMerge pull request #1149 from gooddoog/1148
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

4 years ago(#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

4 years agoadd missing eol
Danil Kolumbet [Thu, 21 Nov 2019 23:08:24 +0000 (01:08 +0200)]
add missing eol

4 years agoadd missing eol
Danil Kolumbet [Thu, 21 Nov 2019 23:06:53 +0000 (01:06 +0200)]
add missing eol

4 years agoadd blank credits screen
Danil Kolumbet [Thu, 21 Nov 2019 22:45:11 +0000 (00:45 +0200)]
add blank credits screen

4 years agoMerge remote-tracking branch 'upstream/master'
Danil Kolumbet [Wed, 20 Nov 2019 20:17:08 +0000 (22:17 +0200)]
Merge remote-tracking branch 'upstream/master'

4 years agoAdd TODO(#1145)
rexim [Wed, 20 Nov 2019 13:56:07 +0000 (20:56 +0700)]
Add TODO(#1145)

4 years agoMerge pull request #1138 from tsoding/946
Alexey Kutepov [Tue, 19 Nov 2019 23:39:35 +0000 (06:39 +0700)]
Merge pull request #1138 from tsoding/946

(#946) Rect snapping implementation

4 years ago(#946) Reorder snapping conditions
rexim [Tue, 19 Nov 2019 22:35:05 +0000 (05:35 +0700)]
(#946) Reorder snapping conditions

4 years ago(#946) Merge snapping conditions
rexim [Tue, 19 Nov 2019 22:29:03 +0000 (05:29 +0700)]
(#946) Merge snapping conditions

4 years ago(#946) Inline snap_rect
rexim [Tue, 19 Nov 2019 22:17:39 +0000 (05:17 +0700)]
(#946) Inline snap_rect

4 years ago(#946) Get rid of the loop in snap_rect()
rexim [Tue, 19 Nov 2019 22:14:20 +0000 (05:14 +0700)]
(#946) Get rid of the loop in snap_rect()

4 years ago(#946) Fix typo
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!

4 years agoMerge pull request #1 from tsoding/master
Danil Kolumbet [Mon, 18 Nov 2019 02:30:59 +0000 (04:30 +0200)]
Merge pull request #1 from tsoding/master

update fork

4 years agoAdd TODO(#1142)
rexim [Sun, 17 Nov 2019 20:02:34 +0000 (03:02 +0700)]
Add TODO(#1142)

4 years agoAdd TODO(#1141)
rexim [Sun, 17 Nov 2019 20:02:33 +0000 (03:02 +0700)]
Add TODO(#1141)

4 years agoAdd TODO(#1140)
rexim [Sun, 17 Nov 2019 20:02:32 +0000 (03:02 +0700)]
Add TODO(#1140)

4 years agoAdd TODO(#1139)
rexim [Sun, 17 Nov 2019 20:02:31 +0000 (03:02 +0700)]
Add TODO(#1139)

4 years ago(#946) Additional work
rexim [Sun, 17 Nov 2019 19:55:39 +0000 (02:55 +0700)]
(#946) Additional work

4 years ago(#946) Reimplement rect snapping
rexim [Sun, 17 Nov 2019 19:52:16 +0000 (02:52 +0700)]
(#946) Reimplement rect snapping

4 years ago(#946) Fix assertion on moving a single rect
rexim [Sun, 17 Nov 2019 18:44:08 +0000 (01:44 +0700)]
(#946) Fix assertion on moving a single rect

4 years ago(#946) Initial snapping implementation
rexim [Sun, 17 Nov 2019 18:31:50 +0000 (01:31 +0700)]
(#946) Initial snapping implementation

4 years agoMerge pull request #1137 from tsoding/1136
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

4 years ago(#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

4 years agoMerge pull request #1135 from zhiayang/github-actions
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

4 years agoadd badge for github-actions to README
zhiayang [Sun, 17 Nov 2019 16:31:03 +0000 (00:31 +0800)]
add badge for github-actions to README

4 years agofix noisy warnings on cmake
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.

4 years agocreate github actions workflow for all 4 configs
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)

4 years agosearch for sdl2 a little better on windows
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.

4 years agoMerge pull request #1133 from kolumb/cmake_file_order
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

4 years agofix merge conflicts
Danil Kolumbet [Sat, 16 Nov 2019 20:18:18 +0000 (22:18 +0200)]
fix merge conflicts

4 years agoMerge pull request #1134 from tsoding/1129
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

4 years ago(#1129) Fix compilation on WindowsXP
rexim [Sat, 16 Nov 2019 18:22:54 +0000 (01:22 +0700)]
(#1129) Fix compilation on WindowsXP

4 years ago(#1129) Introduce cursor icon pivot
rexim [Sat, 16 Nov 2019 18:20:59 +0000 (01:20 +0700)]
(#1129) Introduce cursor icon pivot

4 years ago(#1129) Remove redundant debug logging
rexim [Sat, 16 Nov 2019 18:09:05 +0000 (01:09 +0700)]
(#1129) Remove redundant debug logging

4 years ago(#1129) Make Rect Layer use Cursor entity
rexim [Sat, 16 Nov 2019 18:07:19 +0000 (01:07 +0700)]
(#1129) Make Rect Layer use Cursor entity

4 years agomake file order consistent
Danil Kolumbet [Sat, 16 Nov 2019 17:16:36 +0000 (19:16 +0200)]
make file order consistent

4 years ago(#1129) Remove dependency on Game from Rect Layer
rexim [Sat, 16 Nov 2019 17:02:14 +0000 (00:02 +0700)]
(#1129) Remove dependency on Game from Rect Layer

4 years ago(#1129) Extract Cursor entity
rexim [Sat, 16 Nov 2019 16:57:16 +0000 (23:57 +0700)]
(#1129) Extract Cursor entity

4 years ago(#1129) Change cursor style on rect layer resize
rexim [Sat, 16 Nov 2019 16:20:39 +0000 (23:20 +0700)]
(#1129) Change cursor style on rect layer resize

4 years agoMerge pull request #1131 from rafaelffilho/audio_crash_fix
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

4 years agoFix 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

4 years agoMerge pull request #1130 from rafaelffilho/AddDragonFly
Alexey Kutepov [Sun, 10 Nov 2019 21:36:48 +0000 (04:36 +0700)]
Merge pull request #1130 from rafaelffilho/AddDragonFly

Add support for DragonFlyBSD

4 years ago(#1129) Introduce different cursor styles
rexim [Sun, 10 Nov 2019 19:49:40 +0000 (02:49 +0700)]
(#1129) Introduce different cursor styles

4 years agoMerge pull request #1128 from tsoding/955
Alexey Kutepov [Sun, 10 Nov 2019 19:48:17 +0000 (02:48 +0700)]
Merge pull request #1128 from tsoding/955

(#955) Improved rect layer resizing

4 years ago(#955) Disable C4706 warning on MSVC 2015 build
rexim [Sun, 10 Nov 2019 18:59:55 +0000 (01:59 +0700)]
(#955) Disable C4706 warning on MSVC 2015 build

4 years agoAdd TODO(#1129)
rexim [Sun, 10 Nov 2019 18:47:00 +0000 (01:47 +0700)]
Add TODO(#1129)

4 years ago(#955) Map selection overlay to screen
rexim [Sun, 10 Nov 2019 18:41:18 +0000 (01:41 +0700)]
(#955) Map selection overlay to screen

4 years ago(#955) implement secondary diagonal resizing
rexim [Sun, 10 Nov 2019 18:35:54 +0000 (01:35 +0700)]
(#955) implement secondary diagonal resizing

4 years ago(#955) Add supports for major corners
rexim [Sun, 10 Nov 2019 18:19:00 +0000 (01:19 +0700)]
(#955) Add supports for major corners

4 years agoMerge pull request #1126 from tsoding/1125
Alexey Kutepov [Sun, 10 Nov 2019 18:17:28 +0000 (01:17 +0700)]
Merge pull request #1126 from tsoding/1125

(#1125) Allow to play the game with the failed sound samples

4 years ago(#955) Single side resize modes
rexim [Sun, 10 Nov 2019 18:06:50 +0000 (01:06 +0700)]
(#955) Single side resize modes

4 years agoAdd support for DragonFlyBSD
Rafael Froeschlin Filho [Sun, 10 Nov 2019 17:48:47 +0000 (14:48 -0300)]
Add support for DragonFlyBSD

4 years ago(#955) Get rid of resize anchor in Rect Layer
rexim [Sun, 10 Nov 2019 16:51:58 +0000 (23:51 +0700)]
(#955) Get rid of resize anchor in Rect Layer

4 years agoAdd TODO(#1127)
rexim [Sun, 10 Nov 2019 16:39:27 +0000 (23:39 +0700)]
Add TODO(#1127)

4 years agoMerge pull request #1122 from tsoding/1120
Alexey Kutepov [Sun, 10 Nov 2019 16:33:49 +0000 (23:33 +0700)]
Merge pull request #1122 from tsoding/1120

(#1120) Initialize default value of the sound samples

4 years ago(#1125) Fix fomatting
rexim [Sun, 10 Nov 2019 16:32:26 +0000 (23:32 +0700)]
(#1125) Fix fomatting

4 years ago(#1125) Prevent segfault on failed samples trying to play sound
rexim [Sun, 10 Nov 2019 16:31:04 +0000 (23:31 +0700)]
(#1125) Prevent segfault on failed samples trying to play sound

4 years agoMerge pull request #1124 from Nykseli/freebsd
Alexey Kutepov [Sun, 10 Nov 2019 16:28:10 +0000 (23:28 +0700)]
Merge pull request #1124 from Nykseli/freebsd

nothing now compiles on freebsd

4 years ago(#1125) Allow to play the game with failed sound samples
rexim [Sun, 10 Nov 2019 16:24:50 +0000 (23:24 +0700)]
(#1125) Allow to play the game with failed sound samples

4 years agonothing now compiles on freebsd
Miika Alikirri [Sun, 10 Nov 2019 04:36:02 +0000 (06:36 +0200)]
nothing now compiles on freebsd

4 years agoAdd TODO(#1123)
rexim [Sat, 9 Nov 2019 17:58:38 +0000 (00:58 +0700)]
Add TODO(#1123)

4 years ago(#1120) introduce SOUND_SAMPLES_DEFAULT_VOLUME
rexim [Sat, 9 Nov 2019 17:56:35 +0000 (00:56 +0700)]
(#1120) introduce SOUND_SAMPLES_DEFAULT_VOLUME

4 years ago(#1120) Initialize default value of the sound samples
rexim [Sat, 9 Nov 2019 17:50:52 +0000 (00:50 +0700)]
(#1120) Initialize default value of the sound samples

4 years ago(#1120) Fix formatting
rexim [Sat, 9 Nov 2019 17:50:42 +0000 (00:50 +0700)]
(#1120) Fix formatting

4 years agoMerge pull request #1121 from tsoding/411
Alexey Kutepov [Sat, 9 Nov 2019 17:41:40 +0000 (00:41 +0700)]
Merge pull request #1121 from tsoding/411

(#411) Command handling in console

4 years ago(#411) Implement the load command
rexim [Sat, 9 Nov 2019 17:26:26 +0000 (00:26 +0700)]
(#411) Implement the load command

4 years ago(#411) Fix build on Windows
rexim [Sat, 9 Nov 2019 16:21:38 +0000 (23:21 +0700)]
(#411) Fix build on Windows

4 years agoMerge pull request #1119 from tsoding/1118
Alexey Kutepov [Mon, 4 Nov 2019 11:00:55 +0000 (18:00 +0700)]
Merge pull request #1119 from tsoding/1118

 (#1118) Inner selection overlay for Rect Layer

4 years ago(#1118) Try to fix warnings on MacOS build
rexim [Mon, 4 Nov 2019 10:38:26 +0000 (17:38 +0700)]
(#1118) Try to fix warnings on MacOS build

4 years ago(#1118) Remove dead code
rexim [Mon, 4 Nov 2019 10:29:28 +0000 (17:29 +0700)]
(#1118) Remove dead code

4 years ago(#1118) try to fix -Wcast-align on MacOS build
rexim [Mon, 4 Nov 2019 10:14:50 +0000 (17:14 +0700)]
(#1118) try to fix -Wcast-align on MacOS build

4 years ago(#411) Stub load command
rexim [Sun, 3 Nov 2019 20:07:42 +0000 (03:07 +0700)]
(#411) Stub load command

4 years ago(#411) Introduce word parser to console
rexim [Sun, 3 Nov 2019 19:51:18 +0000 (02:51 +0700)]
(#411) Introduce word parser to console

4 years ago(#411) Move console from Level to Game
rexim [Sun, 3 Nov 2019 19:22:50 +0000 (02:22 +0700)]
(#411) Move console from Level to Game

4 years ago(#1118) Remove #warning because it's an extension
rexim [Sun, 3 Nov 2019 19:54:05 +0000 (02:54 +0700)]
(#1118) Remove #warning because it's an extension

4 years ago(#1118) Use AppleClang id as a Unix flags branch indicator
rexim [Sun, 3 Nov 2019 19:25:00 +0000 (02:25 +0700)]
(#1118) Use AppleClang id as a Unix flags branch indicator

4 years ago(#1118) Add debug information that prints CMAKE_C_COMPILER_ID
rexim [Sun, 3 Nov 2019 19:05:29 +0000 (02:05 +0700)]
(#1118) Add debug information that prints CMAKE_C_COMPILER_ID

4 years ago(#1118) Add debug log to the Unix branch to see if it works on MacOS
rexim [Sun, 3 Nov 2019 19:03:02 +0000 (02:03 +0700)]
(#1118) Add debug log to the Unix branch to see if it works on MacOS

4 years ago(#1118) try to fix MacOS build?
rexim [Sun, 3 Nov 2019 18:29:47 +0000 (01:29 +0700)]
(#1118) try to fix MacOS build?

4 years ago(#1118) Purposefully break the build
rexim [Sun, 3 Nov 2019 18:12:59 +0000 (01:12 +0700)]
(#1118) Purposefully break the build