45ac4dad64
Mario: support the new modifier object IDs in maploader
2021-08-08 21:36:47 +02:00
a01b6070f3
Mario: change modifier IDs to start with 0x6000
2021-08-08 21:34:51 +02:00
c183e58f6e
Blocks.cpp: add character support to
2021-08-08 21:22:44 +02:00
c7309d56a3
Editor: add character support
2021-08-08 21:22:00 +02:00
f3c4380bfb
Mario: add enemies textures
2021-08-08 21:19:26 +02:00
4f65dba2e0
Mario: only visit objects if they entered screen at least once
2021-08-07 22:25:32 +02:00
f7002f0f38
Mario: better mushroom movement
2021-08-07 22:17:27 +02:00
a194bfb86e
Mario: destroy moving objects once they leave left side of screen, remove destroyed objects from moving_objects
2021-08-07 22:10:09 +02:00
e283b36229
Mario: set scene's background objects
2021-08-07 21:59:06 +02:00
f35aa095f3
Mario: remove useless debug outputs
2021-08-07 21:43:27 +02:00
f04dc1e23b
Mario: mushroom interaction with Mario
2021-08-07 21:42:51 +02:00
7b2adac922
Mario: add mushroom block
2021-08-07 21:41:15 +02:00
a7aa86c8e3
Mario: simple blocks formatting
2021-08-07 21:39:54 +02:00
4742f3dd02
Mario: add travelToPos function to blocks
2021-08-07 21:39:15 +02:00
7cb3f95e44
Mario: loop through all moving objects in doInput
2021-08-07 21:38:00 +02:00
6238022ed2
Mario: fix modifier deletion
2021-08-07 12:13:23 +02:00
d4393ef179
Mario: better handling of screen resize, when showing FPS consider input handling as well
2021-08-06 18:50:31 +02:00
7d9763443a
Mario: update cmake to include brew libraries
2021-08-05 21:21:25 +02:00
d267402ec5
Make cmake work on windows
2021-08-05 19:16:12 +02:00
8e566ddb03
Mario: add sdlpp as a subdirectory instead of ExternalProject
2021-08-05 18:00:47 +02:00
040b3b63c2
Move to CMake
2021-08-05 00:33:55 +02:00
bfe658618e
Mario: prepartations for multiple moving objects
2021-08-05 00:32:54 +02:00
e67cf508a2
Add coin animation
2021-07-24 20:50:24 +02:00
130a01feda
Forgot to add coineditorblock
2021-07-24 20:48:37 +02:00
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
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
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
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
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
670d5b7c1b
Mario: added fps counter
2021-05-25 20:21:02 +02:00
91df7c3f63
Mario: use .a library instead of dynamic
2021-05-25 16:34:44 +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
b75b44201a
Mario: destructible blocks
2021-05-24 00:07:40 +02:00
bea479bf72
Mario: top collision detection
2021-05-23 23:57:29 +02:00
8672830db8
Mario: jumping sprite + head bump colider
2021-05-23 23:45:45 +02:00
088fb4d15a
Jumping experiment
2021-05-23 23:32:15 +02:00
930875ccf8
Mario: simple jump
2021-05-22 23:54:01 +02:00
d9a88f2de2
Mario: custom mario class
2021-05-22 23:13:26 +02:00
0358aa36c7
Mario: proper position when standing on ground
2021-05-22 22:36:53 +02:00
d04cbea02d
Mario: editor - move all global vars into a single struct
2021-05-22 22:13:22 +02:00
d80ae9a4e2
Mario editor: more refactoring
2021-05-09 20:45:52 +02:00
ede8bbbe8b
Mario Editor: refactoring
2021-05-09 20:21:53 +02:00
83cda5f860
Mario editor: formatting
2021-05-09 00:46:10 +02:00
b54ba5034c
Mario editor: started refactoring
2021-05-09 00:43:53 +02:00
7b4c3c9697
Mario: add Roboto font to git
2021-05-07 23:17:49 +02:00
c849895c72
Mario editor: more terrain, can place Mario
2021-05-07 23:17:05 +02:00
85807ca962
Mario editor: added more terrain blocks
2021-05-07 10:36:45 +02:00
900382bfce
Mario editor: fix tool selection
2021-05-07 10:36:31 +02:00
e084ed6f86
Mario editor: can paginate blocks now
2021-05-07 10:08:41 +02:00
f89d36c177
Mario Editor: Tool selection alpha
2021-05-07 09:43:57 +02:00
c383654349
Mario editor: add + button for columns
2021-05-07 08:49:46 +02:00
7b0f72e273
Mario map: initial map has 18 columns
2021-05-07 08:35:01 +02:00
ad7f737e16
Mario editor: don't delete characters when changing terrain
2021-05-02 14:43:15 +02:00
8b8f3b7f06
Mario editor: switching between blocks
2021-05-02 14:28:17 +02:00
96857a99af
Mario editor: use visitors
2021-05-02 14:14:11 +02:00
61e45e89a5
Basic editor functionality arrived!
...
Terrible code, must be changed!!!
2021-05-01 21:55:43 +02:00
183bd53b66
Mario: saving map as binary file v1.0
2021-04-30 23:12:53 +02:00
d4991ea3a7
Starting Mario Editor project
2021-04-30 21:02:14 +02:00
1927b71629
Preparation for different types of terrain
2021-04-30 09:10:58 +02:00
b52dee267b
Mario: flip texture according to movement direction
2021-04-29 13:08:08 +02:00
b611e2479a
Mario: detect left/right collision
2021-04-29 12:33:31 +02:00
7c38e122d0
Mario: use object alignment
2021-04-27 15:58:01 +02:00
fc1d06a2b8
Added README
2021-04-26 22:21:50 +02:00
0f1e44615c
Mario: include testmap in git
2021-04-26 22:16:53 +02:00
5d03da3131
Mario: remove linux-specific includes
2021-04-26 22:16:25 +02:00
b0b84101a2
Mario: don't let Mario go left
2021-04-26 21:59:21 +02:00
19e66bf34a
Mario: initial commit
2021-04-25 22:42:55 +02:00
