lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
6822 commits 1 branch 29 tags 122 MiB
Commit graph

6822 commits

This branch
This branch
All branches
Author SHA1 Message Date
toaster 8c035ecb86 Merge branch 'lightning_polys' into 'master' 
Lightning Polys

See merge request STJr/SRB2Internal!294
 2019-09-08 19:04:56 -04:00
toaster 0392cfc158 Merge branch 'spawnobject-linedef' into 'master' 
Linedef type 461 (Spawn Object)

See merge request STJr/SRB2Internal!304
 2019-09-08 18:58:50 -04:00
Steel Titanium 1bf78a2423
Move mobj_t declaration to top of the block 2019-09-08 17:14:47 -04:00
Monster Iestyn c696063260 Merge branch 'mprelated-tweaks' into 'master' 
Various improvements and changes to multiplayer menu

See merge request STJr/SRB2Internal!300
 2019-09-08 16:45:14 -04:00
toaster 9041a399c6 Merge branch 'nightsattackfixes' into 'master' 
NiGHTS attack fixes

Closes #205

See merge request STJr/SRB2Internal!319
 2019-09-08 16:42:45 -04:00
toaster e03d03110b Merge branch 'ending-star' into 'master' 
Endings: Fireworks fallback graphics.

See merge request STJr/SRB2Internal!296
 2019-09-08 16:28:52 -04:00
toaster ba50a03d9c Update SPR2_XTRA references for adjusted player.dta content. 2019-09-08 21:28:12 +01:00
toaster 6815748a3e Merge branch 'flippost' into 'master' 
Flippost

Closes #206 and #191

See merge request STJr/SRB2Internal!320
 2019-09-08 16:24:58 -04:00
toaster 11e3f5ec96 Change flipped starpostz to define the top of the player object, for cases where scale on contact with starpost is different to spawn scale. 2019-09-08 21:21:36 +01:00
toaster 0ed589449a Merge branch 'newegg' into 'master' 
Newegg dot blag

See merge request STJr/SRB2Internal!305
 2019-09-08 16:11:50 -04:00
mazmazz b7c9f15225 Fix NiGHTS attack menu not drawing correct background 2019-09-07 22:00:38 -04:00
toaster d26ff197dc * 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
toaster 5d85e82fa6 Fix detection of GRADE_ constants in SOC. 2019-09-07 20:08:05 +01:00
Monster Iestyn c6af108d8c Merge branch 'musicfixes' into 'master' 
Minor musicplus-related fixes

See merge request STJr/SRB2Internal!310
 2019-09-07 11:45:15 -04:00
Monster Iestyn d998dad2ad Merge branch 'stop-bullying-tails' into 'master' 
Ignore bots when looking for a player

Closes #190

See merge request STJr/SRB2Internal!301
 2019-09-07 11:44:46 -04:00
Monster Iestyn a287b9e317 Merge branch 'fix_skipintro' into 'master' 
Fix -skipintro in OpenGL

See merge request STJr/SRB2Internal!308
 2019-09-07 11:44:09 -04:00
Monster Iestyn 52a4b77f83 Merge branch 'devmode-toggletwod' into 'master' 
DEVMODE: 2D toggle command

See merge request STJr/SRB2Internal!309
 2019-09-07 11:43:01 -04:00
