mazmazz
7f404345f0
Make default flicky home radius 384
2018-09-06 11:59:55 -04:00
mazmazz
fd037fe763
Limit random fish color to SRB2's defaults
2018-09-06 11:56:55 -04:00
mazmazz
2b93a38f8e
Change default radius to 448
...
* Put default radius back in FLICKY_CENTER states
2018-09-06 11:54:06 -04:00
mazmazz
7b3c4aee33
Impose home radius on aimless flickies; improve randomness of flickyhitwall angle
2018-09-06 11:17:08 -04:00
mazmazz
04a59aacc4
Only allow flicky bounce (MF_NOCLIPTHING) if also in-place (MF_GRENADEBOUNCE)
2018-09-06 10:32:26 -04:00
mazmazz
c61cbcdf22
Erase default home radius from states and impose default on home check
2018-09-06 10:20:01 -04:00
mazmazz
fe508088b2
Re-organize flags for FLICKY_CENTER
...
* Flickies can be in-place with just one flag (MF_GRENADEBOUNCE)
* Flickies can now hop whether orbiting, aimless, or in-place
* Removed ability to customize movedir for orbit; will always be random
* Removed ability to customize gravity sink for aimless flying flickies
* Misc: Use P_SetTarget to set actor->tracer for flicky center
2018-09-06 10:17:41 -04:00
mazmazz
2d86dddb00
Merge branch 'master' into flicky-things
2018-09-06 08:09:02 -04:00
mazmazz
0ff48976b1
Impose default radius for orbiting flickies
2018-09-06 08:08:53 -04:00
mazmazz
9ef7c09d89
Make default behavior: aimless flying flickies stay at Z height
2018-09-06 08:07:13 -04:00
mazmazz
6426d88141
Store extravalue1 (home radius) immediately in A_FlickyCenter, not during player look routine
2018-09-06 07:55:15 -04:00
mazmazz
a095b47980
Change flicky thing #s to 2200s
2018-09-06 07:24:46 -04:00
Monster Iestyn
9066f82842
Wrap the text and snap to bottom
2018-09-04 19:52:50 +01:00
Monster Iestyn
83f2951f93
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
d91d1886fa
Merge branch 'master' into tutorial-time
2018-09-04 17:06:50 +01:00
Monster Iestyn
cd8a46b3a1
Fix mixed d+c in NiGHTS trigger code, fix stray "INT8" in A_ConnectToGround
2018-09-04 17:04:24 +01:00
Monster Iestyn
dbff92ea30
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
cc20eed183
Merge branch 'master' into tutorial-time
2018-09-04 15:54:50 +01:00
Monster Iestyn
82e46d101c
Merge branch 'public_next'
...
# Conflicts:
# src/r_main.c
2018-09-04 15:53:07 +01:00
Monster Iestyn
6774933263
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
d68585a9d0
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
339ffe8d08
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
f5b88ee37d
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
4bb12fb79f
UDP_Socket: Add missing limit checks for s, for client and broadcast addresses
2018-09-03 15:43:36 +01:00
Digiku
816a81b396
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
df5ac5826c
Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx
2018-09-02 08:16:40 -04:00
mazmazz
5a278b5168
Linux Compiler fix HAVE_MIXERX cvars
2018-09-02 08:15:55 -04:00
Monster Iestyn
4bd725e7b8
Merge branch 'master' into next
2018-09-02 13:00:56 +01:00
Monster Iestyn
44c4534231
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
4b690b20d3
Merge branch 'master' into addfile-verify-fix
2018-09-01 19:33:59 -04:00
mazmazz
73842cec71
Add MUSICPOSTBOSSFADEIN
2018-09-01 13:10:50 -04:00
mazmazz
797f2b6575
Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx
2018-09-01 11:38:26 -04:00
mazmazz
abb67d35e3
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
1aa4035594
Revert "Fix MIDI music not reloading sometimes on settings change"
...
This reverts commit be21072b58
2018-09-01 11:35:54 -04:00
mazmazz
be21072b58
Fix MIDI music not reloading sometimes on settings change
2018-09-01 11:34:03 -04:00
mazmazz
82512a3ce4
Fix MIDI music not reloading sometimes on settings change
2018-09-01 11:33:39 -04:00
mazmazz
da53fd8f8f
Merge branch 'music-cleanup' into musicplus-core
2018-09-01 11:22:15 -04:00
mazmazz
059f364740
Add Mixer X retrieve song length and position natively, if available
2018-08-31 13:52:01 -04:00
mazmazz
0f9f055961
Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx
2018-08-31 13:27:11 -04:00
mazmazz
4810c48c08
Compile in modplug (for libopenmpt file detection)
2018-08-31 13:27:02 -04:00
mazmazz
2cf2b0c66b
Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx
2018-08-31 12:19:03 -04:00
mazmazz
e5b4cf2dcf
Fix MIDI not reloading when erroring on a player
2018-08-31 12:18:54 -04:00
Monster Iestyn
7fc4d864a8
Fix HOM removal not working properly for non-green resolutions
2018-08-31 17:14:44 +01:00
mazmazz
a4d6458ecd
Revert "Update SDL Windows dependency to 2.0.8"
...
This reverts commit adce4db5aa
2018-08-31 12:00:33 -04:00
mazmazz
c78472539c
Revert "New SDL2 test files"
...
This reverts commit 3dfbb61546
2018-08-31 11:58:18 -04:00
mazmazz
cc4f59878a
Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx
2018-08-31 11:23:25 -04:00
mazmazz
853fe38569
Compiled fluidsynth into libraries
2018-08-31 11:23:16 -04:00
mazmazz
e33d385a6a
Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx
2018-08-31 02:26:45 -04:00
mazmazz
580a3471a8
Updated SDL Mixer X binaries
2018-08-31 02:26:21 -04:00
Steel Titanium
277bec55c2
Only do this if the admin player isn't the server host also.
2018-08-30 18:32:26 -04:00
