TehRealSalt
c6566ec31a
Merge branch 'master' into versus-record
2019-10-03 01:32:59 -04:00
Sal
8338d3e71c
Merge branch 'fortnite' into 'master'
...
Battle sudden death
See merge request KartKrew/Kart!166
2019-10-03 01:27:09 -04:00
Sal
eb7f662654
Merge branch 'genesis-wipe' into 'master'
...
Genesis-style wipes
See merge request KartKrew/Kart!164
2019-10-03 01:10:33 -04:00
TehRealSalt
ca83b06d93
Fuckhuge restructuring
...
- m_menu.c and m_menu.h are dead. Everything has now been moved to k_menudef.c, k_menufunc.c, k_menudraw.c, and k_menu.h.
- Expanded menu_t and menuitem_t to add transitions and tooltips
- Early character select screen
- Removed almost all menu definitions, I'll be reimporting them as they are needed
2019-10-02 11:31:11 -04:00
Steel Titanium
2c7e53f32f
Merge branch 'master' into newmenus
2019-10-01 16:52:31 -04:00
Jaime Passos
41ff5ef79c
sprite2info soc yummy yummy yes
2019-09-29 19:03:10 -03:00
Jaime Passos
dfe05a650c
hehee
2019-09-29 12:13:51 -03:00
TehRealSalt
bb809d2d2a
Merge branch 'master' into new-menus
2019-09-29 06:57:11 -04:00
Jaime Passos
e2ce3988fb
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-09-28 12:14:55 -03:00
Jaime Passos
e95bd8add3
Merge remote-tracking branch 'origin/master' into renderswitch
2019-09-27 22:53:57 -03:00
TehRealSalt
06d27ae36e
Merge branch 'master' into fortnite
2019-09-27 06:36:11 -04:00
TehRealSalt
22796b7633
Merge master
2019-09-27 03:44:37 -04:00
TehRealSalt
9cb834b004
Capsule counter, map change when spawning capsules mid-game
2019-09-24 11:24:01 -04:00
TehRealSalt
e84c618da8
Rudimentary Record Attack support
2019-09-24 07:17:05 -04:00
TehRealSalt
38bb44e732
Separate into k_pwrlv.c, add defines to reduce amount of magic numbers
2019-09-23 08:26:42 -04:00
TehRealSalt
b8a752e40a
Merge master
2019-09-18 21:47:11 -04:00
TehRealSalt
47da526313
Use texture names instead of predesignated sky numbers
2019-09-18 19:29:28 -04:00
toaster
eb315d3662
Properly scrub the player struct clean between level transitions. (Good chance this fixes our new bug where the player gets stuck in their standing pose when the map begins..?)
2019-09-18 16:06:13 +01:00
Nev3r
2b0a0dd90f
Merge branch 'deathstuff' into 'master'
...
Lots of death stuff
Closes #207
See merge request STJr/SRB2Internal!306
2019-09-16 16:32:45 -04:00
TehRealSalt
1ef09699d1
Functional gameplay
...
- Capsules get spawned in the proper scenarios
- Level ends when all capsules are busted
- Time gets used on the leaderboard instead of score
Also split a handful of Battle code into k_battle.c. Lots of other code could probably get moved here later
2019-09-15 20:19:48 -04:00
Jaime Passos
0d11dd516a
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c
2019-09-15 16:24:24 -03:00
Jaime Passos
9b5a7309bd
Merge remote-tracking branch 'origin/master' into newmenus
2019-09-11 22:17:42 -03:00
toaster
22f7fd904f
Merge branch 'musicplus-resetmusic-followup' into 'master'
...
Follow-up fixes for reset-upon-dying music
See merge request STJr/SRB2Internal!284
2019-09-11 14:14:09 -04:00
toaster
840eecbb02
Fix an issue where completing a stage normally would not correctly set startrings for the next one (as opposed to warping directly or dying inside it).
2019-09-11 14:25:22 +01:00
Jaime Passos
ce8b821691
Merge remote-tracking branch 'jimita/renderswitch' into renderswitch
2019-09-10 18:12:01 -03:00
Jaime Passos
53568ba62f
Better fades
2019-09-09 23:31:48 -03:00
Jaime Passos
fe737c33f6
Comments
2019-09-09 19:27:08 -03:00
Latapostrophe
0505a6f0cc
fix rewind, fix sound local sound playing in freecam
2019-09-09 22:15:50 +02:00
Jaime Passos
371e160940
I am the CEO of renderers
2019-09-09 16:20:17 -03:00
Nev3r
8286f55e8e
Revert "Merge branch 'flats-png_port' into 'master'"
...
This reverts merge request !322
2019-09-09 18:40:21 +00:00
Jaime Passos
2574914843
Merge remote-tracking branch 'origin/master' into flats-png_port
2019-09-09 14:12:28 -03:00
Jaime Passos
11077c2bac
still making things better
2019-09-08 21:37:24 -03:00
Jaime Passos
1cb22d5e6b
initial stuff
2019-09-08 18:44:40 -03:00
Jaime Passos
398b320aec
initial stuff
2019-09-08 18:27:35 -03:00
Jaime Passos
b28af03b1c
Merge remote-tracking branch 'jimita/flats-png' into flats-png_port
2019-09-06 19:20:45 -03:00
Jaime Passos
0d4225d60e
Sprite2 support but I'm not a dumbass
2019-09-03 18:27:22 -03:00
Steel Titanium
9fcf7695c0
Add spawn object linedef special.
...
Note that spawning a object within a random range does not fully work yet and crashes the game
2019-08-29 01:57:58 -04:00
Jaime Passos
402012e973
I
2019-08-18 14:16:48 -03:00
Steel Titanium
6b16560832
Merge branch 'master' into newmenus
2019-08-14 22:51:06 -04:00
TehRealSalt
71f35c7f5b
Add encore_towhite
2019-08-10 02:07:18 -04:00
TehRealSalt
5da84b78a2
Encore wiggle
2019-08-10 01:59:23 -04:00
TehRealSalt
aad0dbd076
Encore invert fade
2019-08-10 00:54:16 -04:00
TehRealSalt
36e4f25cc9
Uses pre-defined colormap lumps now
...
Works much faster now. I'd like to clean up this code some though
2019-08-07 02:21:04 -04:00
mazmazz
2c7eb91460
* Added FORCERESETMUSIC level header
...
* cv_resetmusicbyheader toggle to disable said override
* Never reset music during time attack
* Change cv_resetmusic default back to off
2019-08-04 20:02:38 -04:00
toaster
9cdeee5b84
Merge branch 'revert_revert_musicplus' into 'master'
...
Revert "Revert MusicPlus"
See merge request STJr/SRB2Internal!282
2019-08-04 13:58:01 -04:00
Steel Titanium
933f249d96
More menu stuff
2019-08-04 13:26:25 -04:00
Steel Titanium
7dfe696819
Last min changes
2019-08-04 11:34:55 -04:00
toaster
534b98251b
Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'""
...
This reverts commit a76668f55a
2019-08-04 12:03:57 +01:00
toaster
a76668f55a
Revert "Merge branch 'musicplus-aug2019-b' into 'master'"
...
This reverts commit 0f89fb123f8fb211d8cf
2019-08-04 11:32:55 +01:00
mazmazz
8a637168f4
Merge branch 'musicplus-feature-postboss' into musicplus-aug2019-b
2019-08-04 03:22:36 -04:00
