thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-03-02 09:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5647 commits 2 branches 14 tags 206 MiB
Commit graph

5647 commits

This branch
This branch
All branches
Author SHA1 Message Date
Monster Iestyn
6da3914eca Turns out the consts ARE needed after all, also fix some other errors the compiler reported 2019-02-13 18:20:26 +00:00
Monster Iestyn
9a17e22af2 Merge branch 'master' into opengl-new-patch-features-support 2019-02-13 18:08:17 +00:00
Monster Iestyn
2ef1d63b63 Fix compiler warnings 2019-02-13 18:06:56 +00:00
Monster Iestyn
04d1313a8d blockmodulo and bpp do not need to be args of HWR_DrawPatchInCache 2019-02-13 17:27:20 +00:00
Monster Iestyn
65add2dc60 whoops, removed some variables I shouldn't have, so I've added them back 2019-02-13 16:52:51 +00:00
Monster Iestyn
01fd861deb Split the column caching code of HWR_DrawPatchInCache into a new function, HWR_DrawColumnInCache. This should make modifying the OpenGL caching code look a little less daunting, hopefully. 
I also removed some "const"s for now, since I wasn't sure if they were needed or even correct to use or not here... if they're fine I could add them back later though.

(Note: I have not tested if this compiles yet)
 2019-02-13 16:39:37 +00:00
MascaraSnake
edea95c55b Merge branch 'emblem_hardcoding' into 'master' 
Emblem and unlockable softcoding

See merge request STJr/SRB2Internal!210
 2019-02-06 02:24:56 -05:00
MascaraSnake
a0a3a8b4e0 Forgot the continue statements 2019-02-03 17:07:13 +01:00
MascaraSnake
a4dc3faf45 Emblem number in emblem definition is optional. If none is supplied, place in first free slot. 2019-02-03 17:03:33 +01:00
MascaraSnake
3c0cb14a29 In-map emblem coordinates are now set via emblem mapthings (thing type 322) instead of X/Y/Z fields in SOC 2019-02-03 14:32:07 +01:00
MascaraSnake
3ea09d4ffe Emblem and unlockable SOFTcoding! Emblems and unlockables are no longer predefined in the code and instead loaded from IWAD 2019-02-03 11:05:22 +01:00
MascaraSnake
0c3351cc5d Hardcoded emblems of the first four special stages 2019-01-30 23:01:58 +01:00
MascaraSnake
f5ff2b331a Spring Hill -> Christmas Chime 2019-01-29 22:26:15 +01:00
MascaraSnake
97476b6300 Updated/added emblem locations for GFZ, THZ, DSZ1, CEZ1, FHZ2 and HHZ 2019-01-28 21:28:38 +01:00
Digiku
96f10f1f98 Merge branch 'master-20190101' into 'master' 
Post-2.1.23 public next merge (20190101)

Closes #46, #47, #45, #43, and #37

See merge request STJr/SRB2Internal!209
 2019-01-11 18:09:30 -05:00
Monster Iestyn
74cb384be2 revert to LF_SAVEGAME system code, removing all traces of saveoverride 
(I believe Sal wanted us to do this anyway, so...)
 2019-01-08 17:14:21 +00:00
mazmazz
3753e1be28 Fixed Addons Menu icons for search bar 2019-01-08 01:31:44 -05:00
mazmazz
6ae27013f2 Misssed alwaysfreelook defaults (first person) 2019-01-08 01:29:12 -05:00
mazmazz
58b3b6d236 Fix player.dta SIGNA0 overwriting regular end sign frame 2019-01-08 00:19:42 -05:00
mazmazz
8d930c7f47 GCC 7 fallthru bypasses (-Werror-implicit-fallthrough) 2019-01-07 23:06:47 -05:00
mazmazz
e5125d0746 Chat arrow offsets 2019-01-07 22:34:48 -05:00
mazmazz
1821edeee7 Update SRB2-CHAT nickname colors to 2.2 skincolors 2019-01-07 22:26:39 -05:00
mazmazz
275070b608 Correct addons menu back color 2019-01-07 21:58:42 -05:00
mazmazz
7a97ebe985 Dummy out SRB2-CHAT console colors 
Pending translation to 2.2 palette indexes
 2019-01-07 21:54:38 -05:00
