Commit Graph

321 Commits

Author SHA1 Message Date
d638108223 Remove redundant functions from blocks.cpp, fix editor problem with pagination 2021-07-24 19:59:25 +02:00
3be728843a Refactor to use objects for terrain/mod creation, added coin modifier 2021-07-23 00:08:05 +02:00
79d9f266b4 SDLPP: add function to change texture while keeping SRC rect 2021-07-23 00:05:40 +02:00
0e71dfa7d5 SDLPP: make text change only happen in render() 2021-07-23 00:05:13 +02:00
76f5c43197 Mod texture image 2021-06-24 20:54:18 +02:00
2617156833 Mod texture 2021-06-24 20:53:58 +02:00
b423ac7b8c Mario: add option to make a block collision-less 2021-06-21 19:40:29 +02:00
a54d079fd2 Mario: add MapObject and use that instead of tuples 2021-06-07 23:48:28 +02:00
76f55fd98c Mario Editor: fix highlighting 2021-06-04 14:49:24 +02:00
301c4f3142 Mario Editor: initialize empty map with correct column size 2021-06-04 14:39:23 +02:00
0475f4967b Mario Editor: smaller block size 2021-06-01 10:18:33 +02:00
243c1d9d04 Mario: add a dictionary of flags for each block 2021-05-31 18:54:59 +02:00
af3954cb61 Mario: merge mapLoader functions into one 2021-05-31 18:54:43 +02:00
0b3689b0ae SDLPP: add option to remove collisions 2021-05-31 18:54:17 +02:00
78c9b9feb0 Mario: fix function name 2021-05-31 17:28:26 +02:00
57a573783d Mario Editor: change function name 2021-05-31 16:10:19 +02:00
2b405c5d31 Mario Editor: change edit boxes' indexing to 1-based
As the left map arrow is on position 0 * BLOCK_SIZE and the first edit
box is on position 1 * BLOCK_SIZE, indexing them from 1 causes slightly
more readable code
2021-05-31 16:08:14 +02:00
26cbdd0f8e Mario: add block's land type when creating block 2021-05-31 16:07:55 +02:00
808f392119 Mario: silence some warnings 2021-05-31 14:30:28 +02:00
5d20757d43 Mario Editor: formatting 2021-05-31 14:04:28 +02:00
cd0a301e52 Mario Editor: add land type switching 2021-05-31 14:03:11 +02:00
af94cc0e03 SDLPP: add option to get SRC rect of texture 2021-05-31 14:01:11 +02:00
3bef592cb1 Mario Editor: formatting 2021-05-29 19:24:47 +02:00
58974f8a7e Mario Editor: add tool highlighting + WSAD controls 2021-05-29 19:17:45 +02:00
3cb36fe180 Mario Editor: add tool populating function 2021-05-29 13:21:01 +02:00
5b8c0f88bb Mario Editor: turn grid/arrow creation into a function 2021-05-29 11:38:45 +02:00
a55a9142af Mario: slight editor UI update 2021-05-28 20:00:15 +02:00
be638591c8 Mario: remove debug outputs from editor 2021-05-28 19:53:30 +02:00
9d9068091b Mario: slightly better editor UI 2021-05-28 19:51:02 +02:00
af3588501a Mario: reflect fixed sdlpp collisions 2021-05-27 18:09:58 +02:00
db338fd544 SDLPP colidesWith: only add id once
Before this change collision id was added for every collision it was a
part of, but we only want that id once (the collider collided, that's all
that matters)
2021-05-27 18:08:48 +02:00
757a03568d Mario: Fix bug of being teleported after landing from jump
In rare cases Mario was teleported when landing from a high jump as a
visitor could've been fired in the wrong moment (before Mario's Y was
reset to be standing on the ground) and left/right detect would trigger
and teleport mario 1 block away
2021-05-27 16:57:21 +02:00
b8c56c06fd Mario: better side collision handling 2021-05-27 16:33:00 +02:00
6e61eb03b9 Mario: check before bouncing 2021-05-26 18:24:09 +02:00
734b0b58cb Mario: fix floor detect and top movement helper 2021-05-26 17:48:33 +02:00
d2bc497070 Mario: set mario pointer when loading map for editor 2021-05-26 14:18:39 +02:00
19c29b261c Windows compatibility fixes 2021-05-26 14:17:07 +02:00
49bceafe0b Mario: fix bounce return position 2021-05-26 09:29:12 +02:00
55f88a547c Mario: completely remove dynamic sdlpp 2021-05-26 09:28:59 +02:00
c2fb78b0a6 Mario: added destructible modifier to editor 2021-05-26 00:46:19 +02:00
6fe283bb34 Mario: add bouncing 2021-05-25 22:05:50 +02:00
0c4f2482c7 SDLPP: Allow changing coliders' position
Requires `updateSizeAndPosition` to be run on the parent container
2021-05-25 22:05:00 +02:00
79d5f348c4 SDLPP: allow using shared pointers when adding collisions 2021-05-25 22:04:38 +02:00
bd8a841e6f Don't updateSizeAndPosition on setPos as it might change texture and that isn't threadsafe 2021-05-25 20:21:26 +02:00
670d5b7c1b Mario: added fps counter 2021-05-25 20:21:02 +02:00
cc6f3f838b Updated gitignore 2021-05-25 16:35:46 +02:00
91df7c3f63 Mario: use .a library instead of dynamic 2021-05-25 16:34:44 +02:00
df61983f55 SDLPP: add .a library target 2021-05-25 16:34:21 +02:00
f0df1cc3b2 Mario: remove destructible used for testing 2021-05-25 12:27:26 +02:00
7ed8b0f4e1 Mario: destroy blocks 1 at a time, if jumping and would hit only with small side, move Mario a bit so the jump is successful 2021-05-25 12:26:04 +02:00