Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improvements to object type support, object versioning #2542

Merged
merged 43 commits into from
Sep 2, 2023
Merged

Improvements to object type support, object versioning #2542

Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
3dcc414
Improvements to object type support
Vankata453 Jul 16, 2023
f5c25d8
PowerUp type support, object versioning
Vankata453 Jul 17, 2023
4f7429c
Merge remote-tracking branch 'origin/master' into object-type-improve…
Vankata453 Jul 17, 2023
d371a63
Only auto-update object, if added in editor
Vankata453 Jul 18, 2023
5d6f24a
Added objects from object select menu are auto-updated
Vankata453 Jul 18, 2023
33687df
Object versioning: Patch notes
Vankata453 Jul 18, 2023
3076f52
Update version on direct object addition and editor placement
Vankata453 Jul 19, 2023
1c323c4
Object types for jumpy, fish swimming and chasing
Vankata453 Jul 19, 2023
1385be1
Use default sprite for default type sprite, bomb types
Vankata453 Jul 19, 2023
f7bb635
Object types for bonus block and switch
Vankata453 Jul 19, 2023
3e2ee11
Object types for unstable tile and weak block
Vankata453 Jul 19, 2023
0393a5a
Object types for more badguys
Vankata453 Jul 20, 2023
8d3df03
Merge remote-tracking branch 'supertux/master' into object-type-impro…
Vankata453 Jul 22, 2023
07e9f82
Fix shadowing a member variable
Vankata453 Jul 22, 2023
51dfaed
Merge remote-tracking branch 'supertux/master' into object-type-impro…
Vankata453 Jul 24, 2023
e3b14ef
Merge remote-tracking branch 'supertux/master' into object-type-impro…
Vankata453 Jul 26, 2023
0a3d4e8
Merge remote-tracking branch 'supertux/master' into object-type-impro…
Vankata453 Jul 26, 2023
6f6ff05
Object type support for more objects
Vankata453 Jul 26, 2023
061af32
Object type fixes
Vankata453 Jul 26, 2023
6dfb4d4
Retro bonus block type changes default coin sprite
Vankata453 Jul 26, 2023
2c2c2cb
Change default type for `WeakBlock`
Vankata453 Jul 26, 2023
de42b36
Fix bugs within laptop iceblock freeze state
Vankata453 Jul 27, 2023
0c629de
Retro powerup types, bonus block support
Vankata453 Aug 2, 2023
3c7d40a
Merge remote-tracking branch 'supertux/master' into object-type-impro…
Vankata453 Aug 4, 2023
69c3e43
Corrupted object type for `LeafShot` and `Jumpy`
Vankata453 Aug 4, 2023
db0d477
Rename and move "coffee" and "herring" `BonusBlock` contents
Vankata453 Aug 4, 2023
3b7832d
Remove object types from Switch
Vankata453 Aug 8, 2023
0f4fca7
Merge branch 'master' into object-type-improvements
Vankata453 Aug 12, 2023
2378fe4
Fix incorrect comment in "fish_harmless.hpp"
Vankata453 Aug 12, 2023
67ef773
`SmartBlock` no longer inherits object types from `MrIceBlock`
Vankata453 Aug 12, 2023
fc3121a
Make `get_types()` a virtual method in `MrIceBlock`
Vankata453 Aug 12, 2023
36f9c16
"retrocompatibility" -> "retro-compatibility"
Vankata453 Aug 12, 2023
db38c40
Merge remote-tracking branch 'supertux/master' into object-type-impro…
Vankata453 Aug 22, 2023
bf30c28
"Fatbat" type for `BouncingSnowball`, freezing
Vankata453 Aug 23, 2023
35c7917
Remove inherited object types from `RustyTrampoline`
Vankata453 Aug 23, 2023
a608a26
Fix squishing frozen `SnowBall` and `SmartBall` with object types
Vankata453 Aug 23, 2023
6618842
Improve `WeakBlock` retrocompatibility code, remove "linked" property
Vankata453 Aug 23, 2023
31ccefe
Move definitions of `GameObject` versioning functions to "game_object…
Vankata453 Aug 23, 2023
c5ef429
Move `SkullTile` functionality into `UnstableTile`, using a type
Vankata453 Aug 24, 2023
e3714d2
Fix freeze/unfreeze behaviour of flat/kicked laptop
Vankata453 Aug 24, 2023
e9c4f93
Stop flat timer in `MrIceBlock::set_state`
Vankata453 Aug 24, 2023
efb0770
Laptop now gradually slows down, when frozen in its KICKED state
Vankata453 Aug 27, 2023
42d28e2
"persistent" -> "present"
Vankata453 Aug 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'supertux/master' into object-type-impro… 
…vements
  • Loading branch information
@Vankata453
Vankata453 committed Jul 26, 2023
commit 0a3d4e8b7f63a8a9143c222ac2c14981081ae8c8

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.