Commit graph

14198 commits

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
cbc5cc3b2a Fix GCC 11 array-bounds warning in P_SetupStateAnimation
Removing inline here silences the warning somehow, it
could be a GCC bug?
2021-09-03 17:18:00 -07: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
b2fe36fe5b Add back address resolution test
Mistakenly removed by a1a58143e
2021-09-03 16:49:42 -07:00
James R
39fdbac2ac Only test -noipv6 if enabled at compile time 2021-09-03 16:41:08 -07:00
GoldenTails
1639676e8d Actually free the drawnstr pointer after we're done using it.
It probably was like this originally because past Golden was confused about why free was throwing errors :P
2021-09-03 09:14:04 -05:00
GoldenTails
f0bee67d6e Remove unused static-alloc drawnstr, rename drawnstrptr to drawnstr. 2021-09-03 09:03:46 -05:00
GoldenTails
7e3a6bd44c Increase Connect via IP textbox width and have shorten and truncate the text as necessary 2021-09-03 09:03:46 -05:00
James R
46a5ce4325 Only restrict master server connection to IPv4 if -noipv6 2021-09-01 18:43:08 -07:00
James R
31943f30a1 Support connecting by IPv6 address in the menu
Font will shrink once exceeding a certain number of
characters.
2021-09-01 18:32:18 -07:00
James R
7976d0476d Enbiglarge ip field of server list to fit IPv6 addresses 2021-09-01 18:02:39 -07:00
James R
c9631565d6 Fix address structure handling in UDP_Bind
Fixed instances of copying only sizeof (struct sockaddr)
bytes (not enough for struct sockaddr_in6), as well as
trying to getsockname into an insufficient buffer.
2021-09-01 17:38:47 -07:00
James R
32ad1f2067 Make IPv6 default
An IPv4 socket is still made. The '-ipv6' parameter is
replaced with '-noipv6', self explanatory.
2021-08-31 20:02:09 -07:00
James R
44bafe0a32 Remove debug print 2021-08-31 20:00:20 -07:00
James R
0422870df8 Use RFC2732 notation for IPv6 addresses
This fixes keepbody and the connect command (also
'-connect' parameter).

connect ::1
connect [::1]:5029
2021-08-31 19:54:27 -07:00
James R
f8a749be09 Correctly set IPV6_V6ONLY
setsockopt level for v6 options is IPPROTO_IPV6.
2021-08-31 19:03:23 -07:00
James R
a1a58143ec Fix IPv6 address checks
- SOCK_cmpaddr returned inverted truth for IPv6 addresses.
  This would prevent making a connection.
- Account for IPv6 address resolution. (bug: 5a627482)
2021-08-31 19:00:05 -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
GoldenTails
72bf2a9897 Add angle field to linedef_t 2021-08-24 03:13:18 -05:00
SteelT
4a6acc2c8d Fix metal recordings not being saved in srb2home 2021-08-22 16:13:40 -04: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