stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-03 07:41:32 +00:00
Code Issues Projects Releases Packages Wiki Activity
9789 commits 174 branches 42 tags 257 MiB
Commit graph

9789 commits

This branch
This branch
All branches
Author SHA1 Message Date
fickleheart
021ca92019 Expose stoppedclock to Lua 2020-02-10 00:07:01 -06:00
Steel Titanium
4281de3b89 Update file hashes 2020-02-09 21:29:46 -05:00
Steel Titanium
13e5911de7 Merge branch 'next' into 2.2.1-prep 2020-02-09 20:30:48 -05:00
fickleheart
19cdb002ab More fixes for titlecard option stuff 2020-02-09 17:53:50 -06:00
Monster Iestyn
e5a325994e Use the provided Regex strings to properly turn the entire info.h states/mobjtypes lists into strings for dehacked.c 
...it's surprising what we actually missed in the states list, apart from just the missing state (yes this makes the states fix branch redundant)
 2020-02-09 19:15:04 +00:00
Jaime Passos
d0d7fd1589 Don't add a TOL_ twice. 2020-02-09 16:11:52 -03:00
Alam Ed Arias
1d2f6c9581 Merge branch 'master' into next 2020-02-09 10:37:10 -05:00
Alam Ed Arias
15c263e9c7 Z_Zone: fixup Valgrind support 2020-02-09 10:35:23 -05:00
Jaime Passos
2162cbd794 Merge branch 'customgametypeswtf' into 'next' 
Fix broken GT_ constants with custom gametypes

See merge request STJr/SRB2!769
 2020-02-08 23:17:35 -05:00
Jaime Passos
2d0e72d756 Fix broken GT_ constants with custom gametypes 2020-02-08 21:40:30 -03:00
SteelT
69c2dc743b Merge branch 'credits-stuff' into 'next' 
Update credits again

See merge request STJr/SRB2!760
 2020-02-08 19:25:46 -05:00
Jaime Passos
598daac093 allow models for skin/sprites with same name 2020-02-08 20:44:43 -03:00
Jaime Passos
81a2a9e912 fix crash 2020-02-08 20:38:37 -03:00
Jaime Passos
7cfc8d022e allow models for skin/sprites with same name 2020-02-08 20:29:28 -03:00
Jaime Passos
5e516eb98d 1 left shifted by zero is still 1 2020-02-08 18:50:05 -03:00
Jaime Passos
384f5af1f8 move hw texture used to be always below. 2020-02-08 18:27:44 -03:00
Jaime Passos
9bc0592e56 don't free pu_cache. 2020-02-08 18:23:37 -03:00
Jaime Passos
b38f336dc5 why does this still exist? 2020-02-08 18:19:27 -03:00
Jaime Passos
d633435cd6 i'm not paying too much attention, am i. 2020-02-08 18:08:56 -03:00
Jaime Passos
e157391387 split r_isviewpointfirstperson 2020-02-08 17:49:27 -03:00
Jaime Passos
11e6cf0ade add "third person only" option to gr_shearing. 2020-02-08 17:42:26 -03:00
fickleheart
fed8167a81 Allow more options for when the titlecard shows up 2020-02-08 11:13:40 -06:00
lachwright
7a5d7afb30 Add Rob as the game's producer 2020-02-06 23:06:15 +08:00
Steel Titanium
d03d09f397 Update credits again 2020-02-05 15:20:35 -05:00
Monster Iestyn
f1bdaa2fda Updated version number to 2.2.1, increment MODVERSION. 
Also updated CMakeLists.txt, appveyor.yml and this one Xcode project file as usual
 2020-02-05 19:55:40 +00:00
James R
7805828c4a Merge remote-tracking branch 'origin/master' into next 2020-02-04 14:31:21 -08:00
colette
01433c3648 Fix title/card hud hooks grabbing the wrong functions 2020-02-03 23:09:18 -05:00
James R
700d9426d4 Merge branch 'name-stuck' into 'master' 
Fix game hanging on server creation/splitscreen if your name is whack

See merge request STJr/SRB2!752
 2020-02-03 03:49:13 -05:00
Jaime Passos
d1e8744583 What 2020-02-03 02:24:22 -03:00
Jaime Passos
af66a2e5fa Restore some functionality that went missing 2020-02-03 02:12:55 -03:00
Jaime Passos
520e2148fe Merge remote-tracking branch 'origin/master' into local-color-table 2020-02-03 01:52:43 -03:00
Jaime Passos
90eb6a6011 Merge remote-tracking branch 'tehrealsalt/oglshaderport' into sal-oglshaderport 2020-02-03 01:17:26 -03:00
James R
bd90c20366 Turn the shadow scale if-else into a switch statement, for sake of editing and in case object types ever change 💦 2020-02-02 18:00:02 -08:00
James R
f8310236e0 Merge branch 'folder-blacklist' into 'public_next' 
Implement folder blacklisting

See merge request STJr/SRB2Internal!626
 2020-02-02 20:35:51 -05:00
Steel Titanium
1794949696
Add empty entry 2020-02-02 18:52:41 -05:00
Sally Cochenour
33a75fcd30 Remove blend to black 2020-02-02 07:28:31 -05:00
Sally Cochenour
8305d65768 Drop shadows closer to software 2020-02-02 07:28:31 -05:00
Sally Cochenour
07b2a5aca8 FIX COLOR BUG 2020-02-02 07:28:31 -05:00
James R
57492347ed Don't I_Error on startup files only if a file was added twice 2020-02-01 19:32:08 -08:00
James R
5a524f21da Merge branch 'starpost-config-additions' into 'next' 
Starpost config additions

See merge request STJr/SRB2!680
 2020-02-01 21:42:43 -05:00
James R
ce3a79e51a Merge branch 'bruh2' into 'master' 
Fix fuckup 2

See merge request STJr/SRB2!744
 2020-02-01 21:42:21 -05:00
James R
ec995d620f Merge branch 'rotsprite-memory-leak' into 'next' 
Fix memory leak when caching rotsprite

See merge request STJr/SRB2!745
 2020-02-01 21:42:12 -05:00
James R
c069cf94bc Merge branch 'tnt-is-laggy' into 'next' 
Make flying TNTs' explosions not so laggy the first time

See merge request STJr/SRB2!746
 2020-02-01 21:41:59 -05:00
James R
52c1e73035 Merge branch 'platform-fixes' into 'next' 
Reset pmomz after applying it to momz

See merge request STJr/SRB2!747
 2020-02-01 21:41:49 -05:00
James R
5c8406f6d7 Merge branch 'protect-wrists' into 'next' 
Remove flight cutoff property

See merge request STJr/SRB2!748
 2020-02-01 21:41:33 -05:00
James R
c46d9a1b87 Merge branch 'file-param-error' into 'master' 
Don't I_Error if non base files fail to load with -file

See merge request STJr/SRB2!678
 2020-02-01 21:41:22 -05:00
James R
d5ced42f06 Remove Player 0 2020-02-01 18:22:03 -08:00
James R
bf3b7fc5b0 Clean player name before joining!!! 2020-02-01 18:20:35 -08:00
James R
ab8eed6efb Add missing conditions to CleanupPlayerName 2020-02-01 18:11:41 -08:00
Jaime Passos
68f4d415fe Merge remote-tracking branch 'origin/next' into sal-oglshaderport 2020-02-01 23:02:15 -03:00