stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-01 15:31:13 +00:00
Code Issues Projects Releases Packages Wiki Activity
6196 commits 173 branches 41 tags 356 MiB
Commit graph

6196 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
956b83729b Store extravalue1 (home radius) immediately in A_FlickyCenter, not during player look routine 2018-09-06 07:55:15 -04:00
mazmazz
e5dd74eb45 Change flicky thing #s to 2200s 2018-09-06 07:24:46 -04:00
Monster Iestyn
16c7c264a5 Wrap the text and snap to bottom 2018-09-04 19:52:50 +01:00
Monster Iestyn
bffaafd61e Add V_DrawTutorialBack for drawing a console-like background box, add Lorem ipsum as filler test 2018-09-04 19:21:58 +01:00
Monster Iestyn
df51997022 Merge branch 'master' into tutorial-time 2018-09-04 17:06:50 +01:00
Monster Iestyn
2b0ce807c7 Fix mixed d+c in NiGHTS trigger code, fix stray "INT8" in A_ConnectToGround 2018-09-04 17:04:24 +01:00
Monster Iestyn
aba9bd13bb Add "tutorialmode" var to help the game know when we're in a tutorial or not, add placeholder for tutorial HUD to test it works 2018-09-04 16:58:49 +01:00
Monster Iestyn
bcc9e58d0e Merge branch 'master' into tutorial-time 2018-09-04 15:54:50 +01:00
Monster Iestyn
2ac50cd2b7 Merge branch 'public_next' 
# Conflicts:
#	src/r_main.c
 2018-09-04 15:53:07 +01:00
Monster Iestyn
38ac999d77 Merge branch 'addfile-verify-fix' into 'next' 
Addfile command verify fix.

See merge request STJr/SRB2!272
 2018-09-03 17:17:46 -04:00
Monster Iestyn
ea06e8a62b SOCK_Send: Split the actual sending data parts into a new function, SOCK_SendToAddr, to make everything look a bit neater in general 2018-09-03 20:53:40 +01:00
Monster Iestyn
7b083f07cd UDP_Socket: I doubt client addresses are meant to be included in the total for broadcast addresses 2018-09-03 15:56:02 +01:00
Monster Iestyn
846bddfdcf SOCK_Send: Fix what appears to be a mistaken use of i instead of j 2018-09-03 15:52:22 +01:00
Monster Iestyn
24aafa6dac UDP_Socket: Add missing limit checks for s, for client and broadcast addresses 2018-09-03 15:43:36 +01:00
Digiku
01314b6674 Merge branch 'nightsplus-le' into 'master' 
NiGHTS Linedef Executor Triggers

Closes #102

See merge request STJr/SRB2Internal!142
 2018-09-02 18:10:50 -04:00
Monster Iestyn
6ae78da47e Merge branch 'master' into next 2018-09-02 13:00:56 +01:00
Monster Iestyn
4b5ebef6c2 Merge branch 'homremoval-nongreenfix' into 'master' 
Fix for HOM removal in non-green resolutions

See merge request STJr/SRB2!273
 2018-09-01 20:53:49 -04:00
Steel Titanium
54fec7fa5c Merge branch 'master' into addfile-verify-fix 2018-09-01 19:33:59 -04:00
Monster Iestyn
322da62b3c Fix HOM removal not working properly for non-green resolutions 2018-08-31 17:14:44 +01:00
Steel Titanium
0f5d685d1f Only do this if the admin player isn't the server host also. 2018-08-30 18:32:26 -04:00
Digiku
6ab0eb53f9 Merge branch 'nights-nofastattract' into 'master' 
NiGHTS: Dummy out faster item attract

See merge request STJr/SRB2Internal!183
 2018-08-30 17:26:42 -04:00
Monster Iestyn
4083ee9df7 Apparently I am blind and missed that splitscreen only CC offset that overrides the code for the other offset below 2018-08-30 20:08:17 +01:00
mazmazz
fed72c344a Dummy out NiGHTS item faster attract 2018-08-30 10:50:03 -04:00
Digiku
baa6ba6899 Merge branch 'nights-inufixes' into 'master' 
NiGHTS Minor Fixes: Snappier paraloop attract; drill mash penalty; configurable link timer

See merge request STJr/SRB2Internal!156
 2018-08-30 09:12:55 -04:00
