Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry

Snippets Groups Projects

e6eb2e04

Commit e6eb2e04 authored 2 weeks ago by LJ Sonic

Downloads
- Plain Diff

Merge branch 'better-player-states' into 'next'

Allow custom characters to define their own states for standard player animations

See merge request !2395

parents ce25d728 0c40a4b3

Branches

No related tags found

Loading

Checking pipeline status

Changes 12
Pipelines 1

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/f_finale.c 2 additions, 2 deletions

src/f_finale.c
src/p_enemy.c 1 addition, 1 deletion

src/p_enemy.c
src/p_inter.c 4 additions, 4 deletions

src/p_inter.c
src/p_local.h 5 additions, 0 deletions

src/p_local.h
src/p_map.c 2 additions, 2 deletions

src/p_map.c
src/p_mobj.c 77 additions, 71 deletions

src/p_mobj.c
src/p_spec.c 3 additions, 3 deletions

src/p_spec.c
src/p_user.c 100 additions, 82 deletions

src/p_user.c
src/r_skins.c 87 additions, 0 deletions

src/r_skins.c
src/r_skins.h 4 additions, 0 deletions

src/r_skins.h
src/simple_hashmap.h 58 additions, 0 deletions

src/simple_hashmap.h
src/uthash.h 1140 additions, 0 deletions

src/uthash.h

with 1483 additions and 165 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment