stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-03 17:52:04 +00:00
Code Issues Projects Releases Packages Wiki Activity
11097 commits 178 branches 41 tags 201 MiB
Commit graph

256 commits

Author SHA1 Message Date
fickleheart
2b7d75126e Add DBG_VIEWMORPH to view pre-transformed view 2020-01-17 20:39:15 -06:00
Alam Ed Arias
b97b9ac7a8 Merge branch 'master' into next 2020-01-16 20:18:54 -05:00
James R
f8666d6cee Merge branch 'word' into 'master' 
Word jumping

See merge request STJr/SRB2!653
 2020-01-16 20:05:12 -05:00
Sally Cochenour
ef81bf810b ?? 
did not commit??
 2020-01-16 14:56:11 -05:00
Alam Ed Arias
709489cab8 Merge branch 'master' into next 2020-01-16 12:08:36 -05:00
Monster Iestyn
1643e6623d whoops, forgot to do this 2020-01-11 20:24:43 +00:00
Monster Iestyn
9c8988ab57 Don't make locale code dependent on GETTEXT, save that for the actual gettext related stuff! 2020-01-11 18:48:47 +00:00
James R
702b23ec3f Put the word jumping code in functions 2020-01-08 12:58:19 -08:00
Sally Cochenour
ca5b56181b Merge next 2020-01-07 07:35:39 -05:00
MascaraSnake
7b5f2f09c0 Merge branch 'textmap-parser' into 'next' 
Textmap parser

See merge request STJr/SRB2!604
 2020-01-03 04:14:38 -05:00
James R
fc8c0f8a9a Merge remote-tracking branch 'origin/master' into next 2019-12-30 13:16:53 -08:00
James R
80bb6fe7a0 Merge branch 'modid' into 'next' 
Put a mod name in SERVERINFO

See merge request STJr/SRB2!577
 2019-12-30 15:41:08 -05:00
James R
5e5f3c4fa7 Merge branch 'renderswitch' into 'master' 
Renderer switching

See merge request STJr/SRB2!550
 2019-12-30 15:36:17 -05:00
Nev3r
aaef412823 Add basic textmap support; currently crashes when trying to free the virtres, at vres_free(). 2019-12-30 11:33:22 +01:00
Sally Cochenour
a66fb15ff2 Merge branch 'next' into oglshaderport 2019-12-28 13:58:41 -05:00
Alam Ed Arias
94bb6655a5 Merge branch 'master' into next 2019-12-27 17:08:16 -05:00
Jaime Passos
c0390f5186 Merge remote-tracking branch 'origin/next' into rotsprite2 2019-12-26 20:27:29 -03:00
James R
6bd383621e More fine tuned versioning 
You get a PACKETVERSION, for when some packets change format.

You get SRB2APPLICATION, for when you have big fucking mod.
 2019-12-25 20:52:02 -08:00
Sally Cochenour
da3d5a0184 Merge next 2019-12-25 14:41:31 -05:00
Sally Cochenour
7851bef929 Port of Jimita's shader stuff + my lighting shader 
Co-Authored-By: Jaime Passos <jimita@users.noreply.github.com>
 2019-12-25 14:22:01 -05:00
Jaime Passos
03a3b02301 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-25 05:43:46 -03:00
James R
9defd997c3 Merge branch 'fixsignalhandler' into 'master' 
Handle signals correctly on linux

See merge request STJr/SRB2!530
 2019-12-24 02:54:44 -05:00
James R
25525a6aae symlink latest-log.txt on nix, copy to the real log file everywhere else 2019-12-23 18:20:04 -08:00
Jaime Passos
aff5b52eba change ROTANGLES to 72 2019-12-17 13:39:26 -03:00
Jaime Passos
6a5ea548e6 make ROTANGLES be 360 2019-12-17 13:00:50 -03:00
James R
8a23ff0bc8 Handle log file in parent properly 2019-12-13 16:51:49 -08:00
James R
6dcdb8d951 Move everything to i_system.c 
This also simplifies things; SDL isn't initialized in the parent process.
 2019-12-12 15:08:27 -08:00