mazmazz
dae37e2749 Drill mash penalty fix 2018-08-30 09:09:19 -04:00
mazmazz
a44be49535 Merge remote-tracking branch 'origin/master' into nights-inufixes 2018-08-30 08:13:34 -04:00
Monster Iestyn
ceb0abb081 Fix compiler complaints, remove a slipup of mine from when I was dealing with merge conflicts 2018-08-29 22:07:38 +01:00
Monster Iestyn
7db7a739d4 Use INFLIVES macro in place of 0x7f for infinite lives check 2018-08-29 21:31:15 +01:00
Monster Iestyn
5eddb1f455 Merge branch 'master' into hud-n-menu-tidbits 2018-08-29 21:28:11 +01:00
Monster Iestyn
28bbe71c57 Merge branch 'hud-cleaning' into 'master' 
Hud cleaning

See merge request STJr/SRB2Internal!170
 2018-08-29 16:22:48 -04:00
Monster Iestyn
523a02aa54 Merge branch 'master' into hud-cleaning 2018-08-29 20:46:35 +01:00
Monster Iestyn
1c5080151d Fix typo introduced by changes to the setrings command 2018-08-29 20:46:08 +01:00
Monster Iestyn
a48326383c Merge branch 'master' into hud-cleaning 
# Conflicts:
#	src/y_inter.c
 2018-08-29 16:39:02 +01:00
mazmazz
6d97a10273 Merge remote-tracking branch 'origin/master' into nightsplus-le 2018-08-29 11:06:00 -04:00
Digiku
900cbf72c8 Merge branch 'nightsplus-laplogic' into 'master' 
NiGHTS: Track player mare lap variables

See merge request STJr/SRB2Internal!143
 2018-08-29 10:58:05 -04:00
mazmazz
dc86fe9b5f Merge remote-tracking branch 'origin/master' into nightsplus-laplogic 2018-08-29 10:16:49 -04:00
Digiku
e0601616fe Merge branch 'nights-bumper-fix' into 'master' 
NiGHTS: Fix player positioning when touching Bumper

See merge request STJr/SRB2Internal!165
 2018-08-29 06:02:24 -04:00
Digiku
a28cc10861 Merge branch 'op-nights-bumper' into 'master' 
Objectplace: Place NiGHTS Bumpers with the player's fly angle

See merge request STJr/SRB2Internal!166
 2018-08-29 06:01:27 -04:00
Digiku
f8332f6765 Merge branch 'nights-nightserizeangle' into 'master' 
NiGHTS: Reset player another/flyangle on De/Nightserize

See merge request STJr/SRB2Internal!139
 2018-08-29 04:27:02 -04:00
Digiku
4882b7c3f8 Merge branch 'intermission-bonuslivesmax' into 'master' 
Intermission: MaxBonusLives level header option for # of lives in score tally

See merge request STJr/SRB2Internal!162
 2018-08-29 04:25:03 -04:00
Digiku
9746442a93 Merge branch 'le-ringspheres' into 'master' 
Line Execs: Make Ring triggers accept spheres in NiGHTS levels

See merge request STJr/SRB2Internal!163
 2018-08-29 04:24:47 -04:00
Digiku
78c78d9e63 Merge branch 'sphere-ring-concurrence' into 'master' 
Change SETSPHERES console command to SETRINGS to handle player->spheres transparently

See merge request STJr/SRB2Internal!167
 2018-08-29 04:24:23 -04:00
Monster Iestyn
73a66d22df At toaster's suggestion, have 2p control whether closed captioning is moved up if the powerup display is 1st person only 2018-08-28 20:57:43 +01:00
Monster Iestyn
1af8d3ac02 Merge branch 'master' into hud-n-menu-tidbits 
# Conflicts:
#	src/m_menu.c
#	src/screen.c
#	src/st_stuff.c
 2018-08-28 20:51:46 +01:00
Monster Iestyn
58a844d3cf Merge branch 'public_next' 
# Conflicts:
#	src/r_things.c
#	src/v_video.c
 2018-08-28 19:31:08 +01:00
Monster Iestyn
61836e1565 Merge branch 'master' into next 2018-08-26 21:10:41 +01:00
Monster Iestyn
c67767c580 Merge branch 'yo_screen_so_wide_y_is_invalid' into 'master' 
Yo Screen So Wide y Is Invalid

See merge request STJr/SRB2!271
 2018-08-26 16:07:06 -04:00
toaster
710550bb9d Missed one! 2018-08-26 12:38:53 +01:00
Monster Iestyn
d5ab3e75a5 Merge branch 'v_video_killed_the_r_radio_star' into 'master' 
v_video Killed The r_radio Star

See merge request STJr/SRB2!270
 2018-08-25 16:43:25 -04:00
Monster Iestyn
ed5bed4d2c Merge branch 'zalloc_potter_and_the_death-free_hallows' into 'master' 
Zalloc Potter and the Death-Free Hallows

See merge request STJr/SRB2!269
 2018-08-25 16:43:14 -04:00