stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 01:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity
12348 commits 174 branches 41 tags 300 MiB
Commit graph

12348 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tatsuru
59e1706f5c Merge branch 'png-trans-fix' into 'next' 
Fix issue with png_get_tRNS

See merge request STJr/SRB2!1606
 2021-09-12 20:30:36 +00:00
Tatsuru
7a53b242b6 Merge branch 'develop-fix' into 'next' 
Add VERSIONSTRING_RC to DEVELOP builds for compiler compatibility

Closes #663

See merge request STJr/SRB2!1607
 2021-09-12 20:29:02 +00:00
Tatsuru
9016b5cf7c Merge branch 'playercontroldirection' into 'next' 
Remove camera dependency from P_GetPlayerControlDirection

Closes #183

See merge request STJr/SRB2!1512
 2021-09-12 20:27:42 +00:00
Tatsuru
0781b91de5 Merge branch 'fix-archiving-error-msg' into 'next' 
Fix incorrect error message during Lua archiving

See merge request STJr/SRB2!1593
 2021-09-12 20:27:17 +00:00
Tatsuru
bcd7468d25 Merge branch 'lua-camera' into 'next' 
Allow Lua write access to camera_t variables & expose the cameras globally

See merge request STJr/SRB2!1581
 2021-09-12 20:20:49 +00:00
SteelT
f62064d4ba Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into next 2021-09-12 16:18:26 -04:00
Tatsuru
bff2106016 Merge branch 'even-more-slope-copying' into 'next' 
Add flag to line slopes for even more slope copying

See merge request STJr/SRB2!1550
 2021-09-12 20:16:52 +00:00
SteelT
e2ea480af9 Merge branch 'master' into next 2021-09-12 15:46:32 -04:00
SteelT
a822de5ffc Merge branch 'fix-gme-disabled' into 'master' 
Fix gme support being effectively disabled

See merge request STJr/SRB2!1586
 2021-09-11 15:05:34 +00:00
Tatsuru
8aee7fcbce Merge branch 'floorsprite-fix' into 'next' 
Fix #649

Closes #649

See merge request STJr/SRB2!1604
 2021-09-11 15:00:14 +00:00
Tatsuru
6ed063dcce Merge branch 'polish-lua-inputs' into 'next' 
Polish the Lua input library

See merge request STJr/SRB2!1598
 2021-09-11 14:59:41 +00:00
Tatsuru
033c661431 Merge branch 'folder' into 'next' 
Implement folder loading

See merge request STJr/SRB2!1568
 2021-09-10 17:10:26 +00:00
Tatsuru
2eed4a9265 Merge branch 'sunbehindcloud' into 'next' 
Refactor weather switching (fixes #541)

Closes #541

See merge request STJr/SRB2!1498
 2021-09-10 17:00:44 +00:00
katsy
50fe45efe6 Refactor weather switching (fixes #541) 2021-09-10 17:00:43 +00:00
Tatsuru
eec765749b Merge branch 'drawcroppedpatch-improvements' into 'next' 
V_DrawCroppedPatch(...) Lua exposure and improvements

See merge request STJr/SRB2!1316
 2021-09-10 16:14:38 +00:00
Tatsuru
ce98758bd6 Merge branch 'equationslopes' into 'next' 
Add generalized slopes in UDMF

See merge request STJr/SRB2!1530
 2021-09-09 22:12:18 +00:00
SteelT
2578e01cfb Merge branch 'writable-colormaps' into 'next' 
Make the colormap returned by v.getColormap() writable.

See merge request STJr/SRB2!959
 2021-09-05 21:07:10 +00:00
James R
1af05afb0e Merge branch 'better-gcc-check' into 'master' 
Makefile: Improve gcc detection

See merge request STJr/SRB2!1608
 2021-09-04 00:43:16 +00:00
James R
c1458aa6c7 Merge branch 'master' into next 2021-09-03 17:15:53 -07:00
James R
8e0831a183 Fix unused variable warning under NOPNG 2021-09-03 17:15:36 -07:00
James R
cf30fd1bd7 Merge branch 's' into 'next' 
Make next compile again

See merge request STJr/SRB2!1611
 2021-08-31 23:47:26 +00:00
namishere
39bd9c6da8 Make next compile again 2021-08-30 23:18:25 -07:00
SteelT
4c20dd7350 Merge branch 'james-but-full' into 'next' 
Add my full name in the credits

See merge request STJr/SRB2!1610
 2021-08-31 06:09:42 +00:00
James R
f4f7af6f6d Add my full name 2021-08-30 18:40:36 -07:00
GoldenTails
1a8ec7975c Makefile: Improve gcc detection 
Wasn't working for me until I fixed it.
Turns out gcc really doesn't like giving its name out.
Most of the time it reads argv[0].
 2021-08-28 15:39:34 -05:00
Shane Ellis
b73c24a0c5 Add VERSIONSTRING_RC to DEVELOP builds for compiler compatibility 2021-08-28 17:14:36 +00:00
Jaime Ita Passos
3ff8d9d3b1 Fix issue with png_get_tRNS 
This fixes an oversight where the return value of png_get_tRNS was
being ignored.
 2021-08-26 13:37:52 -03:00
Jaime Ita Passos
450955cba2 Fix floor sprite projection 2021-08-26 13:22:32 -03:00
Shane Ellis
ccc71ddafc Merge branch 'addplayer' into 'next' 
Multiplayer Bot Features (aka AddPlayer)

See merge request STJr/SRB2!1383
 2021-08-25 21:38:37 +00:00
LJ Sonic
9b7263855e Prevent input.setMouseGrab from interfering with window focus 2021-08-18 20:58:13 +02:00
sphere
4309b592f8 Merge branch 'shiny' into 'next' 
Give Coins drop shadows

See merge request STJr/SRB2!1591
 2021-08-17 13:09:53 +00:00
LJ Sonic
5340db5f67 Make gc_ constants uppercase 2021-08-15 16:15:28 +02:00
LJ Sonic
772695741c Rename KeyNumToString to KeyNumToName and vice-versa 2021-08-15 15:24:23 +02:00
James R
3b6d8eca83 Merge branch 'master' into next 2021-08-14 15:34:52 -07:00
James R
824b1ab28c Makefile: use full stem in dependency generation 
Previously took only the filename, so the directory
component was stripped. This broke dependencies for
basically every file.
 2021-08-14 15:29:21 -07:00
LJ Sonic
5bc0ce7a62 Give fields in event_t better names 2021-08-14 23:42:39 +02:00
LJ Sonic
c2907b89f7 Pass a keyevent_t userdatum to key hooks 2021-08-14 20:34:59 +02:00
LJ Sonic
5b949a6751 Expose keyevent_t to Lua 2021-08-14 20:33:42 +02:00
LJ Sonic
38e82e55fc Add a "repeated" field to event_t 2021-08-14 20:33:20 +02:00
LJ Sonic
8adf4b672a Put Lua input library in its own namespace 2021-08-13 22:34:36 +02:00
LJ Sonic
6403a38c72 Fix again 2021-08-10 01:48:26 +02:00
LJ Sonic
a9b35a6f7a Fix incorrect error message during Lua archiving 2021-08-10 00:15:44 +02:00
SMS Alfredo
2d218859ff Give coins a drop shadow 2021-08-06 23:25:19 -05:00
sphere
1d92456ad5 Merge branch 'gl-texfmt-p8-ap88-a8-ai8-fix' into 'next' 
Fix #492

Closes #492

See merge request STJr/SRB2!1431
 2021-08-02 13:10:32 +00:00
sphere
ab044a270b Merge branch 'nolua-alias' into 'next' 
Fix console aliases bypassing CV_NOLUA

Closes #619

See merge request STJr/SRB2!1573
 2021-08-02 13:09:12 +00:00
sphere
198127dd6f Merge branch 'demos-revert-netvars' into 'next' 
Revert netvars to user value after demo finishes playback

See merge request STJr/SRB2!1578
 2021-08-02 13:08:43 +00:00
Lach
6cf4f79bab Merge branch 'zmovement-remove-fix' into 'next' 
Fix for #551

See merge request STJr/SRB2!1590
 2021-08-02 02:01:45 +00:00
Monster Iestyn
df99cde40f mo not mobj! 2021-07-31 22:11:44 +01:00
Monster Iestyn
7dddc631d7 P_ZMovement: add a P_MobjWasRemoved check after P_CheckPosition, so we can bail out if the mobj was removed (by Lua most likely) 2021-07-31 21:14:48 +01:00
lachablock
434b119ccf Merge remote-tracking branch 'origin/next' into playercontroldirection 2021-07-28 11:55:12 +10:00