mazmazz
95c2f34278 Addons menu merge fixes 2019-01-07 21:45:41 -05:00
mazmazz
38ad1ec027 WIP hu_stuff merge fixes 2019-01-07 17:56:55 -05:00
mazmazz
a436313987 Menu merge fixes 2019-01-07 17:56:43 -05:00
mazmazz
4f40d2abdb Merge errors for compile 2019-01-07 17:05:20 -05:00
mazmazz
1de7fcad8d Resolve r_data.c colormap conflict 2019-01-07 15:29:37 -05:00
Nev3r
6acdc428f7 Solved conflicts related to PK3s 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-01-07 19:00:31 +01:00
Monster Iestyn
69d7927ee8 resolve the conflict in p_spec.c 2019-01-07 17:02:05 +00:00
Monster Iestyn
d4d30e9e9c resolve conflict in r_main.c 2019-01-07 16:52:46 +00:00
mazmazz
c4fcdbf687 Resolve p_setup and d_netcmd conflicts (20190101 public merge) 2019-01-07 03:07:24 -05:00
mazmazz
78d631f5da Resolved filesrch.c conflicts (20190101 public merge) 2019-01-07 02:54:26 -05:00
mazmazz
1dd464b17d Resolve m_menu.c conflicts (20190101 public merge) 2019-01-07 02:31:45 -05:00
mazmazz
81352aece1 WIP 20190101 merge 
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
 2019-01-02 01:09:15 -05:00
Alam Ed Arias
13e3a975d8 Merge branch 'master' into next 2019-01-01 23:00:39 -05:00
Digiku
764e6e7659 Merge branch 'expanded-nmuslist' into 'next' 
Expand NMUSList to include HUD changes

See merge request STJr/SRB2!388
 2019-01-01 15:06:04 -05:00
Digiku
4560b4cb41 Merge branch 'caps-lock-consistency-fix' into 'master' 
Update capslock state on window re-focus

See merge request STJr/SRB2!436
 2019-01-01 15:05:20 -05:00
Digiku
5149fb7d66 Merge branch 'appveyor-installer-revise' into 'master' 
Make AppVeyor installer paths consistent with Travis installer paths

See merge request STJr/SRB2!446
 2019-01-01 11:52:42 -05:00
mazmazz
7d66f912d0 Make AppVeyor installer paths consistent with Travis installer paths(assets/deployer/installer -> assets/installer) 2019-01-01 11:51:17 -05:00
Digiku
80dc98624b Merge branch 'mingw-64bit-cpu-target-revise' into 'master' 
MinGW64:Target nocona for 64-bit builds [revision]

See merge request STJr/SRB2!440
 2019-01-01 11:15:34 -05:00
Digiku
2374750d3c Merge branch 'appveyor-64' into 'mingw-64bit-cpu-target-revise' 
Add 64-bit job to Appveyor

See merge request STJr/SRB2!442
 2019-01-01 10:14:37 -05:00
Digiku
f2aa86cab2 Merge branch 'appveyor-deployer' into 'appveyor-64' 
Add Windows installer building to AppVeyor

See merge request STJr/SRB2!443
 2019-01-01 10:14:25 -05:00
mazmazz
77eea3c41d Use optional asset archive instead of file 2018-12-31 17:31:25 -05:00
mazmazz
262dc5dac6 Rename ASSET_PATCH_DLL_GET to PACKAGE_PATCH_DLL_GET 2018-12-30 10:43:17 -05:00
mazmazz
8591455701 Implement install building for appveyor (deployer) 2018-12-30 03:42:55 -05:00
mazmazz
d36fc9f854 Merge branch 'mingw-64bit-cpu-target-revise' into appveyor-64 2018-12-29 23:46:16 -05:00
mazmazz
657f6c75c8 Add 64-bit DD buildbot 2018-12-29 23:16:08 -05:00
mazmazz
555be9c76f Consolidate [%CONFIGURATION%] == [SDL64] into %X86_64% 2018-12-29 23:15:09 -05:00