stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 20:41:25 +00:00
Code Issues Projects Releases Packages Wiki Activity
11097 commits 171 branches 41 tags 312 MiB
Commit graph

11097 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime Passos
0750d273a6 Attempt to use the PNG image's palette, if it is present 2020-09-10 03:16:21 -03:00
Jaime Passos
4e437076c1 Use color look-up table for PNG conversion 2020-09-10 02:10:31 -03:00
Jaime Passos
f24647dc4d Change method of color look-up table generation 2020-09-10 01:43:46 -03:00
GoldenTails
c61eeb9238 Can we just do this please? Thanks. 2020-09-09 22:19:14 -05:00
Bartu İnce
4be96e3ae4 Merge branch 'chain-attraction-homing' of https://git.magicalgirl.moe/ZipperQR/SRB2 into chain-attraction-homing 
# Conflicts:
#	src/p_user.c
 2020-09-08 03:08:35 +03:00
Bartu İnce
7e9bc0d103 no message 2020-09-08 03:03:48 +03:00
lachwright
efc82ffa74 Set additional UDMF parameters on objectplaced mapthings to defaults 2020-09-07 13:08:22 +09:30
lachwright
b805e10058 Let analog control schemes control objectplace like standard control schemes 2020-09-06 19:03:17 +09:30
lachwright
d7ab41a90b Objectplace improvements: 
- movement speeds are scaled with player scale
- spawned objects are scaled with player scale
- command accepts argument for thing num to set
 2020-09-06 17:28:34 +09:30
James R
ca9cf25423 Fix netid overflow check 2020-09-05 23:23:54 -07:00
GoldenTails
8ae5f3030f Remove BT_USE and PF_USEDOWN warning 
someone entertained the idea of maybe removing it, so might as well put this merge request up to see if people want it
 2020-09-06 00:30:05 -05:00
James R
4959aa5614 Merge branch 'credits-227' into 'next' 
Update credits

See merge request STJr/SRB2!1136
 2020-09-06 01:20:50 -04:00
