stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-23 11:10:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
13721 commits 172 branches 41 tags 285 MiB
Commit graph

13721 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alam Ed Arias
4e1976839b Cleanup whitespace changes from SRB2_release_2.1.25 2022-11-11 21:19:28 -05:00
Alam Ed Arias
ebf70a6f0c cleanup whitespace in CircleCI build config 2022-11-11 21:19:27 -05:00
Alam Ed Arias
46186d7632 Cleanup whitespace changes from SRB2_release_2.2.2 2022-11-11 21:19:26 -05:00
Alam Ed Arias
0c006dccdf Cleanup whitespace changes from SRB2_release_2.2.6 2022-11-11 21:19:26 -05:00
Alam Ed Arias
7e0fa2d34c Cleanup whitespace changes from SRB2_release_2.2.9 2022-11-11 21:19:25 -05:00
Alam Ed Arias
6445ef3b70 Update .gitignore 
Ignore CMake's build folders
 2022-11-11 21:19:14 -05:00
Alam Arias
1b5dd687d2 Cleanup whitespace changes from master branch 2022-11-11 20:31:41 -05:00
Alam Arias
ae112a3728 Update hu_stuff.c 
Fix NONET build
 2022-11-11 20:21:30 -05:00
James R
04855a85dc Use angle between viewz and mobj z to determine splat sprite angle 2022-11-11 17:35:31 -06:00
James R
877d5450d5 Use interpolated mobj x/y/z/angle for splats 
# Conflicts:
#	src/hardware/hw_main.c
#	src/r_things.c
 2022-11-11 17:35:27 -06:00
Eidolon
7f913b5ace Merge branch 'registervar-sanity' into 'next' 
Plug up some holes with lib_cvRegisterVar

Closes #441

See merge request STJr/SRB2!1823
 2022-11-10 15:21:29 +00:00
Eidolon
e8a6026c56 Merge branch 'circleci' into 'master' 
CircleCi: update buildbot config

See merge request STJr/SRB2!1836
 2022-11-10 15:12:45 +00:00
Alam Ed Arias
647f8c81e4 CircleCi: update buildbot config 2022-11-10 15:12:45 +00:00
Eidolon
0f406b8b8d Merge branch 'udmf-fof-brightness' into 'next' 
HWR transparent FoF plane brightness

See merge request STJr/SRB2!1857
 2022-11-10 15:05:49 +00:00
Monster Iestyn
6a6d92a824 Update credits 2022-11-10 14:08:11 +00:00
Eidolon
07665ae502 hwr: Use UDMF FOF_SPLAT for splat flats and walls 2022-11-09 17:40:43 -06:00
Eidolon
0f2fe5983e hwr: Use lightlevel on transparent planes 2022-11-09 17:31:49 -06:00
Eidolon
12c2ddb115 Merge branch 'uncappedrevengeance' into next 
Uncapped

See merge request STJr/SRB2!1856

# Conflicts:
#	src/dummy/i_system.c
#	src/win32/win_sys.c
 2022-11-08 21:13:50 -06:00
Eidolon
3597957af1 Merge branch 'cmake-zlib-internalized' into 'next' 
cmake: build zlib manually in internal build

See merge request STJr/SRB2!1856
 2022-11-09 02:30:35 +00:00
Eidolon
98371df7fc Merge branch 'cmake-misc-options' into 'next' 
cmake: Port misc options from Makefiles

See merge request STJr/SRB2!1855
 2022-11-09 02:02:51 +00:00
Eidolon
e265adf53f cmake: disallow in-source builds 2022-11-08 19:36:40 -06:00
Eidolon
54bfed1bcd cmake: gitignore /build 
Too common of a build pattern to ignore
 2022-11-08 19:30:23 -06:00
