rexim
|
f9e5ee4fda
|
Introduce read_whole_file and String
|
2019-12-15 23:55:38 +07:00 |
|
rexim
|
ca05616dd8
|
Fix save level bug
|
2019-12-15 23:28:53 +07:00 |
Gokberk Yaltirakli
|
f626d703c8
|
List selector wrap around
|
2019-12-15 16:10:18 +00:00 |
|
Alexey Kutepov
|
008136120b
|
Merge pull request #1199 from kolumb/914
(#914) document level editor key bindings
|
2019-12-15 21:49:03 +07:00 |
|
rexim
|
60bfa4ee6b
|
Remove unused macro
|
2019-12-15 04:50:31 +07:00 |
|
rexim
|
a377200af0
|
Try to fix MSVC build
|
2019-12-15 03:18:04 +07:00 |
|
rexim
|
4c7f51c3ab
|
Remove LevelMetadata as a concept
|
2019-12-15 03:12:33 +07:00 |
|
rexim
|
002ac714b3
|
Remove metadata usage from LevelPicker
|
2019-12-15 02:53:22 +07:00 |
Danil Kolumbet
|
c527f940cc
|
(tsoding/nothing#914) document level editor key bindings
|
2019-12-14 17:02:23 +02:00 |
|
rexim
|
ed7df983ef
|
Try to fix msvc build
|
2019-12-11 20:47:50 +07:00 |
|
rexim
|
ea185ab734
|
Generalize extrema functions
|
2019-12-10 20:32:16 +07:00 |
|
rexim
|
ed42f087d8
|
Remove dead LineStream related code
|
2019-12-10 19:56:39 +07:00 |
|
rexim
|
566357fd8f
|
Partially remove lt from LevelPicker branch
|
2019-12-10 19:51:56 +07:00 |
|
rexim
|
581d4a4192
|
Try to fix macos build
|
2019-12-09 07:45:27 +07:00 |
|
rexim
|
f0b475ae34
|
Try to fix msvc build
|
2019-12-09 07:40:01 +07:00 |
|
rexim
|
163bd12c73
|
Try to fix msvc build
|
2019-12-09 07:37:27 +07:00 |
|
rexim
|
3e93fd703f
|
Try to fix msvc build
|
2019-12-09 07:32:10 +07:00 |
|
rexim
|
23c4c38be2
|
Fix segfault
|
2019-12-09 07:20:01 +07:00 |
|
rexim
|
2993327dab
|
Make LevelMetadata transparent
|
2019-12-09 06:50:09 +07:00 |
|
rexim
|
29267a1850
|
Fix memory leak in LevelMetadata
|
2019-12-09 06:04:59 +07:00 |
|
rexim
|
75a3de6bf2
|
Merge branch 'master' into memory
- Camera struct used to contain pointer to Sprite_font, but we changed
to the value
- In camera.h we removed camera_font() and added effective_scale()
|
2019-12-09 05:27:05 +07:00 |
|
Alexey Kutepov
|
8861a0ca26
|
Merge pull request #1195 from tsoding/profiler
Try to recalculate effective scale only when it's needed
|
2019-12-09 05:18:49 +07:00 |
|
Alexey Kutepov
|
d14e087e10
|
Merge pull request #1191 from kolumb/1187
#1187 Open console while NumLock is on
|
2019-12-09 05:18:29 +07:00 |
|
Alexey Kutepov
|
6d0b64cf95
|
Merge pull request #1194 from gooddoog/1193
(#1193) Add option to go back to level picker from the level
|
2019-12-09 05:14:02 +07:00 |
|
rexim
|
4953896b0d
|
Remove dynarray_count and dynarray_data
|
2019-12-09 05:08:22 +07:00 |
|
Danil Kolumbet
|
0257738f41
|
remove comment
|
2019-12-09 00:05:34 +02:00 |
|
Danil Kolumbet
|
ac7a289b14
|
allow open console with numlock on
|
2019-12-09 00:05:34 +02:00 |
|
Danil Kolumbet
|
2dd84c16d0
|
(tsoding#1185) fix pushing stack var on Lifetime object
|
2019-12-09 00:05:34 +02:00 |
|
Danil Kolumbet
|
02608505ad
|
(tsoding#1185) replace buffer with formatted print
|
2019-12-09 00:05:34 +02:00 |
|
Danil Kolumbet
|
447fc6e6ea
|
(tsoding#1185) fix copy-paste refactoring error
|
2019-12-09 00:05:34 +02:00 |
|
Danil Kolumbet
|
3f7ca2bf03
|
(tsoding#1185) change level file saving destination
|
2019-12-09 00:05:34 +02:00 |
|
rexim
|
dbec47f8b9
|
Make Dynarray transparent
|
2019-12-09 03:18:19 +07:00 |
|
rexim
|
e807dc97a8
|
Refactor sprite_font_render_text
|
2019-12-09 01:09:06 +07:00 |
|
rexim
|
464fe0a8ed
|
Make Sprite_font transparent
|
2019-12-09 00:56:31 +07:00 |
gooddoog
|
f2bceff0f3
|
(#1193) Move selection clean to game_switch_state
|
2019-12-08 20:09:25 +03:00 |
|
gooddoog
|
8e7916334c
|
(#1193) Use 'menu' console command instead of 'Esc' key
|
2019-12-08 19:45:10 +03:00 |
|
rexim
|
095df97fa0
|
Hide effective_ratio behind translation unit
|
2019-12-08 23:38:57 +07:00 |
|
gooddoog
|
1688c4bbcd
|
Remove redundant selection clean
|
2019-12-08 16:58:31 +03:00 |
|
gooddoog
|
7bb0d197a0
|
(#1193) Take into account console event handler
|
2019-12-08 16:42:36 +03:00 |
|
gooddoog
|
39bbd23e42
|
(#1193) Use 'Esc' button to go back to level picker from level state
|
2019-12-08 16:30:35 +03:00 |
|
Gokberk Yaltirakli
|
b876745000
|
Improve error message for version mismatch
|
2019-12-07 22:22:23 +00:00 |
|
rexim
|
e1a862cb35
|
Try to recalculate effective scale only when it's needed
|
2019-12-08 01:37:25 +07:00 |
|
Alexey Kutepov
|
56dab0444f
|
Merge pull request #1186 from kolumb/1185
(#1185) Change level file save destination
|
2019-12-07 23:51:39 +07:00 |
|
Danil Kolumbet
|
dbbcae237c
|
(tsoding#1185) fix pushing stack var on Lifetime object
|
2019-12-07 15:59:55 +02:00 |
|
Danil Kolumbet
|
e8aacfac7c
|
(tsoding#1185) replace buffer with formatted print
|
2019-12-07 02:43:47 +02:00 |
|
Danil Kolumbet
|
047f6f799b
|
(tsoding#1185) fix copy-paste refactoring error
|
2019-12-07 02:20:34 +02:00 |
|
Danil Kolumbet
|
06e589c036
|
(tsoding#1185) change level file saving destination
|
2019-12-07 02:17:30 +02:00 |
|
Alexey Kutepov
|
b73b09ba21
|
Merge pull request #1166 from kolumb/452
(#452) add version to level metadata
|
2019-12-06 21:23:00 +07:00 |
|
rexim
|
0bc119a5de
|
Make 60 FPS a default
|
2019-12-06 21:10:51 +07:00 |
|
rexim
|
b677738fc6
|
Revert "(#164) %z -> %l for mingw on Windows"
This reverts commit 5eb6015521.
|
2019-12-05 21:54:19 +07:00 |
|
rexim
|
5eb6015521
|
(#164) %z -> %l for mingw on Windows
|
2019-12-05 21:51:11 +07:00 |
|
rexim
|
135b4299d7
|
(#164) Make undo_history translation unit more unity build friendly
|
2019-12-05 21:13:17 +07:00 |
|
rexim
|
81a40fe9db
|
(#164) Make layer translation units more unity build friendly
|
2019-12-05 21:13:07 +07:00 |
|
Danil Kolumbet
|
bccd171e3d
|
write version to save file
|
2019-12-02 22:47:28 +02:00 |
|
rexim
|
f9f7281c2d
|
Add TODO(#1171)
|
2019-12-02 02:01:29 +07:00 |
|
rexim
|
d34a682fa2
|
(#1141) Make snapping mode togglable by q key
|
2019-12-02 01:59:34 +07:00 |
|
rexim
|
1560fa97bf
|
(#1141) Use snap_rect_resize_if_enabled for all the cases
|
2019-12-02 01:52:48 +07:00 |
|
rexim
|
c4505ddf21
|
(#1141) Use snap_rect_resize_if_enabled for the sides (no corners)
|
2019-12-02 00:43:53 +07:00 |
|
rexim
|
d0d03fdc0b
|
(#1141) snap_rects -> snap_rect_move_if_enabled
|
2019-12-02 00:35:00 +07:00 |
|
rexim
|
b290cbd0f8
|
(#1141) Introduce maybe_snap_rect_resize
|
2019-12-02 00:29:47 +07:00 |
|
Danil Kolumbet
|
375eb1c630
|
add version to level files
|
2019-12-01 04:20:35 +02:00 |
|
rexim
|
1ef139fda2
|
Remove dead macros
|
2019-12-01 02:46:57 +07:00 |
|
rexim
|
e8e3d4c8db
|
Remove last_modified
|
2019-12-01 02:41:57 +07:00 |
|
rexim
|
e1a2bc1e5a
|
Fix sprite_font_boundary_box usage
|
2019-12-01 02:36:07 +07:00 |
|
Alexey Kutepov
|
a36754e8f3
|
Merge pull request #1165 from zhiayang/901
(#901) Support macOS in file/last_modified
|
2019-12-01 02:25:48 +07:00 |
|
Alexey Kutepov
|
cfa28e446d
|
Merge pull request #1164 from zhiayang/1070
(#1070) Only actually select a list item when the mouse is correct
|
2019-12-01 02:23:40 +07:00 |
|
Alexey Kutepov
|
8e9730701d
|
Merge pull request #1162 from zhiayang/1068
(#1068) Reset player jump count on death
|
2019-12-01 01:55:40 +07:00 |
|
Alexey Kutepov
|
1db8e93311
|
Merge pull request #1163 from zhiayang/974
(#974) Support non-1x display resolution scale
|
2019-12-01 01:47:11 +07:00 |
|
rexim
|
26d40dd2ea
|
(#974) Remove debug logging
|
2019-12-01 01:38:40 +07:00 |
|
rexim
|
9517431b7d
|
Merge branch 'master' into 1153
|
2019-12-01 01:00:13 +07:00 |
|
rexim
|
c4cf192119
|
(#1153) Fix square ratio snapping
|
2019-12-01 00:40:08 +07:00 |
zhiayang
|
eb6f4d3e6b
|
(#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`.
|
2019-12-01 01:00:14 +08:00 |
|
rexim
|
c7497e3997
|
(#1139) Fix MSVC build
|
2019-11-30 23:23:12 +07:00 |
|
Danil Kolumbet
|
47d9db5c09
|
add version to level metadata
|
2019-11-25 14:37:34 +02:00 |
|
zhiayang
|
353c1e8959
|
(#901) Use normal unix `struct stat` for macos in `last_modified`.
|
2019-11-25 12:39:04 +08:00 |
|
zhiayang
|
62bcdd053c
|
(#1070) Only actually select a list item when the mouse is correct
|
2019-11-25 12:28:54 +08:00 |
|
zhiayang
|
bceb35ac1f
|
(#974) Revert that. I can't program, apparently.
|
2019-11-25 11:53:41 +08:00 |
|
zhiayang
|
e4078f8d1f
|
(#974) Skip rescaling the events if the scale is 1.
|
2019-11-25 11:45:37 +08:00 |
|
zhiayang
|
8388fbc950
|
(#974) Fix another oversight
|
2019-11-25 11:42:17 +08:00 |
|
zhiayang
|
bba6b7f644
|
(#974) Fix float -> int casting
|
2019-11-25 11:35:11 +08:00 |
|
zhiayang
|
ff428de0b0
|
(#974) Clean up redundant code checks.
PS: I don't think anybody manufactures a screen that has different
x and y pixel scale...
|
2019-11-25 11:21:30 +08:00 |
|
zhiayang
|
3c9409f3c1
|
(#974) Support non-1x display resolution scale
|
2019-11-25 11:09:47 +08:00 |
|
zhiayang
|
9455584d37
|
(#1068) Reset player jump count on death
|
2019-11-25 10:21:13 +08:00 |
|
zhiayang
|
5600483233
|
(#1153) Fix snapping when ratio-resizing.
|
2019-11-25 04:33:39 +08:00 |
|
zhiayang
|
31ff2879dd
|
(#1153) Properly update the ratio when entering ratio mode
|
2019-11-25 03:59:43 +08:00 |
|
zhiayang
|
66e62a994a
|
(#1153) Clean up the code a bit.
|
2019-11-25 03:54:39 +08:00 |
|
rexim
|
2d7f1561b4
|
Add TODO(#1161)
|
2019-11-25 02:53:32 +07:00 |
|
rexim
|
c53fb9ecf4
|
Add TODO(#1160)
|
2019-11-25 02:53:31 +07:00 |
|
rexim
|
dfbfad94ef
|
(#1139) Implement Move snap for Label Layer
|
2019-11-25 02:51:35 +07:00 |
|
zhiayang
|
3cde3668dd
|
(#1153) Implement ratio-resize for the other 3 corners
|
2019-11-25 03:27:27 +08:00 |
|
rexim
|
4f374fb872
|
(#1139) Put label id below label text
|
2019-11-25 02:25:05 +07:00 |
|
rexim
|
14a80ed176
|
(#1139) Decouple sprite_font_boundary_box from Sprite_font
|
2019-11-25 02:09:24 +07:00 |
|
zhiayang
|
5fccd45e09
|
(#1153) Allow entering ratio-mode in the middle of resizing
|
2019-11-25 02:55:53 +08:00 |
|
zhiayang
|
29f9532342
|
(#1153) Add fixed-ratio resizing to RectLayer
|
2019-11-25 02:39:42 +08:00 |
|
rexim
|
e62149607d
|
(#1139) Implement Centralized Boundary Calculation (CBC)
|
2019-11-25 01:31:49 +07:00 |
|
rexim
|
f5aa866975
|
(#1139) Move rect snapping stuff to rect translation unit
|
2019-11-25 01:09:14 +07:00 |
|
rexim
|
aa5d7e63df
|
Remove TODO(#1142)
|
2019-11-25 00:19:02 +07:00 |
|
rexim
|
05467bf303
|
(#1142) snap_var4 -> snap_seg2seg
|
2019-11-25 00:00:48 +07:00 |
|
rexim
|
0b443f4912
|
(#1142) snap_var2 -> snap_var2seg
|
2019-11-24 23:59:07 +07:00 |
|
rexim
|
06d6269b0d
|
(#1142) snap_var1 -> snap_var
|
2019-11-24 23:58:48 +07:00 |
|
rexim
|
8467638fbc
|
(#1142) explain snap_var1 a little bit better
|
2019-11-24 23:52:20 +07:00 |
|
rexim
|
1840b5374b
|
(#1142) Intermediate snap_var* names
|
2019-11-24 23:48:29 +07:00 |
|
rexim
|
a4bfcecc59
|
(#1142) Split temp_snap into even smaller pieces
|
2019-11-24 23:25:53 +07:00 |
|
rexim
|
085bf69309
|
(#1142) Simplify snap_var implementation
|
2019-11-24 02:18:07 +07:00 |
|
rexim
|
cf99031442
|
(#1142) Full resize snapping
|
2019-11-24 01:57:00 +07:00 |
|
rexim
|
56d7cf63d7
|
(#1142) Bot-left resize snapping
|
2019-11-24 01:51:09 +07:00 |
|
rexim
|
2c306a6afa
|
(#1142) Bottom resize snapping
|
2019-11-24 01:47:36 +07:00 |
|
rexim
|
41e24206d6
|
(#1142) Top-left resize snapping
|
2019-11-24 01:37:20 +07:00 |
|
rexim
|
fefcc8f15f
|
(#1142) Add support for top and left resize snapping
|
2019-11-24 01:32:47 +07:00 |
|
rexim
|
8a286776bb
|
(#1142) introduce snap_var
|
2019-11-24 01:02:20 +07:00 |
|
rexim
|
1d60d2764a
|
Remove TODO(#955)
|
2019-11-24 00:47:19 +07:00 |
|
rexim
|
8425f2776c
|
Remove TODO(#1129)
|
2019-11-24 00:47:19 +07:00 |
|
rexim
|
62af7a7825
|
(#1144) Make the snapping threshold depending the camera zoom level
|
2019-11-24 00:25:56 +07:00 |
|
rexim
|
23e0a578a8
|
(#1144) Compress the rect snapping logic
|
2019-11-24 00:10:55 +07:00 |
|
Alexey Kutepov
|
047f2cbb95
|
Merge pull request #1146 from kolumb/398a
(#398) Add blank credits screen
|
2019-11-23 23:54:35 +07:00 |
|
rexim
|
a6589c3da4
|
Add TODO(#1150)
|
2019-11-23 23:46:12 +07:00 |
|
gooddoog
|
12f7b2f38f
|
(#1148) Disable pause mode after reloading the level
|
2019-11-22 16:11:06 +03:00 |
|
Danil Kolumbet
|
621fe18b8e
|
add missing eol
|
2019-11-22 01:08:24 +02:00 |
|
Danil Kolumbet
|
40e4942bc8
|
add missing eol
|
2019-11-22 01:06:53 +02:00 |
|
Danil Kolumbet
|
d7b8be2808
|
add blank credits screen
|
2019-11-22 00:45:11 +02:00 |
|
rexim
|
b253710948
|
Add TODO(#1145)
|
2019-11-20 20:56:07 +07:00 |
|
rexim
|
680b09ca1e
|
(#946) Reorder snapping conditions
|
2019-11-20 05:35:05 +07:00 |
|
rexim
|
dd8a3fdcf5
|
(#946) Merge snapping conditions
|
2019-11-20 05:29:03 +07:00 |
|
rexim
|
7e3c12d6a4
|
(#946) Inline snap_rect
|
2019-11-20 05:17:39 +07:00 |
|
rexim
|
e6ea5d9d47
|
(#946) Get rid of the loop in snap_rect()
|
2019-11-20 05:14:20 +07:00 |
|
rexim
|
3736169b07
|
(#946) Fix typo
https://github.com/tsoding/nothing/pull/1138#discussion_r347156224
@sebsu Thank you so much!
|
2019-11-20 05:09:03 +07:00 |
|
rexim
|
daf7e5ec74
|
Add TODO(#1142)
|
2019-11-18 03:02:34 +07:00 |
|
rexim
|
1bfb0dae31
|
Add TODO(#1141)
|
2019-11-18 03:02:33 +07:00 |
|
rexim
|
53c522dac2
|
Add TODO(#1140)
|
2019-11-18 03:02:32 +07:00 |
|
rexim
|
7fd4ec0329
|
Add TODO(#1139)
|
2019-11-18 03:02:31 +07:00 |
|
rexim
|
b4ef3cf733
|
(#946) Additional work
|
2019-11-18 02:59:12 +07:00 |
|
rexim
|
50dbca3f11
|
(#946) Reimplement rect snapping
|
2019-11-18 02:59:12 +07:00 |
|
rexim
|
625395e9b1
|
(#946) Fix assertion on moving a single rect
|
2019-11-18 02:59:12 +07:00 |
|
rexim
|
61d3b79888
|
(#946) Initial snapping implementation
|
2019-11-18 02:59:12 +07:00 |
|
rexim
|
ed8790d556
|
(#1136) Don't trigger consolé if any modifiers are pressed
|
2019-11-17 23:53:39 +07:00 |
|
Alexey Kutepov
|
1a477836b2
|
Merge pull request #1134 from tsoding/1129
(#1129) Introduce different cursor styles
|
2019-11-17 02:52:42 +07:00 |
|
rexim
|
c18a797b34
|
(#1129) Fix compilation on WindowsXP
|
2019-11-17 01:22:54 +07:00 |
|
rexim
|
29605eb925
|
(#1129) Introduce cursor icon pivot
|
2019-11-17 01:20:59 +07:00 |
|
rexim
|
d23f221a03
|
(#1129) Remove redundant debug logging
|
2019-11-17 01:09:05 +07:00 |
|
rexim
|
9ed6542090
|
(#1129) Make Rect Layer use Cursor entity
|
2019-11-17 01:07:19 +07:00 |
|
rexim
|
ec3643662e
|
(#1129) Remove dependency on Game from Rect Layer
|
2019-11-17 00:02:14 +07:00 |
|
rexim
|
a25ef723f9
|
(#1129) Extract Cursor entity
|
2019-11-16 23:57:16 +07:00 |
|
rexim
|
f15f066c1b
|
(#1129) Change cursor style on rect layer resize
|
2019-11-16 23:20:39 +07:00 |
Rafael Froeschlin Filho
|
d82471a967
|
Fix closing the game without audio
|
2019-11-11 16:59:43 -03:00 |
|
rexim
|
dc11d08618
|
(#1129) Introduce different cursor styles
|
2019-11-11 02:49:40 +07:00 |
|
Alexey Kutepov
|
bd267a5639
|
Merge pull request #1128 from tsoding/955
(#955) Improved rect layer resizing
|
2019-11-11 02:48:17 +07:00 |
|
rexim
|
04fb545803
|
Add TODO(#1129)
|
2019-11-11 01:47:00 +07:00 |
|
rexim
|
457bb753c9
|
(#955) Map selection overlay to screen
|
2019-11-11 01:41:18 +07:00 |
|
rexim
|
4343183dc2
|
(#955) implement secondary diagonal resizing
|
2019-11-11 01:35:54 +07:00 |
|
rexim
|
c786db12ab
|
(#955) Add supports for major corners
|
2019-11-11 01:19:00 +07:00 |