TehRealSalt
e7d0fde5fd
Merge branch 'master' into sal-waypoints
2019-10-15 21:34:41 -04:00
TehRealSalt
d1c20c2a5a
Don't allow finish lines to be hit multiple times per tic
2019-10-15 21:30:23 -04:00
TehRealSalt
64a3d133b4
Cleanup & bug-fixin
2019-10-15 20:56:28 -04:00
Jaime Passos
09c9714daf
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c
2019-10-06 17:40:41 -03:00
James R
fa09c0420f
Custom gamedata parameter
2019-10-05 13:15:36 -07:00
TehRealSalt
32bdd10dbf
Cup definitions, updated menu to use them
2019-10-04 22:44:19 -04:00
TehRealSalt
2324282569
Merge master
2019-10-03 12:16:24 -04:00
TehRealSalt
d10e4aebac
Fix a few messups due to the merged cvars
2019-10-03 11:22:58 -04:00
TehRealSalt
a5ea6a9799
Merge speed/encore scrambles into the normal cvars as an "auto" option
2019-10-03 01:48:16 -04:00
TehRealSalt
c6566ec31a
Merge branch 'master' into versus-record
2019-10-03 01:32:59 -04:00
TehRealSalt
dae7dd003a
More complete character select
2019-10-02 19:13:56 -04:00
TehRealSalt
7433becd7a
Move map loaded failure error from the deleted backwards compat code
2019-10-02 12:07:37 -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
lachwright
52e7ae5322
Allow camera movement while climbing; allow sliding while landing from a glide
2019-09-30 14:38:58 +08:00
TehRealSalt
bb809d2d2a
Merge branch 'master' into new-menus
2019-09-29 06:57:11 -04:00
TehRealSalt
bc3f0568ee
Merge master
2019-09-27 23:09:54 -04:00
TehRealSalt
d907158b12
Revert this
2019-09-27 15:12:55 -04: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
Sal
a313e4c33e
Merge branch 'world-tour' into 'master'
...
Flush random map pool after all but 3 are played
See merge request KartKrew/Kart!170
2019-09-27 03:07:04 -04:00
Lachlan Wright
319cf62980
Hopefully added the newline back?
2019-09-25 05:06:04 -04:00
lachwright
67aa0cd2f6
removed outdated comment
2019-09-25 03:16:04 +08:00
lachwright
63c0c21d8e
Trigonometric input capping
2019-09-25 03:12:56 +08: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
53848bd5fa
commit throwdir fix
...
I did a bunch of other demo-related cleanup in this branch so I'm throwing it in here too
2019-09-23 08:51:49 -04:00
TehRealSalt
9072f233eb
Remove a few more magic numbers
2019-09-23 08:31:36 -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
77aeb4663b
Merge branch 'master' into versus-record
2019-09-23 07:03:56 -04:00
TehRealSalt
932f8a1f61
Update demos to save power levels
2019-09-23 07:03:00 -04:00
TehRealSalt
b8a752e40a
Merge master
2019-09-18 21:47:11 -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
toaster
ccc1144a27
Merge branch 'luabanks' into 'master'
...
Lua save-banks!
See merge request STJr/SRB2Internal!295
2019-09-16 07:56:49 -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
TehRealSalt
97b09ba9c1
Grease part 2
2019-09-12 14:23:45 -04:00
TehRealSalt
d3f1b4f82c
Greased horizontals
2019-09-12 02:01:30 -04:00
Latapostrophe
cf9385c307
forgot to reset variables on demo stop
2019-09-11 21:30:11 +02: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
1695e4102f
Tweak gameovertics slightly to avoid having no sound for too long.
2019-09-11 13:30:24 +01:00
Latapostrophe
0599d23254
get replays to save player lua vars
2019-09-10 11:59:17 +02:00
Latapostrophe
0505a6f0cc
fix rewind, fix sound local sound playing in freecam
2019-09-09 22:15:50 +02:00
Alam Ed Arias
8a69d97a12
Be clear on what FALLTHRU we really want
2019-09-09 15:02:13 -04:00
toaster
41727318ff
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff
2019-09-09 15:25:48 +01:00
toaster
8acf86cf10
Extend gameovertics again by two seconds.
2019-09-08 18:03:51 +01:00
toaster
09f7dc1350
* Store gravflip ( resolves #206 ) and destscale in starposts. (Using the same field, taking advantage of the fact that object scale will always be positive!)
...
* Update the function signature of P_MixUp to accomodate both it and drawangle instead of doing it outside of the function.
* If the player is spawning from the start of the stage and it's from the ceiling, be in fall frames as requested (resolves #191 ).
2019-09-07 22:12:47 +01:00
Latapostrophe
1d66d8e213
replay freecam + enhancements
2019-09-05 23:24:23 +02:00
toaster
ffec691023
Bunch of fixes for dying in MP special stages.
...
* Don't allow the stage to be reloaded in G_DoReborn.
* If you do ANY spawn after the very beginning moment, you're forced to be a spectator.
* Have the "%d player%s remaining" Co-op exiting count visible at the same time as spectator controls.
2019-09-04 15:51:14 +01:00
Jaime Passos
4304c34679
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b
2019-09-02 23:35:36 -03:00
