thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4020 commits 1 branch 12 tags 205 MiB
Commit graph

4020 commits

This branch
This branch
All branches
Author SHA1 Message Date
Digiku
3c43ce46c6 Merge branch 'sphere-ring-concurrence' into 'master' 
Change SETSPHERES console command to SETRINGS to handle player->spheres transparently

See merge request STJr/SRB2Internal!167
 2018-08-29 04:24:23 -04:00
Monster Iestyn
2d7263c7f1 Merge branch 'public_next' 
# Conflicts:
#	src/r_things.c
#	src/v_video.c
 2018-08-28 19:31:08 +01:00
Monster Iestyn
3ea826f279 Merge branch 'master' into next 2018-08-26 21:10:41 +01:00
Monster Iestyn
69b0a86e4a Merge branch 'yo_screen_so_wide_y_is_invalid' into 'master' 
Yo Screen So Wide y Is Invalid

See merge request STJr/SRB2!271
 2018-08-26 16:07:06 -04:00
toaster
b26828805e Missed one! 2018-08-26 12:38:53 +01:00
Monster Iestyn
7c321b4248 Merge branch 'v_video_killed_the_r_radio_star' into 'master' 
v_video Killed The r_radio Star

See merge request STJr/SRB2!270
 2018-08-25 16:43:25 -04:00
Monster Iestyn
7f0d75f741 Merge branch 'zalloc_potter_and_the_death-free_hallows' into 'master' 
Zalloc Potter and the Death-Free Hallows

See merge request STJr/SRB2!269
 2018-08-25 16:43:14 -04:00
Monster Iestyn
eb681b4b45 Merge branch 'lighting_fixes_plane_n_simple' into 'master' 
Lighting fixes? Plane and simple!

See merge request STJr/SRB2!268
 2018-08-25 16:43:00 -04:00
toaster
60177bba79 Introduce a temporary measure to enable the old stuff, minus one of the most obviously terrible bugbears of yesteryear. Let it be known that any downstream poirt will almost certainly toggle this ASAP. 2018-08-25 21:17:34 +01:00
toaster
241c9c2260 Clean up a bunch of v_video.c functions that previously exhibited unfortunate side effects when run in non-green resolutions. 
* V_DrawFixedPatch and ilk:
	* Change the offset of V_FLIP so it's not one screen-pixel off where its non-flipped sprite would have started being drawn from.
	* Write to x and y as well as desttop so that anti-screen-overflow checks later in the function behave properly with non-green resolutions.

* V_DrawFill:
	* Reduce number of operations performed upon `c`.

* V_DrawString and ilk:
	* Offset the left and right boundary checks in non-green resolutions such that you can actually draw stuff to the left of basevid screen x coordinate 0.
 2018-08-25 19:52:17 +01:00
Digiku
eb5f4bcdb0 Merge branch 'op-nightshoop' into 'master' 
NiGHTS objectplace: Place new hoop 1713 instead of 1705

See merge request STJr/SRB2Internal!136
 2018-08-25 13:23:51 -04:00
toaster
ace4c46d5f Fix up them there ghosts! 
* Stop orphaning their memory. They ARE PU_LEVEL, so they'll disappear eventually, but, like... it's not good memory management practice to just *orphan* them when you're literally never going to do anything with them ever again. Y'know?
* Make ghosts spawn properly on slopes.
 2018-08-25 17:11:49 +01:00
toaster
6bd034e3dc Continuing my recent streak of making random lighting/colormap-related fixes to long-standing bugs: 
* Fix that thing where ALL transparent FOF planes were continuously fullbright unless encased in a fog which disables sprite fullbrightness, which was long-hated by many people in the community!
	* For backwards compatibility, setting flag 1 in that fog field (which is probably the most common "in-the-wild" usage of this feature) will continue to make objects un-fullbright.
	* For situations where you desperately want the behaviour to be enabled, you can apply fog flag 2.
* Change the fadestart and fadeend range in which colormaps are generated.
	* The problem HERE was that the darkest light level reached by generated colormaps was actually slightly brighter than the darkest level reached by normal colormaps.
	* The typo I fixed does have SOME basis in fact - standard colormap lumps are 34 (33 in 0-indexing) long rather than 32 (31), but whoever wrote this didn't realise that the code for generating them didn't do it DooM style, just bright-to-dark with no extras on the end...
 2018-08-25 16:46:45 +01:00
wolfy852
8134098558 Expose NEWTICRATE and NEWTICRATERATIO to Lua 
This should keep 70FPS-compatible scripts from throwing nil value errors.
 2018-08-25 03:40:43 -05:00
Monster Iestyn
dbec486af1 Merge branch 'cez-bramble-hardcode' into 'master' 
CEZ Bramble Hardcode

See merge request STJr/SRB2Internal!169
 2018-08-22 14:47:04 -04:00
Monster Iestyn
fa637475ae Hardcoded Brambles.lua from CEZRes.pk3, changed thing type to 1125 2018-08-22 17:16:11 +01:00
Monster Iestyn
3cce0b8a33 Merge branch 'public_next' 
# Conflicts:
#	src/sdl12/i_cdmus.c
#	src/win32ce/win_cd.c
 2018-08-21 15:40:54 +01:00
Monster Iestyn
36080cc49a Merge branch 'master' into next 2018-08-21 15:36:36 +01:00
Monster Iestyn
eb5b5300ab Merge branch 'XPMupdate' into 'master' 
update XPM icon

