toaster
b3d006b093
structs gunched
2021-04-17 00:27:13 +01:00
Sally Coolatta
1115486689
Fix crashes & off-by-one errors
2021-04-09 23:15:44 -04:00
Sally Coolatta
de1f67b72a
Use strings in the map header for next level, marathon next, thumbnails, minimaps, encoremaps, and tweakmaps
2021-04-09 21:10:46 -04:00
Sally Coolatta
359cf86efb
Merge branch 'master' into big-large-map-markers
2021-04-09 19:49:33 -04:00
Sally Coolatta
420a6ccccb
Fix Dehacked loading
2021-02-28 22:39:47 -05:00
Sally Coolatta
9d7ec0ab8f
Merge SRB2 next
...
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
2021-02-27 05:18:36 -05:00
Sally Coolatta
8289bf252f
Chengi's menu selectors
...
- Menu BG image is defined by menu option
- Menu BG image slides in
- Gamemode menu options are now like Chengi's mockup
2021-01-13 01:16:14 -05:00
Sally Coolatta
2af75a2bd1
Fix merge conflicts
2021-01-11 00:06:34 -05:00
Steel Titanium
4be19a6268
Fix double free occuring when unloading the intermission patches due to the same patch being cached twice
2020-12-07 17:54:08 -05:00
Jaime Ita Passos
490758eac2
Remove SHORT macros for referencing patch width/height/offsets
2020-11-22 20:02:47 -03:00
Sally Coolatta
e6a9e5a68e
Merge branch 'master' into new-menus
2020-11-08 02:49:28 -05:00
James R
8f68a21f2f
Fix many instances of G_BuildMapName
...
Some things are gonna be busted. Fix it later, BYE.
2020-10-31 20:17:12 -07:00
Jaime Passos
b44837324f
Merge branch 'next' into patch-stuff-again-2
2020-10-10 17:01:10 -03:00
Jaime Passos
98c6b54994
Improved memory management for patches
2020-09-07 02:23:07 -03:00
Sally Coolatta
ebec43b727
Fix G_WriteStandings
2020-08-18 05:08:21 -04:00
Sally Coolatta
3a94a2db44
enum for the different face icon types
2020-08-16 03:45:09 -04:00
Sally Coolatta
1500d682d2
hu_stuff & y_inter
2020-08-14 01:06:55 -04:00
Sally Coolatta
6ef0af4ba5
g_game and g_input now compile
2020-08-13 00:05:44 -04:00
Sally Coolatta
f9ca40e673
Merge branch 'master' into the-scary-22-merge
2020-08-12 20:59:09 -04:00
Sally Coolatta
b9436ee015
More fixing up
...
Got tired again, but now it makes it to f_finale
2020-08-11 18:46:00 -04:00
Sally Coolatta
8731c6b7a4
Another round of fixing up
...
- gametyperules are now fitting for kart, not applied to the whole codebase though
- a few more files compile
2020-08-11 16:13:17 -04:00
Sally Coolatta
a50a9a1843
Lots of splitscreen fixes
...
LOTS of stuff I changed to use arrays instead of constantly duplicated code
2020-08-10 23:38:32 -04:00
Sally Coolatta
c96bd5f64a
Many removals
...
Lots of NiGHTS code, lots of ringslinger code, revert actnum behavior back to vanilla
2020-08-10 21:45:51 -04:00
Sally Coolatta
8071ec92e8
InputDown -> PlayerInputDown, JoyAxis -> PlayerJoyAxis
2020-08-10 17:00:45 -04:00
Sally Coolatta
479f843296
Merge y_inter.c/h
2020-08-10 15:14:03 -04:00
James R
0a85046b22
Merge branch 'bt_spin' into 'next'
...
Replace all occurances of BT_USE with BT_SPIN (2.2!)
See merge request STJr/SRB2!982
2020-08-09 21:03:17 -04:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04:00
Sally Coolatta
4f47775d51
Merge y_inter.c/h
2020-08-09 15:47:37 -04:00
James R
9955ff1357
Merge branch 'kill-dos' into 'next'
...
Remove support for DOS
See merge request STJr/SRB2!1090
2020-08-08 21:26:18 -04:00
Jaime Passos
a7f3dd7eff
Refactor patch loading
2020-08-08 05:16:47 -03:00
James R
6a247fb285
Merge branch 'titlecard-clowning' into 'next'
...
Stretch the fallback titlecard to the screen
See merge request STJr/SRB2!1019
2020-07-25 20:21:08 -04:00
Steel Titanium
62c85ea4a5
WIP: Remove support for DOS
...
WIP because I don't know if this wording is right for the error.
2020-07-25 18:55:51 -04:00
GoldenTails
36e1c30e19
Replace all occurances of BT_USE with BT_SPIN (2.3?)
...
I'd use `next-major` but it doesn't exist lol
2020-07-11 21:59:54 -05:00
James R
b301f56358
Add back the int_none check
...
It got removed by 864e7033552cbb966f378cfbaf56aa116c1f97e8 but he forget how it
was before the hook was there. :(
2020-06-25 13:43:07 -07:00
James R
8878dcc023
Remove caching of INTERSCW
2020-06-25 13:09:00 -07:00
James R
45cafe35ab
Just stretch the fallback card to the screen resolution
2020-06-25 13:08:00 -07:00
James R
9e16f3b0dc
Only fill the intermission with blapck if we can't draw patches
...
This fixes an issue where patches cease to be drawn due to Y_UnloadData, but
the screen is still overwritten, causing the next wipe to start from void.
2020-06-25 13:04:03 -07:00
James R
34eeb98cc4
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-06-24 19:31:19 -07:00
SteelT
dbd5198ac2
Merge branch 'marathonmode' into 'next'
...
MARATHON RUN
See merge request STJr/SRB2!941
2020-06-17 19:36:10 -04:00
Sally Coolatta
3e36e15628
Merge master
2020-06-08 00:52:37 -04:00
Sally Coolatta
136bb1d252
Add K_CanChangeRules, and start a "single session" GP when warping to a map in single player
2020-06-06 19:45:13 -04:00
Sally Coolatta
91b0246d99
Merge branch 'master' into grand-pricks
2020-05-31 15:53:31 -04:00
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
Sally Coolatta
5ad6812f17
No modify power level for beating/losing to players with no power level set
...
This mainly is intended for bots, but also applies to splitscreen guests who also probably shouldn't have any power level
2020-05-28 13:42:11 -04:00
Sally Coolatta
20b2dabae9
Merge branch 'pet-robo' into grand-pricks
2020-05-25 12:44:59 -04:00
SwitchKaze
58cac1fd73
Make colors UINT16, increase color freeslots to 1024
2020-05-23 19:35:36 -05:00
toaster
97e261f443
Fix some issues with the tab rankings and end screen that bots exposed.
...
* Laps now have an initial zero instead of being directly indexed from 1, so start counting from there.
* Clean up the circumstances under which LAGLESS! is shown next to a name - specifically removing it from both non-netgames in general, and bots in netgames.
* Fix `(powertype == -1)` being broken on the intermission drawer, which was especially obvious with bots outside of netgames.
2020-05-22 21:27:55 +01:00
Sally Coolatta
0282615c38
Merge branch 'master' into pet-robo
2020-05-18 15:18:37 -04:00
Sally Coolatta
0dd19f4f50
Merge branch 'master' into new-menus
2020-05-16 04:37:44 -04:00
toaster
7c97218284
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into marathonmode
...
# Conflicts:
# src/doomdef.h
2020-05-15 13:23:37 +01:00