Eidolon
c1023b54ee cmake: disable debug symbols for openmpt 2022-11-08 19:28:12 -06:00
Eidolon
4037d04994 cmake: copy build shared internal libs to bin/ 2022-11-08 19:21:21 -06:00
Eidolon
f460e82b12 cmake: link Rpcrt4 (for uuid) to openmpt on win32 2022-11-08 19:01:33 -06:00
Eidolon
6d1a3bfce0 Reset camera when moving player to spawn/starpost 2022-11-08 18:48:50 -06:00
James R
dc1beb8e5b Fix buffer overflow when pasting into chat 2022-11-07 22:35:18 -06:00
Eidolon
62b142f136 Uncap room list ellipsis animation 2022-11-07 20:08:33 -06:00
Eidolon
3c5855b64a Uncap sound test 2022-11-07 19:48:42 -06:00
Eidolon
4a580558f0 Tweak showfps alignment 2022-11-07 18:50:23 -06:00
toaster
0cd3629d00 Explicit pointer cast for R_InterpolatePrecipMobjState 2022-11-07 18:17:45 -06:00
Eidolon
5f6c56cf36 Use precip interp if gl sprite is for precip 2022-11-07 18:17:45 -06:00
Eidolon
4a3dfae2a3 cmake: build zlib manually in internal build 2022-11-07 17:51:37 -06:00
Eidolon
64e063d4dc cmake: Port misc options from Makefiles 
- DEBUGMODE
- MOBJCONSISTANCY
- PACKETDROP
- ZDEBUG
- PROFILEMODE (likely moot, dunno how profiling with cmake works
though)
 2022-11-06 14:03:02 -06:00
Eidolon
00179e44ed Merge branch 'cmake-warning-config' into 'next' 
cmake: Port warning configuration from make

See merge request STJr/SRB2!1844
 2022-11-06 16:12:22 +00:00
Eidolon
106d115c3e cmake: Port warning configuration from make 
Adds SRB2_CONFIG_ERRORMODE to replace ERRORMODE too.
 2022-11-06 10:11:51 -06:00
Eidolon
0b4ceeb73b Merge branch 'scroller-fix' into 'next' 
Add_Scroller: Don't call IsSector3DBlock if affectee is a side

Closes #898

See merge request STJr/SRB2!1852
 2022-11-06 16:08:22 +00:00
Eidolon
e23be4eaed Merge branch 'spindash-platform-fix' into 'next' 
Fix typo in rising FOF binary-to-UDMF conversion

See merge request STJr/SRB2!1853
 2022-11-06 16:05:46 +00:00
Eidolon
0348156dd0 Merge branch 'cmake-no-md5-assets' into 'next' 
cmake: Remove asset hashing, CMAKE_ASSETS_DIR

See merge request STJr/SRB2!1847
 2022-11-06 15:54:25 +00:00
MascaraSnake
812e154638 Fix typo in rising FOF binary-to-UDMF conversion 2022-11-06 07:52:54 +01:00
MascaraSnake
a5a7b20d95 Add_Scroller: Don't call IsSector3DBlock if affectee is a side 2022-11-06 07:48:05 +01:00
Eidolon
90b4f8720e cmake: Remove asset hashing, CMAKE_ASSETS_DIR 
Simplifies build setup for cmake.
 2022-11-05 23:56:43 -05:00
Eidolon
2e9260c83c Merge branch 'cmake-thelartians-ccache' into 'next' 
cmake: Use TheLartians' Ccache script

See merge request STJr/SRB2!1850
 2022-11-06 04:38:55 +00:00
Eidolon
036d5cce40 cmake: Use TheLartians' Ccache script on non-Win32 
Improves ccache support for Xcode
 2022-11-05 23:30:12 -05:00
Monster Iestyn
b637df4ce0 removed a name from credits by request 2022-11-05 17:00:51 -05:00
Monster Iestyn
67fb09ec0d removed a name from credits by request 2022-11-05 21:20:53 +00:00
Eidolon
ce5c41d7eb Merge branch 'the-one-cmake' into 'next' 
Overhaul cmake build

See merge request STJr/SRB2!1832

(cherry picked from commit 4337205fa8)

# Conflicts:
#	src/sdl/CMakeLists.txt
 2022-11-05 03:09:38 -05:00
Eidolon
4337205fa8 Merge branch 'the-one-cmake' into 'next' 
Overhaul cmake build

See merge request STJr/SRB2!1832
 2022-11-05 05:14:32 +00:00
Eidolon
a015be2a54 cmake: Build all deps and static link 2022-11-05 00:12:09 -05:00
Eidolon
9277870fa2 Merge branch 'cmake-develop-flag' into 'next' 
cmake: Add SRB2_CONFIG_DEV_BUILD

See merge request STJr/SRB2!1837

(cherry picked from commit 896a7609a7)

518cb0b3 cmake: Add SRB2_CONFIG_DEV_BUILD
 2022-11-04 23:11:49 -04:00