Monster Iestyn
f40e1dc069
Merge branch 'next' into public_next
2017-03-13 18:24:50 +00:00
Alam Ed Arias
cb98c2d972
Merge branch 'master' into next
2017-03-12 21:34:19 -04:00
Alam Ed Arias
538eac7a47
appveyor: disable command output
2017-03-12 21:17:07 -04:00
Alam Ed Arias
4e8972cd24
build: no warning or error about logical-ip or tautological-compare
2017-03-12 21:16:37 -04:00
Alam Ed Arias
9cac1e9e62
build: fixup WFALGS/WFLAGS mistake
2017-03-12 21:09:06 -04:00
Alam Ed Arias
6bb7a636dc
appveyor: output commands passed to GCCwq
2017-03-12 21:02:05 -04:00
Alam Ed Arias
81fe46213d
build: do not overwrite the -Wno-error switchs
2017-03-12 20:51:45 -04:00
Alam Ed Arias
42ecca817d
build: disable tautological-compare and logical-op
2017-03-12 20:43:35 -04:00
Alam Ed Arias
b01d5da60f
build: fixup GCC54 endif
2017-03-12 20:23:30 -04:00
Alam Ed Arias
e0b2a4a779
build: add suport for GCC 6.3
2017-03-12 17:45:18 -04:00
Alam Ed Arias
b22417bcfa
appveyor: buildbot now using GCC 6.3, not 5.3
2017-03-12 17:26:37 -04:00
Alam Ed Arias
2823c7bffb
build: fixup warnings from GCC 6.2.1
2017-03-12 17:23:56 -04:00
Nevur
be9ca534d7
Whitespace indenting.
2017-03-12 20:26:45 +01:00
Nevur
144514247d
Added exceptions to the transparent column drawers to avoid modifying pixels with the cyan color.
2017-03-12 20:02:29 +01:00
toasterbabe
b9ddc0226e
Fixed a thing where super float started on the float frame normally and then immediately went to the float run frame a tic later.
2017-03-11 18:15:44 +00:00
toasterbabe
5b77ca5fed
Reverted change where NiGHTS drilling sprites were technically the super version of flying sprites. It was not helpful to modders at all, and was only justifiable as a rutheless attempt at efficiency in storage.
2017-03-11 18:14:58 +00:00
toasterbabe
e20292844d
* SPR2_DRL0-C are gone. They're now (FF_SPR2SUPER|SPR2_NGT0-C). This frees up a bunch of badly-used freeslots, considering that you can't be super AND NiGHTS at the same time.
...
* Speaking of, actively enforced not being able to be Super and NiGHTS at the same time.
* Also on that note - SPR2_TRNS is now the NiGHTS transformation. The Super transformation is (FF_SPR2SUPER|SPR2_TRNS).
* SPR2_NPAN is now SPR2_NSTN, since it matches Super Sonic's stun animation rather than the pain animation.
* Fixed a bunch of things where Super float was handled badly with 2AM brain.
* Fixed the R_ProjectSprite error going out of spr2names' bounds.
* Fixed order of FF's in dehackéd.
* Fixed that thing where Super Sonic was blue for 1 tic after transformation, and the life icon was a blue Super Sonic.
2017-03-11 17:14:39 +00:00
toasterbabe
75ac351940
It's 2am, I'll upload the exe and player.dta to the ftp later.
...
* Super sprites are now deliniated via an additional S_SUPER lump between S_START and S_END. Above are normal sprites, below are super sprites. Handled internally via FF_SPR2SUPER.
* Sprite2 numbers are now appropriately limited for the data type that stores them.
* SPR2_SPIN is now SPR2_ROLL, SPR2_DASH is now SPR2_SPIN and SPR2_PEEL is now SPR2_DASH. Makes more sense, right?
2017-03-11 02:09:01 +00:00
Monster Iestyn
4f80bd82a5
Merge branch 'metal_unsuck' into 'master'
...
Making Metal's pinch cues suck less
Does what it says on the tin. Give it a shot with <root>/toaster/metaltest.wad to skip the race and go directly to the boss to see what it does!
See merge request !70
2017-03-10 14:20:36 -05:00
toasterbabe
7f7d51a474
comment updates
2017-03-06 19:03:05 +00:00
Nevur
13dbe7d3a3
Fixed issue with vertical offsets being broken.
...
Add a vertical flip variant for the translucent column drawer.
Translucency is now properly distributed: 0.00 leads to no render at all, 0.1 to TRANS10, ..., 0.9 to TRANS90, 1 to regular column drawer.
2017-03-05 18:53:34 +01:00
Nevur
829be5bd43
Changed how R_GenerateTexture picks the function to draw the columns so it checks once per patch.
...
Also had to set the same args for all of the three current column drawer functions.
2017-03-05 12:49:09 +01:00
Nevur
bf5a10e4b7
The translucency feature is now functional, but it doesn't exactly work as expected. Need to make it behave like FOF translucencies etc., I guess.
2017-03-05 00:29:10 +01:00
Nevur
bb49362577
Add rudimentary and non-working code for translucency on patches.
2017-03-04 20:59:43 +01:00
Monster Iestyn
0f014fe20a
Merge branch 'master' into next
2017-03-04 17:16:33 +00:00
Monster Iestyn
5019077f82
Merge branch 'precip-overflow-fix' into 'master'
...
Precipitation sprite overflow fix
This fixes artifacts of rain/snow sprites appearing on-screen in levels that have rain/snow, if said sprites were high enough above the camera. This kind of thing was previously fixed for sprites of regular objects (and textures of FOFs?), but apparently the fix wasn't applied to sprites for precipitation as it turns out.
I found this most easily reproducable in SRB2TD's Stormy Streets level, because some of the invisible FOFs make raindrops continually splash right up at the sky ceiling itself. Position your camera underneath them right and ...voila, ghostly precip sprites apparently appearing. (You'll need to make a SOC to make the level playable in vanilla SRB2 mind)
See merge request !169
2017-03-04 08:40:37 -05:00
Monster Iestyn
b0f4bbb44b
Played TD's Stormy Streets enough to know precipitation sprites didn't get an overflow test of their own
...
(various large invisible blocks used in the level cause rain to make splashes high above the main level, high enough to make ghostly rain splash sprite artifacts appear sometimes in nearby areas)
2017-03-02 19:37:21 +00:00
Monster Iestyn
6f2f244aef
Remove "playerdeadview" variable; it's not been used for its stated purpose for who knows how long now
...
Besides rankings popping up when you die just sounds weird anyway, maybe I'm just used to SRB2 not doing it I guess
2017-02-22 21:07:29 +00:00
toasterbabe
76c15a0e97
Salt's suggestion.
2017-02-18 21:17:20 +00:00
toasterbabe
cf45067d9c
Gametype descriptions.
...
https://gfycat.com/RelievedUnselfishChinchilla (competition's desc is slightly reworded but I'm too lazy to retake the gfy)
2017-02-18 17:09:03 +00:00
toasterbabe
2f9db4486a
Minor corrections.
2017-02-18 14:03:49 +00:00
toasterbabe
c882851f14
Wide icons for the level select platter's exclusive usage.
...
https://gfycat.com/MenacingClearAngora
More for what's coming than what's here right now, but still quite pretty as a placeholder.
2017-02-17 01:45:21 +00:00
Monster Iestyn
a27367cdd4
Remove unused ObjectPlace_OnChange prototype (from when Objectplace was a consvar, which it is not anymore)
2017-02-15 21:16:56 +00:00
toasterbabe
758bec6963
Fixed a bunch of awkwardness where Metal wouldn't reset himself properly when his target died.
2017-02-14 02:07:08 +00:00
toasterbabe
a04ae45a93
MORE CUES
2017-02-13 18:53:16 +00:00
toasterbabe
3feac5bc90
bad bounce https://gfycat.com/DeliciousReliableGentoopenguin
2017-02-13 18:04:08 +00:00
toasterbabe
5f3cfc6729
Some cleanup.
2017-02-12 14:16:52 +00:00
toasterbabe
6dfef794a4
Metal Sonic's bounce attack is much nicer. Also, a bunch of other minor tweaks.
2017-02-12 01:28:12 +00:00
Monster Iestyn
8f1deb9128
Remove unused "runcount" variable from p_local.h
2017-02-11 23:28:42 +00:00
Monster Iestyn
a51548abea
"t" is not needed to take out fencepost cases from viewangletox
2017-02-11 23:24:12 +00:00
Monster Iestyn
a5001a6af9
Removed unused function prototypes in d_main.h
...
Also corrected what appears to be a typo in some comments above?
2017-02-11 22:56:08 +00:00
Monster Iestyn
f4e5233c7e
Remove unused sscount variable
...
(it's only set to 0 in software, and only ++'d in OpenGL, what kind of sense does that make?)
2017-02-11 22:41:15 +00:00
Monster Iestyn
0def5330c0
Merge branch 'master' into mi-a-bit-of-cleanup
2017-02-11 21:13:28 +00:00
toasterbabe
a66567ea0f
borp https://gfycat.com/AcceptableWhiteJabiru
...
doesn't do anything in ogl sorry, inu might change that later but
2017-02-10 23:24:06 +00:00
toasterbabe
9fc757f388
Inuyasha: You were right.
...
* Changed the order of Record/Nights Attack and its level select menu option so that you go from the main menu to the map page to level select, rather than main menu to level select to map page.
* Cleaned up a lot of code.
2017-02-10 14:54:05 +00:00
toasterbabe
8cdcb2c416
* You can now bounce off of springs without unbouncing.
...
* You can now bounce off the bottom of goop areas.
* Fixed that long-standing bug where you could accelerate whilst rolling.
2017-02-09 23:24:47 +00:00
Monster Iestyn
9b737d1165
Merge branch 'record-attack-custom-exit-fix' into 'next'
...
Record attack custom exit fix
This fixes the bug reported here: http://mb.srb2.org/showthread.php?t=42342
Record Attack now no longer allows the tally to be skipped, whether by custom exits or by Lua etc.
See merge request !164
2017-02-08 20:18:06 -05:00
toasterbabe
7b4688732b
* Float ability now properly stacks with dashmode.
...
* Corrected a scenario where you could get a CTF flag mid-dashmode and have dashmode properties forever.
2017-02-08 16:46:16 +00:00
toasterbabe
29c48c1992
As defined in spec, lose a bit of chain each time you bounce on land.
2017-02-08 16:08:36 +00:00
Monster Iestyn
f9b41898a9
Don't allow skipping stats in record attack/nights attack
2017-02-05 22:04:29 +00:00