James R
7c383e4a1f nix: Fork before game code and wait to catch signals and coredumps 
Ditched signal_handler to avoid worrying about async-signal-safe functions.
D_QuitNetGame is not called, so players whose programs are interrupted by a
signal will time out from the server. Because the game runs in a child process,
the window can close before the "Signal Caught" text box appears.

"(core dumped)" is also included in the message if core dumping could be
determined.
 2019-12-11 23:46:57 -08:00
Jaime Passos
0652ffd67f Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-12-11 21:53:47 -03:00
Jaime Passos
9248f12d55 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-10 23:01:10 -03:00
MascaraSnake
0d22970c78 Change versionstring to 2.2.0 2019-12-06 23:47:05 +01:00
MascaraSnake
bf477c6ed4 Merge branch 'master' into nondevelop 2019-12-06 23:23:01 +01:00
Steel Titanium
d415cd5c6d
Update copyright date on source files 2019-12-06 13:49:42 -05:00
toaster
fd6ecb4425 Make modid 18 to match Rob's work. 2019-12-06 17:23:55 +00:00
toaster
1684cf76bd Make modversion 40 to match Rob's work. 2019-12-06 17:19:42 +00:00
toaster
9e38af7421 * Fix unintentional order-of-operations crash with non-DEVELOP executables (resolves #461). 
* Update md5s.
* Update modversion.

TODO: Should we change MODID, given 2.0 apparently had a different MODID to 2.1?
 2019-12-06 17:14:51 +00:00
Jaime Passos
1e4060af8c remove unused levelwipes 2019-11-18 19:22:46 -03:00
Jaime Passos
c15ee65015 LEVELWIPES 2019-11-15 18:21:12 -03:00
Jaime Passos
10d1b63ff2 Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-14 12:49:03 -03:00
Jaime Passos
c6253bb6f9 Merge remote-tracking branch 'origin/master' into renderswitch 2019-11-12 20:25:40 -03:00
Jaime Passos
c7d0d7b1c2 Flats as walls textures support, WIP, doesn't support animations yet 2019-11-09 01:36:53 -03:00
Jaime Passos
79e99dc471 Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-10-28 14:29:10 -03:00
James R
6358d839ee Overhaul the map command 
Added support for map names, matched by substring and keywords too!
Added support for two digit MAP codes without the MAP part.
Added support for decimal map number. (But who cares.)

Gave a better description of command.
Supported abbreviated optional parameters.

And now REALLY detects incorrect parameters.
 2019-10-27 14:02:36 -07:00
James R
0b314a82bb Use long double suffix 2019-10-22 21:48:15 -07:00
James R
29a5999a44 "NEWPING" might as well be the only ping 2019-10-22 19:39:26 -07:00
Jaime Passos
5118f8589d Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-09-28 12:14:55 -03:00
Jaime Passos
fe60902df5 Merge remote-tracking branch 'origin/master' into renderswitch 2019-09-27 22:53:57 -03:00
Steel Titanium
6a870b4467
Various of changes 
Changed any instance of "joystick" in strings to "gamepad"
Renamed some cvars
Added a define for MAX_JOYSTICK
Added back the missing command line params.
 2019-09-23 22:46:44 -04:00
Jaime Passos
8057eeaaca Merge remote-tracking branch 'jimita/renderswitch' into renderswitch 2019-09-10 18:12:01 -03:00
Jaime Passos
6ab20060a7 Disable LUA_PATCH_SAFETY because I trust Lua scripters enough 
haha........ha.................
 2019-09-10 16:59:37 -03:00
Jaime Passos
26569f494b lua stuff 2019-09-09 17:24:13 -03:00
Jaime Passos
f461b76bb0 fix translucency 2019-09-07 16:54:26 -03:00
Jaime Passos
0cc553be5f Merge remote-tracking branch 'jimita/flats-png' into flats-png_port 2019-09-06 19:20:45 -03:00
Jaime Passos
1fca5a749e Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-09-02 23:36:30 -03:00
Monster Iestyn
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
Jaime Passos
f68652aa66 I 2019-08-18 14:16:48 -03:00
Monster Iestyn
e52a314ddb Update version to 2.1.25 2019-08-16 20:14:01 +01:00
Monster Iestyn
0ba2b28381 Disable patch.dta at Rob's request, since we don't really use it anymore 2019-08-11 20:24:14 +01:00
toaster
3efb49487e Pre-pinch behaviour complete - heavily reliant on a new map, which I won't be sharing until everything is ready. 
Just making this commit now so I can merge in master...
 2019-07-04 14:09:38 +01:00
Jaime Passos
28566008b4 Merge remote-tracking branch 'upstream/master' into flats-png 2019-06-25 16:02:35 -03:00
toaster
3021116797 Some preliminary work to make multiple bosses in the same map work nicely together, by allowing parameter to alter the linedef executor tag to call in increments of 100. 
Also: Making sure every single reserved tag is recorded as an LE_ constant.
 2019-06-22 17:03:39 +01:00
Monster Iestyn
6f6d912fa6 Update version to 2.1.24 2019-06-07 15:48:33 +01:00
Jaime Passos
39857a846a PNG support 2019-05-26 23:37:23 -03:00
mazmazz
9ec98c588f Merge branch 'public_next' 2019-03-14 22:15:34 -04:00
mazmazz
075f28b7c8 WIP 20190101 merge 
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
 2019-01-02 01:09:15 -05:00
mazmazz
b7bb570f97 Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-01 10:41:40 -05:00
mazmazz
894c139bf1 Update code versions to 2.1.23 2018-12-26 16:31:43 -05:00
mazmazz
842bcfc8a0 Merge remote-tracking branch 'public-gl/master' into 2122-version 2018-12-25 00:19:45 -05:00
mazmazz
10a3e3fec9 Define EPSILONs only if not already defined 
Fixes OSX buildbot
 2018-12-24 20:36:28 -05:00
mazmazz
e9e5128754 Use DBL_EPSILON for colormap comparison 2018-12-24 20:22:10 -05:00
Digiku
8d56c2f486 Merge branch 'addons-backport' into '2122-version' 
Addons Menu backport to vanilla

See merge request STJr/SRB2!384
 2018-12-23 18:08:06 -05:00
Digiku
7a64e3d1a8 Merge branch 'SRB2-CHAT' into '2122-version' 
Chat and other multiplayer quality of life improvements.

See merge request STJr/SRB2!398
 2018-12-23 17:53:54 -05:00
mazmazz
f1fea30045 Properly restrict EXECVERSION from cvar updates 2018-12-20 17:56:51 -05:00
mazmazz
9be1ee4ac7 Hardcode define MAJOREXECVERSION to MODVERSION 2018-12-20 17:16:04 -05:00
mazmazz
6affe807e8 Merge branch '2122-version' into 2122-execversion 2018-12-20 17:14:53 -05:00
mazmazz
04916edc07 Update EXECVERSION to MODVERSION 27 2018-12-20 04:03:35 -05:00
mazmazz
9d212b340b Update code versions to 2.1.22 2018-12-20 02:35:27 -05:00
mazmazz
969960a1eb Adjust EXECVERSION define scheme* MAJOREXECVERSION and MINOREXECVERSION* GETEXECVERSION(major, minor) macro 2018-12-20 02:18:11 -05:00
mazmazz
657e7321f6 Decouple execversion from MODVERSION; add scheme for MINORMODVERSION 2018-12-17 13:38:23 -05:00
mazmazz
6d94568f4b Hide kart-specific addons behavior behind USE_KART 2018-12-16 16:07:47 -05:00
Latapostrophe
25e6d5388c merge conflict 2018-12-16 16:48:15 +01:00
Monster Iestyn
33c1ac33f5 Merge branch 'next' into 21-version 
# Conflicts:
#	src/d_netcmd.c
 2018-12-02 15:45:07 +00:00
mazmazz
ea7162a76a Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
mazmazz
36e020c366 Update version to 2.1.21 2018-11-23 06:58:45 -05:00
Digiku
e599428442 Merge branch 'debug_stuff' into 'master' 
Debug tweaks

See merge request STJr/SRB2Internal!144
 2018-11-21 16:41:51 -05:00
Monster Iestyn
e4f157786c Merge branch 'public_next' 
# Conflicts:
#	src/Makefile
#	src/doomtype.h
#	src/hardware/hw_clip.c
#	src/hardware/hw_main.c
#	src/sdl12/sdl_sound.c
 2018-11-10 19:18:34 +00:00
Monster Iestyn
8ba0f2a177 clipping code didn't seem so bad this time (at least compared to without), let's enable it now? 2018-11-10 16:09:52 +00:00
Monster Iestyn
1e98e3b4f2 More progress, NEWCLIP added to doomdef.h, sadly it actually all lags the game so I've disabled it for now 
Other notes:
* on second thought I'll keep the hw_clip functions' gld prefixes rather than HWR, not like it matters either way
* despite the extra lag it does fix the issues with translucent walls and such when displayed at different vertical angles, such as with the GFZ1 waterfall
 2018-11-10 16:08:56 +00:00
mazmazz
c5ea6b5efe MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport 2018-09-18 10:22:17 -04:00
Latapostrophe
ac7c249fd2 SRB2chat test rework 2018-07-31 11:10:02 +02:00
toaster
5032ae2552 * Patch.pk3 as requested by literally everyone else on the team. 
* Enable SECTORSPECIALAFTERTHINK since we probably really want to use that sloped lava wave in RVZ.
* Allow for infinite lives to be set via the setlives command/Pandora's Box.
* Refactor P_DoFiring(), with guidance from Sal.
* Correct the CRAWLA HONCHO\nCAN NOW BECOME\nSUPER CRAWLA HONCHO sliding movement in non-green resolutions.
 2018-06-06 14:42:50 +01:00
toasterbabe
729b7d81c3 DEVMODE visual output messed with a bit. NOT in master this time. 
* DBG_PLAYER split out from DBG_DETAILED. (The difference I'm intending here is whether it's referring to stuff in the player struct, or stuff in the mobj struct.)
* Function pointer for text so both modes can show the same stuff if it's not taking over the entire screen, and only show the "INFO NOT AVAILABLE AT THIS RESOLUTION" if it's in danger of going off the bottom.
 2018-04-08 14:31:56 +01:00
toasterbabe
373bb329a2 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into pretty_stuff 2018-01-20 22:18:16 +00:00
toasterbabe
2141754e54 V_PERPLAYER. (Hooh boy.) 
* Completely redid how splitscreen works, with eventual support for quads. Squish per-player stuff automatically into the right places! Works in GL, associated flag kills V_SPLITSCREEN.
* Seriously update the lives-drawing function for all gametypes, with strings that replace the lives number whenever it's missing (deprecates SKINNAMEPADDING).
* Improved how the nosshack works, alongside many other refactorings.
 2018-01-20 22:14:24 +00:00
Monster Iestyn
61176ee736 Merge branch 'public_next' 
# Conflicts:
#	src/doomdef.h
#	src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
#	src/win32/win_vid.c
 2018-01-02 17:32:24 +00:00
Monster Iestyn
ac3fef15eb Rob is now in charge of Mod IDs, change MODID comment in doomdef.h to reflect this 2017-12-13 19:07:02 +00:00
Monster Iestyn
7cb0138293 Change version number to 2.1.20 2017-11-08 15:06:42 +00:00
Monster Iestyn
302d0425e0 Incinerated WinCE 2017-09-29 23:25:34 +01:00
Monster Iestyn
be13f10626 ended NDS 2017-09-29 22:48:14 +01:00
Monster Iestyn
23d28e6b8c Gutted the GP2X 2017-09-29 22:27:08 +01:00