8057eeaaca
Merge remote-tracking branch 'jimita/renderswitch' into renderswitch
2019-09-10 18:12:01 -03:00
6ab20060a7
Disable LUA_PATCH_SAFETY because I trust Lua scripters enough
...
haha........ha.................
2019-09-10 16:59:37 -03:00
1a9191dcd7
Attempt to fix warnings
2019-09-09 19:34:51 -03:00
0a973af5b8
Comments
2019-09-09 19:27:08 -03:00
6f4dadaa12
menu changes
2019-09-09 17:53:34 -03:00
02e327a4e4
D_SRB2Loop: Draw CONSBACK even in OpenGL
2019-09-09 17:35:38 -03:00
26569f494b
lua stuff
2019-09-09 17:24:13 -03:00
ebc22b9df8
yet even more cleanup here
2019-09-09 16:31:30 -03:00
da93e0f1f5
I am the CEO of renderers
2019-09-09 16:20:17 -03:00
dc93cafda9
can i push this already?
2019-09-08 22:25:18 -03:00
725d0b4c44
still making things better
2019-09-08 21:37:24 -03:00
19e50062cc
more stuff. i hope i didnt mess this up.
2019-09-08 18:59:49 -03:00
c7e01a558e
initial stuff
2019-09-08 18:44:40 -03:00
2863ede7bf
initial stuff
2019-09-08 18:27:35 -03:00
c6af108d8c
Merge branch 'musicfixes' into 'master'
...
Minor musicplus-related fixes
See merge request STJr/SRB2Internal!310
2019-09-07 11:45:15 -04:00
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
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
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
92b77c987b
Fix compilation warning for Match penalty string. (Egads, straight into master! Shock! Horror!)
2019-09-07 12:10:50 +01:00
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
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
bc52bc83cc
2D toggle command
2019-09-06 20:51:39 -04:00
de4a609421
Merge remote-tracking branch 'origin/master' into fix_skipintro
2019-09-06 16:08:18 -03:00
4c39225c3e
Merge branch 'public_next'
2019-09-03 19:07:57 +01:00
6b151ef4ea
Merge remote-tracking branch 'origin/master' into fix_skipintro
2019-09-02 23:36:15 -03:00
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
028996915d
Merge branch 'master' into next
2019-08-29 19:28:02 -04:00
dadec1196b
Warn on implicit fallthrough
2019-08-29 19:27:52 -04:00
1040a93a6e
Ignore bots when looking for a player
2019-08-28 23:12:25 -04:00
121d8b7838
Merge branch 'abpolish' into 'master'
...
Autobrake polish
Closes #176
See merge request STJr/SRB2Internal!293
2019-08-28 00:34:21 -04:00
89c4989987
Show a negative number to indicate ammo penalty
2019-08-26 16:07:17 -07:00
ab90526541
Merge branch 'candamagefix' into 'master'
...
P_PlayerCanDamage fix
See merge request STJr/SRB2Internal!291
2019-08-26 11:32:10 -04:00
db3a2e02a5
Modify defaults for smpstage_start and smpstage_end to 60 and 66 respectively
2019-08-25 22:24:08 +01:00
d1105abdb3
Merge branch 'public_next'
...
# Conflicts:
# src/d_netfil.c
2019-08-25 18:18:59 +01:00
964693d542
Merge branch 'master' into next
2019-08-24 23:28:38 +01:00
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
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
e5071bb605
Compare the file name only for real
...
CL_SendRequestFile prepends the path for each file.
2019-08-23 11:00:05 -07:00
9d2e7b66ba
Merge branch 'gfz_boss_rework' into 'master'
...
GFZ boss rework + boss explosion fun
See merge request STJr/SRB2Internal!290
2019-08-22 11:27:24 -04:00
fc1abdd7f8
Autobrake polish!
...
* Make it actually look like a brake, so people can tell it's on instead of just having high friction.
* Fix it fucking with spring chains (caused by being unwittingly active for the first tic of spring collision).
2019-08-22 16:13:00 +01:00
41d5ffa17f
Fix OpenGL renderer crash with -skipintro command line parameter.
2019-08-20 20:21:53 -03:00
6ef9ee5467
true not TRUE
2019-08-20 15:43:59 -04:00
eacc589ae1
Added quick validity checks for three linedef executor specials that require a player mobj to be the triggerer (432, 434 and 437)
2019-08-20 20:31:28 +01:00
2dd5f1abe3
Fixes for lib_cvRegisterVar (the Lua version of CV_RegisterVar):
...
* Make sure the consvar's properties are all initialised to zeros as defaults
* Error if the consvar is not given a name
* Error if the consvar has CV_CALL but no call function
* Error if the consvar has CV_NOINIT but not CV_CALL
2019-08-20 18:18:29 +01:00
7f5034bb75
Merge branch 'mi-cleanup-returns' into 'master'
...
MI cleanup returns
See merge request STJr/SRB2Internal!292
2019-08-20 09:35:36 -04:00
54dbd7b4c1
Merge branch 'landingbetter' into 'master'
...
Fix all our landing woes. (For now.)
See merge request STJr/SRB2Internal!289
2019-08-20 09:28:40 -04:00
03ce0adef8
Remove references to old console ports that slipped in from the 2.1 source code a while back
2019-08-20 14:13:38 +01:00
f3484f7ded
Merge branch 'public_next'
...
# Conflicts:
# src/config.h.in
# src/d_clisrv.c
# src/d_netcmd.c
# src/doomdef.h
# src/p_map.c
# src/p_maputl.c
# src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-08-20 13:54:48 +01:00
c50831f875
Merge branch '2.1.25-prep' into 'next'
...
Update version to 2.1.25
See merge request STJr/SRB2!507
2019-08-17 14:07:04 -04:00
9a4a90c9cb
Merge branch 'netcode-exploits' into 'next'
...
Fix an exploit where players could steal the final hash of a login
See merge request STJr/SRB2!508
2019-08-17 14:05:20 -04:00
Jaime Passos