stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-17 08:20:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
4368 commits 175 branches 41 tags 272 MiB
Commit graph

4368 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
f000a68150 Impose default radius for orbiting flickies 2018-09-06 08:08:53 -04:00
mazmazz
21a55a4702 Make default behavior: aimless flying flickies stay at Z height 2018-09-06 08:07:13 -04:00
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
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
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
mazmazz
cea76fe41f Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-09-02 08:16:40 -04:00
mazmazz
bb1af344ee Linux Compiler fix HAVE_MIXERX cvars 2018-09-02 08:15:55 -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
mazmazz
1681e6cc00 Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-09-01 11:38:26 -04:00
mazmazz
7fbe97a3d2 Reset MIDI music properly on settings change 
* Added reset flag to S_Start (now S_StartEx)
 2018-09-01 11:37:53 -04:00
mazmazz
c8a9edca8d Revert "Fix MIDI music not reloading sometimes on settings change" 
This reverts commit aa48278fd4.
 2018-09-01 11:35:54 -04:00
mazmazz
aa48278fd4 Fix MIDI music not reloading sometimes on settings change 2018-09-01 11:34:03 -04:00
mazmazz
f0244c8b71 Fix MIDI music not reloading sometimes on settings change 2018-09-01 11:33:39 -04:00
mazmazz
3ccc66b1b3 Merge branch 'music-cleanup' into musicplus-core 2018-09-01 11:22:15 -04:00
mazmazz
9180f9b7ef Add Mixer X retrieve song length and position natively, if available 2018-08-31 13:52:01 -04:00
mazmazz
94741b4454 Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-08-31 13:27:11 -04:00
mazmazz
febfa718b4 Compile in modplug (for libopenmpt file detection) 2018-08-31 13:27:02 -04:00
mazmazz
8098d120cc Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-08-31 12:19:03 -04:00
mazmazz
58ef056d48 Fix MIDI not reloading when erroring on a player 2018-08-31 12:18:54 -04:00
Monster Iestyn
322da62b3c Fix HOM removal not working properly for non-green resolutions 2018-08-31 17:14:44 +01:00
mazmazz
364312cbe3 Revert "Update SDL Windows dependency to 2.0.8" 
This reverts commit 720a1212ae.
 2018-08-31 12:00:33 -04:00
mazmazz
31d5735964 Revert "New SDL2 test files" 
This reverts commit eafed06a29.
 2018-08-31 11:58:18 -04:00
mazmazz
fb7cd90718 Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-08-31 11:23:25 -04:00
mazmazz
af9e2365b9 Compiled fluidsynth into libraries 2018-08-31 11:23:16 -04:00
mazmazz
8f960efe15 Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-08-31 02:26:45 -04:00
mazmazz
72eecc8899 Updated SDL Mixer X binaries 2018-08-31 02:26:21 -04: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
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
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
mazmazz
38bb71bada Add mapmusposition placeholder to LE 413 change music 2018-08-29 15:21:17 -04: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