toaster 92b77c987b Fix compilation warning for Match penalty string. (Egads, straight into master! Shock! Horror!) 2019-09-07 12:10:50 +01:00
toaster cf4b5a1b9d * Comment out the notices that the two types of music are disabled (see issue #179; not a perfect fix, but good enough for now). 2019-09-07 11:49:13 +01:00
toaster 54b89eefbb * Fix jingle captions dying immediately (caused by an S_StopMusic call in P_PlayJingle; resolved by modifying order of operations). 2019-09-07 11:48:58 +01:00
Steel Titanium bc52bc83cc
2D toggle command 2019-09-06 20:51:39 -04:00
Jaime Passos de4a609421 Merge remote-tracking branch 'origin/master' into fix_skipintro 2019-09-06 16:08:18 -03:00
Monster Iestyn 4c39225c3e Merge branch 'public_next' 2019-09-03 19:07:57 +01:00
Jaime Passos 6b151ef4ea Merge remote-tracking branch 'origin/master' into fix_skipintro 2019-09-02 23:36:15 -03:00
toaster fe99c64511 Give the Spectator Eggrobos the ability to move left and right relative to their angle, with initial direction depending on MTF_OBJECTSPECIAL/MTF_AMBUSH flag presence. (May need more tweaking before putting in CEZ3) 2019-09-01 11:43:30 +01:00
toaster 6a9da63d7f Motor's new Eggman sprites, along with some other sweet bits of boss polish. What else can I say? Just play it. 2019-08-30 19:19:54 +01:00
Monster Iestyn 602154fe8b Merge branch 'ring-penalty-graphic' into 'master' 
Weapon ammo penalty indicator

See merge request STJr/SRB2Internal!297
 2019-08-30 13:28:05 -04:00
Steel Titanium 8167a88bec
Rename private mode to unlisted mode 2019-08-30 00:38:58 -04:00
Steel Titanium 5c295d285b
Capitalize the 'if' 2019-08-30 00:36:10 -04:00
Steel Titanium 10ea0f21ae
Fix spawning within random range 2019-08-29 23:56:15 -04:00
Alam Ed Arias 028996915d Merge branch 'master' into next 2019-08-29 19:28:02 -04:00
Alam Ed Arias dadec1196b Warn on implicit fallthrough 2019-08-29 19:27:52 -04:00
Steel Titanium 8655b8f1f1
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
Steel Titanium 1040a93a6e
Ignore bots when looking for a player 2019-08-28 23:12:25 -04:00
Steel Titanium 7ccff2e6e3
Merge branch 'master' into mprelated-tweaks 2019-08-28 22:26:52 -04:00
Steel Titanium 7e47117afa
Add warning message when attempting to use the master server browser while modifiedgame is true. 2019-08-28 20:24:30 -04:00
Steel Titanium 121d8b7838 Merge branch 'abpolish' into 'master' 
Autobrake polish

Closes #176

See merge request STJr/SRB2Internal!293
 2019-08-28 00:34:21 -04:00
Steel Titanium b4d8126675
Rename offline mode to private mode 2019-08-27 18:05:30 -04:00
Steel Titanium a98862b3ed
Allow letters to be used on ipv4 address field 2019-08-26 22:00:07 -04:00
Steel Titanium b2712af2d0
Reorder the main multiplayer menu 2019-08-26 21:49:12 -04:00
Steel Titanium 1416312200
Move some cvars out of D_ClientServerInit and save them 
Ported over from Kart
 2019-08-26 20:38:32 -04:00
James R 89c4989987 Show a negative number to indicate ammo penalty 2019-08-26 16:07:17 -07:00
Monster Iestyn ab90526541 Merge branch 'candamagefix' into 'master' 
P_PlayerCanDamage fix

See merge request STJr/SRB2Internal!291
 2019-08-26 11:32:10 -04:00
Monster Iestyn db3a2e02a5 Modify defaults for smpstage_start and smpstage_end to 60 and 66 respectively 2019-08-25 22:24:08 +01:00
Monster Iestyn d1105abdb3 Merge branch 'public_next' 
# Conflicts:
#	src/d_netfil.c
 2019-08-25 18:18:59 +01:00
Monster Iestyn 964693d542 Merge branch 'master' into next 2019-08-24 23:28:38 +01:00
Steel Titanium fbec4af086
Fallback graphic for firework display, if the character lacks one. 2019-08-24 17:17:55 -04:00
Monster Iestyn 7a199748b9 Merge branch 'based-files' into 'master' 
Compare the file name only for real

See merge request STJr/SRB2!511
 2019-08-24 15:51:11 -04:00
Monster Iestyn 7090413417 Merge branch 'calling-all-lua-consvars' into 'next' 
Calling all Lua consvars

See merge request STJr/SRB2!509
 2019-08-24 15:50:43 -04:00
James R e5071bb605 Compare the file name only for real 
CL_SendRequestFile prepends the path for each file.
 2019-08-23 11:00:05 -07:00