Sally Coolatta
|
63917ffccc
|
The start of the scary 2.2 merge
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
|
2020-05-29 13:43:38 -04:00 |
|
SwitchKaze
|
afe56667b8
|
Update to 2.2.4
|
2020-05-22 16:47:51 -05:00 |
|
Sally Coolatta
|
bdb871325f
|
Merge remote-tracking branch 'public/next'
|
2020-05-16 00:05:55 -04:00 |
|
Sal
|
135c9598a8
|
Merge branch 'hud-is-fucked' into 'next'
HUD inconsistency in Record Attack
See merge request KartKrew/Kart-Public!164
|
2020-05-15 19:26:26 -04:00 |
|
sphere
|
4d9d125a99
|
Fix some errors and add some comments. Also, actnum is not an INT32.
|
2020-05-12 17:20:28 +02:00 |
|
sphere
|
21130dfbb0
|
Support act numbers up to 99 and draw both digits individually.
|
2020-05-12 17:17:24 +02:00 |
|
Sally Coolatta
|
15d18640de
|
Merge remote-tracking branch 'public/master' into merge-12
|
2020-05-12 03:16:14 -04:00 |
|
Zwip-Zwap Zapony
|
cb9d0a2fbe
|
Fix splitscreen Title Card act name regression
This fixes act names not being shown on player 2's view
|
2020-05-11 19:57:20 +02:00 |
|
Latapostrophe
|
6bf117300b
|
Add back viewpoint names & fix console inputs in replays
|
2020-04-30 15:50:30 +02:00 |
|
Wolfy
|
5e4ec61d82
|
Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix
# Conflicts:
# src/hardware/hw_cache.c
# src/hardware/hw_draw.c
# src/hardware/hw_glob.h
# src/hardware/hw_main.c
# src/r_bsp.h
# src/r_data.c
|
2020-04-11 23:47:25 -05:00 |
|
James R
|
71f4433b98
|
Merge branch 'dye' into 'next'
Expose colorization to mappers and SOC
See merge request STJr/SRB2!679
|
2020-04-09 19:50:32 -04:00 |
|
James R
|
61be09e6bf
|
Merge remote-tracking branch 'origin/master' into gifs-port
|
2020-03-28 21:00:39 -07:00 |
|
Jimita the Cat
|
60624edc1a
|
Add support for flashpals in screenshots
(cherry picked from commit e765b9400cf741eb8aaa72768ef677769ee5c12b)
|
2020-03-23 16:54:17 -07:00 |
|
James R
|
abcba53781
|
Merge remote-tracking branch 'origin/master' into parties
|
2020-03-22 18:28:07 -07:00 |
|
James R
|
cbd4693de7
|
Merge remote-tracking branch 'origin/master' into parties
|
2020-03-22 14:34:29 -07:00 |
|
Sally Cochenour
|
b1ec5654bc
|
Merge branch 'master' into targets
|
2020-03-22 14:31:17 -04:00 |
|
Sryder
|
da2f1fc972
|
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
# Conflicts:
# src/k_kart.c
|
2020-03-21 23:27:55 +00:00 |
|
James R
|
fd1cb69a87
|
Merge remote-tracking branch 'origin/master' into parties
|
2020-03-21 12:45:23 -07:00 |
|
Louis-Antoine
|
46df2b9551
|
Use HAVE_BLUA as fuel for my fireplace
|
2020-03-19 18:36:14 +01:00 |
|
Sryder
|
c268313f0a
|
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
# Conflicts:
# src/Makefile
# src/k_kart.c
# src/p_map.c
# src/p_setup.c
# src/p_spec.c
|
2020-03-16 00:13:42 +00:00 |
|
Latapostrophe
|
1f5bbb2c3d
|
Merge branch 'push-more-lua' into awful-mix
|
2020-03-11 07:37:47 +01:00 |
|
Latapostrophe
|
f98a74638f
|
More explicit var names for countdown and countdown2
|
2020-03-11 07:37:33 +01:00 |
|
Sally Cochenour
|
3633dc341a
|
Merge branch 'master' into targets
|
2020-03-01 15:42:49 -05:00 |
|
James R
|
4f40edaf01
|
Maybe localdisplayplayers is a bad idea
|
2020-02-23 23:21:20 -08:00 |
|
James R
|
f164320c88
|
Make the order of displayplayers irrelevant and split splitscreen into splitscreen and r_splitscreen
|
2020-02-23 23:20:20 -08:00 |
|
SwitchKaze
|
99a1840101
|
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
|
2020-02-23 11:50:13 -05:00 |
|
James Hale
|
51137837c4
|
Custom skincolors
|
2020-02-21 21:56:39 -05:00 |
|
Steel Titanium
|
fc042e90f0
|
Merge branch 'master' into next
|
2020-02-21 21:01:29 -05:00 |
|
James R
|
2274129f57
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
Tatsuru
|
5b240e4119
|
Merge branch 'coloredtitlecard' into Tatsuru/SRB2-dye
|
2020-02-19 17:47:13 -03:00 |
|
James R
|
ba9f866acf
|
Merge branch 'exitmove-tweaks' into 'next'
Exitmove tweaks
See merge request STJr/SRB2!709
|
2020-02-18 21:58:18 -05:00 |
|
fickleheart
|
0de2068b88
|
More fixes for titlecard option stuff
|
2020-02-09 17:53:50 -06:00 |
|
Jaime Passos
|
cfafdf7bed
|
Fix title card not showing up at all if focus lost
|
2020-01-26 23:50:36 -03:00 |
|
Tatsuru
|
2d7d8fc1b1
|
HUD visual indicator + property fix
|
2020-01-19 21:55:08 -03:00 |
|
Tatsuru
|
b37fc4573a
|
No more losing lives when finished
|
2020-01-19 14:30:05 -03:00 |
|
toaster
|
8926b8b324
|
Fix snapping of extra multiplayer text. (Resolves #101)
|
2020-01-10 12:50:58 +00:00 |
|
fickleheart
|
067b132eb1
|
Merge remote-tracking branch 'origin/next' into next-newcontrols
|
2020-01-04 09:57:09 -06:00 |
|
Tatsuru
|
c0eff50908
|
I see trees of green
|
2020-01-03 16:39:39 -03:00 |
|
Tatsuru
|
dd6698a958
|
Colored title cards
|
2020-01-03 16:21:08 -03:00 |
|
James R
|
b5d9cf9d06
|
Merge branch 'thiccnames' into 'next'
Allow 6-letter character names to be drawn with the thick font
See merge request STJr/SRB2!618
|
2020-01-01 21:49:13 -05:00 |
|
lachwright
|
5df1de42b5
|
Allow 6-letter character names to be drawn with the thick font
|
2020-01-01 23:49:29 +08:00 |
|
fickleheart
|
77ba835f4f
|
Merge branch 'next' into next-newcontrols
# Conflicts:
# src/g_game.c
# src/p_setup.c
|
2019-12-31 12:58:36 -06:00 |
|
Jaime Passos
|
585db9fe2d
|
Merge remote-tracking branch 'origin/next' into respawndelaygametyperule
|
2019-12-30 18:39:31 -03:00 |
|
James R
|
67ca512120
|
Merge remote-tracking branch 'origin/master' into next
|
2019-12-30 13:16:53 -08:00 |
|
fickleheart
|
e0d09a457e
|
Convert simple movement to directionchar+analog
Analog + no directionchar is old analog (now known as
CS_LMAOGALOG because lmao if you still use it).
|
2019-12-30 15:05:24 -06:00 |
|
Jaime Passos
|
a7fa90d11d
|
Rename GTR_HIDETIME to GTR_STARTCOUNTDOWN.
|
2019-12-28 19:47:03 -03:00 |
|
Jaime Passos
|
7d4c00affb
|
GTR_HIDETIME, not GTR_TAG
|
2019-12-27 18:24:08 -03:00 |
|
Jaime Passos
|
ff80c4ef4d
|
Preparing for the inevitable gametype rule that will handle cooplives...
|
2019-12-27 17:08:20 -03:00 |
|
Jaime Passos
|
58c1adf3ef
|
ST_drawLivesArea stuff.
|
2019-12-27 16:58:55 -03:00 |
|
Jaime Passos
|
be32397562
|
Respawn delay gametype rule
|
2019-12-27 01:44:27 -03:00 |
|