James R
30057e9268 Start netid at 1 to avoid CV_FindNetVar returning a regular cvar for netid 0 2020-09-05 22:03:14 -07:00
James R
9a1099ec17 Update SuperPhanto's name with real name per request 2020-09-02 17:59:53 -07:00
James R
7bec06856f Add SuperPhanto to the art credits 2020-09-01 18:51:47 -07:00
James R
c7c9ae3847 Disable update alert if this is a prerelease 2020-09-01 16:22:29 -07:00
James R
4b7d16283d Update version to 2.2.7 RC1 2020-09-01 15:38:51 -07:00
James R
72437ae357 Define BETAVERSION as a suffix to the version string 2020-09-01 15:38:27 -07:00
James R
045a5d3dd1 Update patch.pk3 asset hash 2020-09-01 15:26:13 -07:00
SteelT
9393efc9cc Merge branch 'replace-purefat' into 'next' 
New STJR Intro and related changes (resolves #202)

Closes #202

See merge request STJr/SRB2!1132
 2020-09-01 15:00:48 -04:00
Steel Titanium
db6bd42eb1 Allow the game to continue even if the STARTUP lump is somehow missing 2020-09-01 14:46:03 -04:00
Steel Titanium
4509cd3798 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into replace-purefat 2020-09-01 13:54:27 -04:00
GoldenTails
4173b15c8e Expose V_GetStringColormap to Lua via v.getStringColormap(). 2020-09-01 10:47:02 -05:00
James R
b2226e95d6 Merge branch 'master' into next 2020-08-31 16:10:05 -07:00
James R
e593610862 Fix NOHW compiling 2020-08-31 16:09:41 -07:00
James R
6c2370f894 Kill NOHS 
(cherry picked from commit 3437b0690a3f4278e3ecc657102a126a3e2f3d13)
 2020-08-31 16:06:40 -07:00
James R
2aab765b36 Fix NOGME compiling 
(cherry picked from commit 0d57ba1d02c5bde2ab22a71d21a95849b21e9539)
 2020-08-31 16:04:09 -07:00
Steel Titanium
9a1d6e0db9 Fix some build errors 
(cherry picked from commit cb9004e4cfa94251ab0d31f19fee187fc4e9abcc)
 2020-08-29 18:08:41 -07:00
James R
679bfa21ed Fix stupid NONET 2020-08-29 17:51:59 -07:00
James R
a6e59cbb24 Do not do master server things when NOCURL 
(cherry picked from commit 7a05a8acf73ac0f012135339447c9a935e3b7939)
 2020-08-29 17:45:28 -07:00
James R
1f38db4629 C90? 2020-08-29 17:21:54 -07:00
Steel Titanium
b20352141e Fix compile error 2020-08-29 20:04:11 -04:00
Steel Titanium
0bd71d9980 Attempts to make the intro a bit more shorter 
Make the scene time be 5 seconds long max

Use the standard fade which is much shorter in length.
 2020-08-29 19:28:16 -04:00
James R
37c647c00e Merge remote-tracking branch 'origin/master' into next 2020-08-28 19:52:25 -07:00
James R
8d9b16df8c Merge branch 'makefile-detect-system' into 'master' 
Detect which system the Makefile is running on to compile for

See merge request STJr/SRB2!1123
 2020-08-28 22:49:34 -04:00
James R
89451d97fa Merge branch 'default-warningmode' into 'master' 
Use WARNINGMODE by default

See merge request STJr/SRB2!1122
 2020-08-28 22:49:24 -04:00
Steel Titanium
3ef8024697 Make the intro shorter as I felt it was a bit too long 
Change the code a bit so less magic numbers.
 2020-08-28 20:08:46 -04:00
Steel Titanium
4eaa7e969f Add new STARTUP lump, for the splash screen 2020-08-28 17:11:38 -04:00
Steel Titanium
a3039a781a New STJR Intro, replaces the old PURE FAT intro 2020-08-28 17:10:54 -04:00
GoldenTails
ca4ed3b7dd Make Special Stage map transitions respect nextmapoverride. 
In other words: lets Luas set the next map of Special Stages via G_SetCustomExitVars.
It's otherwise impossible to do so via Lua.
 2020-08-26 23:22:53 -05:00
Tatsuru
48d6ae8e53 Decolorize players as intended 2020-08-24 23:53:21 -03:00
Louis-Antoine
cb06d05692 Fix bonus items sometimes overriding apples in Snake minigame 2020-08-24 00:34:44 +02:00
Hannu Hanhi
dd7d1e40b1 Add tic and ui times to render stats 2020-08-23 20:09:55 +03:00
GoldenTails
d15be1696a Forgot to check if the file was important, whoops! 2020-08-21 04:00:54 -05:00
GoldenTails
2c5f23bacb Fix a bug where adding the same mod multiple times counted to the mod limit 
A one line fix. Seriously.
 2020-08-21 03:30:22 -05:00
James R
6f51c68c72 Makefile: add WINDOWSHELL=1 for the Windows detect 2020-08-20 20:19:50 -07:00
James R
e340d74e4d Merge branch 'ringslinger-penalty-snap' into 'next' 
Fix Ringslinger weapon ring penalty missnapment

See merge request STJr/SRB2!1120
 2020-08-19 18:18:15 -04:00
James R
38d094d3f6 Merge branch 'fix-file-downloading' into 'next' 
Fix bug where SRB2 would check size of disk from current directory instead of srb2home

See merge request STJr/SRB2!1121
 2020-08-19 18:16:22 -04:00
James R
809ff5c467 Merge branch 'oops-http-mserv' into 'next' 
Fix lingering issues with the http-mserv merge

See merge request STJr/SRB2!1117
 2020-08-19 18:12:38 -04:00
James R
f92026f98b Makefile: automatically detect system to compile for, if no system was specified 
This should work for mingw and linux so far.
 2020-08-18 18:01:59 -07:00