See merge request STJr/SRB2!267
 2018-08-21 10:31:25 -04:00
Monster Iestyn
9639c510a4 Merge branch 'defaultsoundvol' into 'master' 
Change default sound volume

See merge request STJr/SRB2!238
 2018-08-20 09:41:04 -04:00
Digiku
20bb759ff6 Remove unnecessary totalring deduction condition 
Because it would be triggered by !(maptol & TOL_NIGHTS) in the old code anyway
 2018-08-17 09:11:59 -04:00
Digiku
9b0e9a58fe Revert "Checkpoint (unfinished): player->totalsphere" 
This reverts commit 4aade072ef
 2018-08-17 09:09:10 -04:00
Monster Iestyn
004fd77b41 Merge branch 'master' into next 2018-08-16 22:04:00 +01:00
Monster Iestyn
0792e78254 Merge branch 'lua-sector-names-fix' into 'next' 
Lua sector names fix

See merge request STJr/SRB2!263
 2018-08-16 16:57:41 -04:00
Monster Iestyn
6797976531 Merge branch 'sdl_mixer_fixes' into 'master' 
SDL Mixer fixes

Closes #31

See merge request STJr/SRB2!260
 2018-08-16 16:57:14 -04:00
mazmazz
4aade072ef Checkpoint (unfinished): player->totalsphere 2018-08-16 13:11:32 -04:00
mazmazz
32939a11f1 Change SETRINGS to support player->spheres in NiGHTS 2018-08-16 12:13:57 -04:00
mazmazz
ed9e74c15a Line from revert 2018-08-16 11:35:35 -04:00
mazmazz
4b8fd01bc0 Revert "SETSPHERES console command for debugging/cheating" 
This reverts commit 9e8784a376.
 2018-08-16 11:34:57 -04:00
Nev3r
effd0ebe97 Merge branch 'horizon-line-hom-fix' into 'master' 
Horizon line HOM fix

See merge request STJr/SRB2Internal!152
 2018-08-12 03:48:20 -04:00
Alam Ed Arias
e7eaba0118 Merge branch 'master' into XPMupdate 2018-08-11 21:59:39 -04:00
Alam Ed Arias
ca8de769a8 TravisCI: also remove gcc-6 2018-08-11 21:59:08 -04:00
Alam Ed Arias
5b5013c9b1 TravisCI: gcc-4.9 is also gone 2018-08-11 21:44:07 -04:00
Alam Ed Arias
e4317066a6 Merge branch 'master' into XPMupdate 2018-08-11 20:37:34 -04:00
Alam Ed Arias
e7ec2e3830 Merge branch 'xpm_fix' into 'XPMupdate' 
Fix white being treated as transparent.

See merge request STJr/SRB2!266
 2018-08-11 20:36:57 -04:00
Steel Titanium
cd790eca91 Fix white being treated as transparent. 2018-08-10 19:02:03 -04:00
Alam Ed Arias
e04d13f647 TravisCI: remove gcc-5 test, gcc-5 package is gone 2018-08-10 17:16:26 -04:00
Alam Ed Arias
8f6d20d53c SDL: update IMG_xpm.c 2018-08-10 17:09:11 -04:00
Monster Iestyn
20ea372306 Merge branch 'polyobj-sky-plane-crash-fix' into 'master' 
Polyobject sky plane crash fix

See merge request STJr/SRB2Internal!146
 2018-08-10 15:40:43 -04:00
Monster Iestyn
593c41f34f Merge branch 'leveltitle-tinkering' into 'master' 
Leveltitle tinkering

See merge request STJr/SRB2Internal!134
 2018-08-10 15:30:26 -04:00
Monster Iestyn
827da4098d Merge branch 'master' into polyobj-sky-plane-crash-fix 2018-08-10 20:06:12 +01:00
Monster Iestyn
710d940a9b Merge branch 'master' into horizon-line-hom-fix 2018-08-10 20:04:39 +01:00
mazmazz
ef49700a49 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into op-nightshoop 2018-08-10 15:04:14 -04:00
Monster Iestyn
3e80f4a59b Merge branch 'master' into leveltitle-tinkering 
# Conflicts:
#	src/hu_stuff.h
 2018-08-10 20:03:59 +01:00
Monster Iestyn
1952653f5b Merge branch 'public_next' 2018-08-10 19:36:51 +01:00
Monster Iestyn
877ac62895 Merge branch 'master' into next 2018-08-10 19:31:15 +01:00
Monster Iestyn
0001260b3a Merge branch 'woops!_all_trans' into 'master' 
Woops! All trans

See merge request STJr/SRB2!265
 2018-08-10 14:27:45 -04:00
Digiku
2f7cfcc7b8 Merge branch 'hardcoding-nights-spheredamage' into 'master' 
NiGHTS: Handle sphere damage correctly upon timeout
* Spill spheres/chips, implement MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP
* Handle player->spheres and player->rings consistently

See merge request STJr/SRB2Internal!157
 2018-08-10 13:50:57 -04:00
Digiku
e1e00ecb88 Merge branch 'nights-invertloopfix' into 'master' 
NiGHTS fix lap detection on inverted axis

See merge request STJr/SRB2Internal!138
 2018-08-10 13:49:42 -04:00
mazmazz
9591ac92ec Pandora's Box support for player->spheres 
Opting to handle this transparently via the Rings menu option. Doesn't seem worth making a separate entry for Spheres.
 2018-08-10 13:15:54 -04:00