James R
|
2fda89f1c3
|
Merge branch 'bot-respawn-hook' into 'next'
BotRespawn hook
See merge request STJr/SRB2!804
|
2020-04-09 19:52:25 -04:00 |
|
James R
|
bd7d05fdf0
|
Merge branch 'gtr-replace' into 'next'
Separate PvP damage from ringslinger
See merge request STJr/SRB2!831
|
2020-04-09 19:51:52 -04:00 |
|
James R
|
2dfe276a73
|
Merge branch 'sdlglcontext' into 'master'
Only initialise OpenGL if the user intends to load it (for real this time)
See merge request STJr/SRB2!796
|
2020-04-09 19:51:20 -04:00 |
|
James R
|
b8d40a5783
|
Merge branch 'dye' into 'next'
Expose colorization to mappers and SOC
See merge request STJr/SRB2!679
|
2020-04-09 19:50:32 -04:00 |
|
James R
|
78613ec445
|
Merge branch 'supergoldedit' into 'next'
Change SKINCOLOR_SUPERGOLD1-5
See merge request STJr/SRB2!805
|
2020-04-09 19:50:06 -04:00 |
|
James R
|
4e7283c833
|
Merge branch 'pk3-directory-start' into 'next'
Don't skip the first directory entry of PK3 if it's a file
See merge request STJr/SRB2!764
|
2020-04-09 19:49:44 -04:00 |
|
James R
|
d4c08a8410
|
Merge branch 'lightmemedata' into 'next'
Cvars returned by CV_FindVar did not work with userdataType
See merge request STJr/SRB2!754
|
2020-04-09 19:48:39 -04:00 |
|
James R
|
e100f21dda
|
Merge branch 'loop-patch' into 'next'
Let MUSICDEF set loop point
See merge request STJr/SRB2!762
|
2020-04-09 19:47:43 -04:00 |
|
James R
|
aad225932d
|
Merge branch 'SF_NONIGHTSSUPER' into 'next'
Skin flag for disabling super colors in NiGHTS
See merge request STJr/SRB2!782
|
2020-04-09 19:47:20 -04:00 |
|
James R
|
673a842043
|
Merge remote-tracking branch 'origin/next' into SF_NONIGHTSSUPER
|
2020-04-09 16:47:52 -07:00 |
|
James R
|
1edc300d0c
|
Merge branch 'lua-hook-cleanup' into 'next'
Lua hook cleanup
See merge request STJr/SRB2!851
|
2020-04-09 19:40:09 -04:00 |
|
James R
|
a4fa4351d8
|
Merge branch 'fix-consbackpic' into 'master'
Fix console backpic
See merge request STJr/SRB2!850
|
2020-04-09 19:39:16 -04:00 |
|
James R
|
b4ab284d21
|
Merge branch 'fixed2float-funcs' into 'master'
Turn FIXED_TO_FLOAT into a function
See merge request STJr/SRB2!869
|
2020-04-09 19:37:22 -04:00 |
|
sphere
|
806884a3f4
|
Use M_GametypeHasLevels again (properly this time) to save memory.
|
2020-04-02 17:59:56 +02:00 |
|
sphere
|
3074880ac1
|
Actually check for available maps correctly. Whoops!
|
2020-04-02 16:07:38 +02:00 |
|
Steel Titanium
|
9a242818a7
|
Merge branch 'master' into next
|
2020-03-31 20:46:54 -04:00 |
|
SteelT
|
6620364158
|
Merge branch 'fix-allowjoin' into 'next'
Delete singleplayer
See merge request STJr/SRB2!870
|
2020-03-31 20:45:02 -04:00 |
|
SteelT
|
b6f1155ae1
|
Merge branch 'fix-keepbody-ping' into 'master'
Fix disconnected players being kicked for high ping
See merge request STJr/SRB2!866
|
2020-03-31 20:25:43 -04:00 |
|
Louis-Antoine
|
ad12e29fda
|
Fix allowjoin off affecting single player
|
2020-03-30 22:11:48 +02:00 |
|
Monster Iestyn
|
befae492fe
|
use ATTRINLINE rather than inline to match some of the other functions in this file, though I'm told modern compilers ignore inlining info as they actually decide themselves now
(though I could pretend we still support the older ones lol)
|
2020-03-30 20:25:56 +01:00 |
|
Monster Iestyn
|
2e27b3ea87
|
Turn the fixed-float convert macros into inline functions, like those in GZDoom. The old macros get to be just the same as calling these inline functions.
|
2020-03-30 19:58:46 +01:00 |
|
Louis-Antoine
|
8130599a4f
|
Fix disconnected players being kicked for high ping
|
2020-03-28 15:23:15 +01:00 |
|
MascaraSnake
|
e471134746
|
Merge branch 'invertplanes-bruh' into 'next'
Standardize the behavior of FF_INVERTSIDES and FF_INVERTPLANES
See merge request STJr/SRB2!863
|
2020-03-25 12:25:48 -04:00 |
|
MascaraSnake
|
92c74814cf
|
Standardize the behavior of FF_INVERTSIDES and FF_INVERTPLANES
|
2020-03-25 08:34:52 +01:00 |
|
sphere
|
99a5192872
|
Hide record/NiGHTS attack if there are no available maps for them.
|
2020-03-24 16:10:30 +01:00 |
|
Monster Iestyn
|
4722fbbc2a
|
Merge branch 'demos-refactor' into 'next'
Demos refactor
See merge request STJr/SRB2!853
|
2020-03-22 17:52:45 -04:00 |
|
Monster Iestyn
|
23b6679b3a
|
Merge branch 'buggle-trouble' into 'next'
P_HomingAttack related fixes
See merge request STJr/SRB2!836
|
2020-03-22 16:57:22 -04:00 |
|
Monster Iestyn
|
3b9dd31faf
|
Merge branch 'fix-setspriteinfo' into 'next'
Fix lib_setSpriteInfo indexes being off-by-one
See merge request STJr/SRB2!854
|
2020-03-22 16:40:34 -04:00 |
|
MascaraSnake
|
ab133e50c9
|
Add wall spike arrow to UDB config as well
|
2020-03-22 12:56:59 +01:00 |
|
MascaraSnake
|
c931b4fa67
|
Merge branch 'next' into udmf-next
|
2020-03-22 12:56:21 +01:00 |
|
MascaraSnake
|
5864788333
|
Merge branch 'master' into next
|
2020-03-22 12:55:56 +01:00 |
|
MascaraSnake
|
48e8c9058a
|
Add arrow to wall spike in ZB config
|
2020-03-22 12:55:34 +01:00 |
|
MascaraSnake
|
79bfe14678
|
Move UDB configs into a subfolder
|
2020-03-22 08:08:34 +01:00 |
|
MascaraSnake
|
c4b5c20d3d
|
Add UDB config
|
2020-03-22 08:04:28 +01:00 |
|
MascaraSnake
|
2c8daabba1
|
Merge branch 'next' into udmf-next
|
2020-03-22 07:52:09 +01:00 |
|
MascaraSnake
|
bc1e42d222
|
Merge branch 'master' into next
|
2020-03-22 07:51:35 +01:00 |
|
MascaraSnake
|
6911097b56
|
Minor ZB config fix
|
2020-03-22 07:50:57 +01:00 |
|
MascaraSnake
|
faac3c7023
|
Merge branch 'next' into udmf-next
|
2020-03-21 20:18:07 +01:00 |
|
MascaraSnake
|
c5b4d4bd7e
|
Merge branch 'master' into next
|
2020-03-21 20:17:48 +01:00 |
|
MascaraSnake
|
c806d8a5e8
|
Another ZB config fix
|
2020-03-21 20:17:28 +01:00 |
|
MascaraSnake
|
1580e14cbc
|
Merge branch 'next' into udmf-next
# Conflicts:
# extras/conf/Includes/SRB222_linedefs.cfg
# extras/conf/Includes/SRB222_misc.cfg
# src/p_spec.c
|
2020-03-21 20:04:31 +01:00 |
|
MascaraSnake
|
42445b39d7
|
Merge branch 'master' into next
|
2020-03-21 19:16:52 +01:00 |
|
MascaraSnake
|
a2729ddefc
|
Merge branch 'config-fixes' into 'master'
Updates and fixes for the ZB config
See merge request STJr/SRB2!859
|
2020-03-21 14:16:04 -04:00 |
|
MascaraSnake
|
d2c83e1cda
|
Add Object Special text for Star Post
|
2020-03-21 15:16:07 +01:00 |
|
LJ Sonic
|
006b1e8c0e
|
Merge branch 'delete-slopes' into 'next'
Delete slopes
See merge request STJr/SRB2!857
|
2020-03-21 09:35:27 -04:00 |
|
LJ Sonic
|
fa9c2f43f7
|
Merge branch 'skip-empty-gametypes' into 'master'
Skip empty gametypes in level select menu
See merge request STJr/SRB2!819
|
2020-03-21 08:52:54 -04:00 |
|
MascaraSnake
|
06f9246fd3
|
Updates and fixes for the ZB config
|
2020-03-21 12:06:52 +01:00 |
|
MascaraSnake
|
e2c9815606
|
Merge branch 'master' into next
|
2020-03-21 09:40:57 +01:00 |
|
MascaraSnake
|
2107b89586
|
Remove the multi-file ZB configs. We're stick with the single-file config for ZB and doing all the UDMF stuff in UDB
|
2020-03-21 09:40:37 +01:00 |
|
Louis-Antoine
|
892a8dd6e7
|
Make SRB2 flat like Earth
|
2020-03-20 18:55:29 +01:00 |
|