James R
|
42dbe3d1a1
|
Also allocate mipmap for MD2
(cherry picked from commit 99cd5161becec131099c64dddd2be6beafb538cc)
|
2020-04-11 22:10:05 -07:00 |
|
James R
|
79d93b86ca
|
Fix nonpacked to packed cast for OpenGL
(cherry picked from commit d2a7a87c7f39bd423fde7f8b4228082d12839583)
|
2020-04-11 22:10:05 -07:00 |
|
James R
|
4890397b6e
|
Fix misaligned pointers
(cherry picked from commit ceb8d298c2ae9a6000fa4d22e381085c6bf77cd6)
|
2020-04-11 22:03:29 -07:00 |
|
Wolfy
|
5e4ec61d82
|
Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix
# Conflicts:
# src/hardware/hw_cache.c
# src/hardware/hw_draw.c
# src/hardware/hw_glob.h
# src/hardware/hw_main.c
# src/r_bsp.h
# src/r_data.c
|
2020-04-11 23:47:25 -05:00 |
|
Hannu Hanhi
|
6bf90fc441
|
Batching!
|
2020-04-12 03:09:07 +03:00 |
|
Hannu Hanhi
|
bba15645fb
|
Don't destroy my config file
|
2020-04-12 02:18:12 +03:00 |
|
Hannu Hanhi
|
fb6ffd08c7
|
Fix comment
|
2020-04-11 13:27:18 -05:00 |
|
Hannu Hanhi
|
edc87fbed9
|
Don't repeatedly look for texture files that don't exist. This fixes performance issues with models.
|
2020-04-11 13:27:17 -05:00 |
|
Sal
|
71b6c44af0
|
Merge branch 'spb-shit' into 'master'
Fix item distances underflowing in rare instances due to order of operations
See merge request KartKrew/Kart!235
|
2020-04-10 13:51:27 -04:00 |
|
wolfs
|
b6ca16a723
|
Merge branch 'fix-chat-draw-leak' into 'awful-mix'
Chat drawing memory leak fix from SRB2 repo
See merge request SinnamonLat/Kart-Public!4
|
2020-04-10 09:28:08 -04:00 |
|
Sally Cochenour
|
8b5bd645ca
|
See if cleaning the pointer here fixes shrink/eggbox syncbombs
|
2020-04-09 22:57:05 -04:00 |
|
Sally Cochenour
|
9b4e10d5d7
|
Item dropping code cleanup
|
2020-04-09 22:56:31 -04:00 |
|
fickleheart
|
1844aa1445
|
Make a separate function instead of clogging up IdentifyVersion
|
2020-04-09 20:56:27 -05:00 |
|
fickleheart
|
8001511b7c
|
Make chdir usage consistent with other source usage
|
2020-04-09 20:52:23 -05:00 |
|
fickleheart
|
4db9ceca03
|
Merge remote-tracking branch 'upstream/master' into netgame-urls
|
2020-04-09 20:48:52 -05:00 |
|
James R
|
8de2bab4a9
|
Merge branch 'pk3-xtra-comm-fix' into 'next'
PK3: Proper ignorance for file comments/extra data
See merge request STJr/SRB2!761
|
2020-04-09 21:25:11 -04:00 |
|
James R
|
8335a44864
|
Merge branch 'md2-rollangle' into 'master'
Fix MD2 rollangle in reverse gravity
See merge request STJr/SRB2!818
|
2020-04-09 21:25:02 -04:00 |
|
James R
|
d3a4647c3b
|
Merge branch 'hw-horizon' into 'master'
OGL horizon lines
See merge request STJr/SRB2!861
|
2020-04-09 21:24:41 -04:00 |
|
James R
|
0596dbd137
|
Merge branch 'execcfg-fixes' into 'master'
ExecCfg fixes
See merge request STJr/SRB2!821
|
2020-04-09 21:24:12 -04:00 |
|
Sally Cochenour
|
c8da95cbda
|
Revert "Fix being able to hold items to get them as early as possible"
This reverts commit 43732b386d.
|
2020-04-09 21:05:46 -04:00 |
|
Sally Cochenour
|
43732b386d
|
Fix being able to hold items to get them as early as possible
(Doesn't matter in v2 because it'd waste your rings to do it, but y'know how it is. Maybe port for v1.2 if it works?)
|
2020-04-09 20:57:21 -04:00 |
|
Sally Cochenour
|
1618d61bfc
|
Fix potential overflow
|
2020-04-09 20:56:15 -04:00 |
|
James R
|
45abbb0be6
|
You don't need to push the value twice, it's only used once
|
2020-04-09 17:30:53 -07:00 |
|
James R
|
ccc746fbf4
|
Change netvars in replays
|
2020-04-09 17:21:30 -07:00 |
|
James R
|
81a01041e8
|
Merge remote-tracking branch 'origin/master' into next
|
2020-04-09 17:04:04 -07:00 |
|
James R
|
aff934a5b5
|
Merge branch 'hide-useless-1p-menu-options' into 'master'
Hide record & NiGHTS attack options if there are no available maps for them.
See merge request STJr/SRB2!868
|
2020-04-09 19:57:27 -04:00 |
|
James R
|
1bbb4d1f95
|
Merge branch 'ra-emblemhints' into 'master'
Allow emblem hints (and radar) in record attack.
See merge request STJr/SRB2!820
|
2020-04-09 19:56:17 -04:00 |
|
James R
|
b6b617cab7
|
Merge branch 'fix-256-brightness' into 'master'
Florida man fixes sectors with light level 256 blacking out OpenGL objects; mappers riot.
See merge request STJr/SRB2!840
|
2020-04-09 19:53:40 -04:00 |
|
James R
|
61a4fe06d5
|
Merge branch 'bot-respawn-hook' into 'next'
BotRespawn hook
See merge request STJr/SRB2!804
|
2020-04-09 19:52:25 -04:00 |
|
James R
|
17082fafbd
|
Merge branch 'gtr-replace' into 'next'
Separate PvP damage from ringslinger
See merge request STJr/SRB2!831
|
2020-04-09 19:51:52 -04:00 |
|
James R
|
0b91ef071f
|
Merge branch 'sdlglcontext' into 'master'
Only initialise OpenGL if the user intends to load it (for real this time)
See merge request STJr/SRB2!796
|
2020-04-09 19:51:20 -04:00 |
|
James R
|
71f4433b98
|
Merge branch 'dye' into 'next'
Expose colorization to mappers and SOC
See merge request STJr/SRB2!679
|
2020-04-09 19:50:32 -04:00 |
|
James R
|
ae3bf2498a
|
Merge branch 'supergoldedit' into 'next'
Change SKINCOLOR_SUPERGOLD1-5
See merge request STJr/SRB2!805
|
2020-04-09 19:50:06 -04:00 |
|
James R
|
f68a361f6e
|
Merge branch 'pk3-directory-start' into 'next'
Don't skip the first directory entry of PK3 if it's a file
See merge request STJr/SRB2!764
|
2020-04-09 19:49:44 -04:00 |
|
James R
|
7ff3e7f18b
|
Merge branch 'lightmemedata' into 'next'
Cvars returned by CV_FindVar did not work with userdataType
See merge request STJr/SRB2!754
|
2020-04-09 19:48:39 -04:00 |
|
James R
|
dc37cdf2a6
|
Merge branch 'loop-patch' into 'next'
Let MUSICDEF set loop point
See merge request STJr/SRB2!762
|
2020-04-09 19:47:43 -04:00 |
|
James R
|
34318fbc98
|
Merge branch 'SF_NONIGHTSSUPER' into 'next'
Skin flag for disabling super colors in NiGHTS
See merge request STJr/SRB2!782
|
2020-04-09 19:47:20 -04:00 |
|
James R
|
2c539300d3
|
Merge remote-tracking branch 'origin/next' into SF_NONIGHTSSUPER
|
2020-04-09 16:47:52 -07:00 |
|
James R
|
483243353b
|
Merge branch 'lua-hook-cleanup' into 'next'
Lua hook cleanup
See merge request STJr/SRB2!851
|
2020-04-09 19:40:09 -04:00 |
|
James R
|
cc6649f20e
|
Merge branch 'fix-consbackpic' into 'master'
Fix console backpic
See merge request STJr/SRB2!850
|
2020-04-09 19:39:16 -04:00 |
|
James R
|
a2a4a4a321
|
Merge branch 'fixed2float-funcs' into 'master'
Turn FIXED_TO_FLOAT into a function
See merge request STJr/SRB2!869
|
2020-04-09 19:37:22 -04:00 |
|
Sally Cochenour
|
d0a6c43c89
|
Minor things
|
2020-04-09 02:52:41 -04:00 |
|
Hannu Hanhi
|
2ac33942a2
|
Chat drawing memory leak fix from SRB2 repo
|
2020-04-08 17:33:23 -04:00 |
|
wolfs
|
eb5f731845
|
Merge branch 'awful-mix' into 'awful-mix'
Fix lol xd compiler errors
See merge request SinnamonLat/Kart-Public!2
|
2020-04-08 17:04:06 -04:00 |
|
James R
|
9f1c616817
|
Fix lol xd compiler errors
|
2020-04-07 17:06:20 -07:00 |
|
Steel Titanium
|
2d8a924369
|
Fix error with travis
|
2020-04-07 19:48:39 -04:00 |
|
Steel Titanium
|
829e63364d
|
Fix this mistake
|
2020-04-07 19:27:20 -04:00 |
|
Steel Titanium
|
eafa6a53a7
|
Fix even more build errors
|
2020-04-07 19:14:27 -04:00 |
|
Steel Titanium
|
f25235d1eb
|
Fix some build errors
|
2020-04-07 19:07:39 -04:00 |
|
Steel Titanium
|
5e0eca9fe9
|
Support for http downloads
|
2020-04-07 18:22:29 -04:00 |
|