Sryder13
83da71f809
Merge branch 'master' into pk3_leak
2019-06-22 00:28:14 +01:00
Sryder13
dcd4995eb3
Remember to end inflating
2019-06-22 00:19:34 +01:00
MascaraSnake
e20949ef77
Merge branch 'new-acz-minecarts' into 'master'
...
ACZ hardcoding (including minecarts)
See merge request STJr/SRB2Internal!231
2019-06-21 17:45:03 -04:00
MascaraSnake
287c25b8f9
Forgot to copy something over from the CR_ROPEHANG case
2019-06-21 23:42:48 +02:00
MascaraSnake
4385e07c0b
Always use the white sidemark sprite, since track switching is no longer "activated"
2019-06-21 23:40:28 +02:00
MascaraSnake
ed7a109ce9
Also back by popular demand: Restricting the camera angle during a minecart ride
2019-06-21 23:34:49 +02:00
Monster Iestyn
149a8bb760
Merge branch 'public_next'
2019-06-21 22:13:39 +01:00
Monster Iestyn
f84c898040
Merge branch 'master' into next
2019-06-21 22:10:32 +01:00
Steel Titanium
fe7b041346
Merge branch 'public-notpublic-libopenmpt' into 'master'
...
libopenmpt support
See merge request STJr/SRB2Internal!229
2019-06-21 17:03:53 -04:00
MascaraSnake
28abc883be
By popular demand: Track switching only requires strafe instead of jump+strafe
2019-06-21 20:13:30 +02:00
toaster
50e4a65f99
Correct some more oversights of switching to revitem for CA2_MELEE's particles.
2019-06-21 12:51:55 +01:00
toaster
d5e91ed8d7
Don't give SH_PINK in Race/Competition. They're your opponents!
2019-06-21 12:35:37 +01:00
toaster
3597b1c485
Make minor adjustments to the CA2_MELEE and CA_TWINSPIN stuff.
2019-06-21 00:43:03 +01:00
toaster
f7fe418f7c
Slight buff to MT_LHRT.
2019-06-20 23:43:05 +01:00
toaster
f182bb867f
HUD stuff.
...
* Re-fix chat HUD position, and make it not move in match (which it needed to do in 2.1).
* Fix HU_drawPing for the new palette.
* Change the condition for greying out players, since the current one was buggy.
* Allow for tokens on the coop MP HUD, and use the small emeralds so there's space for them.
* Fix the mapping between skincolours and name colours in new chat, specifically to take into account every possible text colour (as opposed to the port previously done, which only used the 2.1 text colours and looked like ass as a result).
2019-06-20 22:57:47 +01:00
Monster Iestyn
f7a32835d5
Fix warnings/errors found during compiling, mostly of the mixed-declaration-and-code or shadowed variables variety
2019-06-20 20:05:07 +01:00
Monster Iestyn
bc2804d383
Fix the clearly accidental duplication of lumpinfo's memory allocation in ResGetLumpsStandalone
2019-06-20 13:24:54 +01:00
Nev3r
0e162f8f61
Add Sryder's orbital camera thing as an option.
2019-06-20 13:33:31 +02:00
toaster
eac36e73a3
Correct some oversights where drawangle was incorrectly ignored.
2019-06-20 00:43:55 +01:00
toaster
460632ad3b
Some preliminary work to make multiple bosses in the same map work nicely together, by allowing parameter to alter the linedef executor tag to call in increments of 100.
...
Also: Making sure every single reserved tag is recorded as an LE_ constant.
2019-06-20 00:24:13 +01:00
toaster
f9e09ec31f
Tweak Boss5MakeItRain's bomb launch angles to properly smash the ceiling in the new arena.
2019-06-19 23:35:18 +01:00
toaster
84ff2a57a1
As I wanted MI to do but he was too exhausted at the time from hardcoding, make the Fang bullet knockback less hardcoded and instead give it MF2_SUPERFIRE.
2019-06-19 23:29:39 +01:00
toaster
2e6898f29e
PITY IN PINK!
...
* Smoothen Pity Shield animation to go with sphere's updates to Nev3r's sprites.
* Added LHRT object, designed to be summoned with CA2_MELEE.
* Gives a pink Pity Shield (SH_PINK) on same-team player contact.
* Deals damage to non-player enemies.
* Harmlessly fades into nothing when touching an enemy player, players with SH_PINK already, and players capable of applying SH_PINK to others (through non-Lua methods).
* Basically, you-know-who is the Healer of the party whenever they're around. Fun consequences for the Co-op and CTF metas.
2019-06-19 23:20:24 +01:00
toaster
6a58ae34d1
In order to make P_PlayerCanDamage more flexible, I ended up bundling the invincibility/super checks into there.
...
Also, the start of my improvements to CA2_MELEE. Users of that abiliy can only damage enemies/monitors if they touch the front of the player object, but to make up for it, the player is no longer forced away from the direction of the screen at bigger movement speeds.
2019-06-19 13:20:34 +01:00
toaster
3eb9b85fd4
"PlayerCanDamage" hook!
...
* Takes function(player, mo) input.
* Return TRUE for stating that yes, the player is in a state that can cause contact damage, do with that what you will.
* Return FALSE for stating that no, the player is weak and vulnerable and cannot cause contact damage, do with that what you will.
* Return NIL for allowing the function to continue regular operation.
Fills a different ideological niche than ShouldDamage - that's for determining whether damage dished between two objects should happen, this is for determining which way around damage should be dished when considering a player-object interaction.
Or, in other words, think of it as "ShouldDamage is whether damage that has been requested should be granted, for object-object interaction, while PlayerCanDamage is for whether global player properties should cause damage to enemies and monitors in the first place, like spinning, hammering or stomping."
2019-06-19 12:55:05 +01:00
toaster
28dfeb344b
Instead of only performing a hook if the Lua Hook loop determines its type to be the one we want, actively continue through the loop if it's NOT. This optimisation was performed while preparing the following commit; I have generously split them out for less shitty commit-by-commit review.
2019-06-19 12:28:57 +01:00
toaster
ef6e00e8a2
P_PlayerCanDamage(player_t*, mobj_t*), ported from the abandoned project_birthday because GOD the code looks awful with those huge monolith conditions in it. Available to Lua.
...
(Also, minor fixes to lib_pSpawnLockOn, and removing the SH_OP fuckery.)
2019-06-19 12:09:02 +01:00
MascaraSnake
d388547021
Some more minecart fixes
2019-06-19 00:10:28 +02:00
toaster
b0326b6dec
Do some minor HUD fixes.
...
* Move HUD text's anchoring to underneath STR instead of above Lives.
* Adjust chat position slightly, to take advantage of SRB2's HUD layout having less content towards the bottom (unlike Kart, where it has roughly equal).
* Fix Match emeralds not displaying while in tab rankings with all-seven invuln/shoes bonus active.
2019-06-18 18:51:24 +01:00
MascaraSnake
c11a3010d9
Fixed the Canarivore gas slowdown being much too weak
2019-06-18 19:29:53 +02:00
MascaraSnake
3634321f43
...
2019-06-18 19:06:05 +02:00
toaster
1d65caa250
With permission from Kart Krew (Sal and Sryder specifically - they don't know WHY vanilla's using it):
...
* Port across the additional colour translation maps, including mobj-level support for "colorized" objects.
* Make Fangboss and both Metal Sonic objects greyscale if, on spawn, there is a player in the game who is not a spectator whose skin is that character.
* Allow bosses with MF_GRENADEBOUNCE to opt out of the MF2_FRET colour-flashing tomfoolery, and give this flag to Fang.
2019-06-18 17:55:57 +01:00
toaster
96d6cea569
Support backspace for resetting various menu values, just like Kart.
2019-06-18 14:36:06 +01:00
toaster
861d0d0b0a
Improve rain/weather.
...
* Like Kart, remove cv_precipdensity.
* Like Kart, replace "Infinite" draw distance value with "None".
* Better thinker with more return optimisation.
* Better placement of thinking in rendering, to avoid ceiling-mounted sprite glitches.
2019-06-18 14:22:10 +01:00
Monster Iestyn
62ed90b252
fix type mismatch by typecasting
2019-06-17 20:54:06 +01:00
MascaraSnake
95a0b3fc86
Merge branch 'master' into new-acz-minecarts
2019-06-17 20:43:21 +02:00
Monster Iestyn
1638fad75e
Part 2 of fix, make sure copied slopes also pass on hasslope status to attached target sectors for FOFs
...
Also fix whitespace to use tab-style spaces instead of regular spaces, ew
2019-06-17 19:00:04 +01:00
Monster Iestyn
50e8f13c03
Fix FOF slopes briefly glitching on level load in software mode, by ensuring the FOFs' target sectors have hasslope set on creation
2019-06-17 18:46:51 +01:00
MascaraSnake
647520e067
Adjusted the height difference for track switching
2019-06-17 08:41:51 +02:00
MascaraSnake
096bad14fb
Minecart stopper itself also needs MF_NOCLIPHEIGHT and MF_NOGRAVITY
2019-06-16 22:26:52 +02:00
MascaraSnake
e23ef050d5
Repaired the height difference check during track switching
2019-06-16 22:00:50 +02:00
MascaraSnake
cf7e618b2f
Fixed a bug with the Canarivore gas
2019-06-16 21:36:22 +02:00
MascaraSnake
68060b731f
Fixed a sound bug
2019-06-16 19:08:20 +02:00
MascaraSnake
db7bd4d35a
Fixed the cacti heights
2019-06-16 18:14:15 +02:00
MascaraSnake
fbd7a5ae59
Finetuned the saloon door swinging
2019-06-16 17:57:03 +02:00
MascaraSnake
7e0c9d9398
(Hopefully) fixed the player sometimes landing on the solid part of the minecart stopper after being launched out of the minecart
2019-06-16 17:07:13 +02:00
MascaraSnake
c5a2d33d4e
Added minecart support to A_MixUp
2019-06-16 16:49:18 +02:00
MascaraSnake
622a44f551
Fixed a bug involving players being thrown out of minecarts
2019-06-16 16:39:06 +02:00
MascaraSnake
b6790c7f35
Snapper head/legs and minecart segments flash when they're destroyed
2019-06-16 15:35:32 +02:00
MascaraSnake
774ccad401
Do death animation even when MF2_DONTDRAW is set
2019-06-15 22:29:30 +02:00
MascaraSnake
71a25eef92
Don't jump repeatedly when holding jump
2019-06-15 21:58:58 +02:00
MascaraSnake
39deb64e4f
Streamlined the minecart death handling
2019-06-15 21:43:36 +02:00
MascaraSnake
8e61cc6d13
Kill minecarts that fall into death pits
2019-06-15 20:59:56 +02:00
MascaraSnake
24c6dd1a68
Many more bugfixes
2019-06-15 20:21:18 +02:00
MascaraSnake
91c1e13273
Simplified the setup for the Snapper/minecart death animations
2019-06-15 17:33:07 +02:00
MascaraSnake
33ed2924e9
Fixed minecart not exploding on death
2019-06-15 14:21:27 +02:00
MascaraSnake
a3784850b7
Removed an unnecessary tracer check
2019-06-15 13:52:27 +02:00
MascaraSnake
943ddeeabf
You can now jump onto tracks that are running antiparallel to yours
2019-06-15 13:49:30 +02:00
MascaraSnake
cede95fc21
Some more bugfixes
2019-06-15 00:59:13 +02:00
MascaraSnake
981443c826
Another bugfix
2019-06-15 00:12:58 +02:00
MascaraSnake
cc9d7bee80
A bunch of bugfixes
2019-06-15 00:04:50 +02:00
MascaraSnake
018fb9b461
"Finished" minecart hardcoding (still untested and buggy)
2019-06-14 21:19:52 +02:00
Jaime Passos
c591633733
Update m_misc.c
2019-06-14 14:13:41 -03:00
MascaraSnake
db66f58f2b
Merge branch 'acz-hardcode' into new-acz-minecarts
2019-06-13 21:52:08 +02:00
MascaraSnake
43f28b8f56
Set tracers via P_SetTarget and not directly
2019-06-13 21:51:31 +02:00
MascaraSnake
ba9c7d9310
More incomplete minecart hardcoding
2019-06-13 21:45:30 +02:00
MascaraSnake
1ff64baf8b
Merge branch 'acz-hardcode' into new-acz-minecarts
2019-06-12 21:28:39 +02:00
MascaraSnake
fae4dc3f21
Forgot to hardcode the mobj.valid checks
2019-06-12 21:28:09 +02:00
MascaraSnake
fafabaae2b
Hardcoded the saloon door
2019-06-12 21:20:14 +02:00
Steel Titanium
5ee6c5095d
Merge remote-tracking branch 'remotes/origin/master' into levelselect-tweaks
2019-06-11 20:06:02 -04:00
Steel Titanium
58bb05be00
Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt
...
# Conflicts:
# .travis.yml
# src/m_menu.c
# src/sdl/Srb2SDL-vc10.vcxproj
# src/sdl/Srb2SDL.props
2019-06-11 17:48:00 -04:00
Nev3r
a1b2a0a344
Properly take skybox viewpoint angle into account.
2019-06-11 14:47:58 +02:00
toaster
6c6ed6a349
Fix Titlemap with mazmazz's fancy menu stuff
...
Handled by changing some defaults.
Untested, experimenting with Gitlab Web IDE as reconfiguring my build environment is likely to be a pain and I'd like to put that off as long as possible please
2019-06-10 15:43:47 -04:00
MascaraSnake
6a46fc76b8
Fixed some angle business in the BASH code
2019-06-10 20:40:12 +02:00
MascaraSnake
068e07974d
Hardcoded the new Snapper behavior
2019-06-10 20:32:50 +02:00
Nev3r
ae6997621d
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into portals2
2019-06-10 18:14:03 +02:00
Nev3r
c014235ad3
Fix 1 extra column rendering on portal-clipped vissprites.
2019-06-10 17:59:12 +02:00
MascaraSnake
0e80d2ec5d
Hardcoded the new Minus behavior
2019-06-10 17:42:37 +02:00
Nev3r
d2605e0314
Remove remnants of portalcullsector.
2019-06-10 17:13:04 +02:00
MascaraSnake
85eece29d3
Fixed the bug
2019-06-10 16:19:58 +02:00
MascaraSnake
b98de5d362
Hardcoded the new BASH behavior (there's still a bug lurking somewhere)
2019-06-10 16:09:15 +02:00
MascaraSnake
4d0b0f84b1
Pushables that are also vulnerable no longer block crushers (because they die anyway). This allows us to make TNT barrels pushable again.
2019-06-10 14:10:37 +02:00
MascaraSnake
98ea229680
Hardcoded the Canarivore
2019-06-10 13:58:16 +02:00
Nev3r
581e80ed69
Made Portal_Add static; move ffloors clip reset from R_RenderPlayerView to r_plane.
2019-06-09 22:48:54 +02:00
Monster Iestyn
e7e3b0ef38
Merge branch 'public_next'
...
# Conflicts:
# src/doomdef.h
# src/hardware/hw_draw.c
# src/m_misc.c
# src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-06-09 20:04:08 +01:00
Nev3r
f536ab3467
Fixed crash regarding opening reallocating. A thousand thanks go for MonsterIestyn for figuring this out.
...
I carelessly changed the line's drawsegs to curdrawsegs without researching what that piece of code did.
2019-06-09 20:04:07 +02:00
MascaraSnake
3a16a7d7d4
Hardcoded train dust and steam spawner
2019-06-09 17:16:07 +02:00
MascaraSnake
6df14492a5
Hardcoded train cameo
2019-06-09 13:48:07 +02:00
MascaraSnake
ca4ab06abf
Hardcoded wood debris
2019-06-09 12:27:09 +02:00
MascaraSnake
7b603f4ac8
Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch)
2019-06-09 10:51:33 +02:00
MascaraSnake
546af19c82
Hardcoded oil lamp
2019-06-08 15:50:01 +02:00
MascaraSnake
3d65ec7426
Changed cacti widths
2019-06-08 14:45:01 +02:00
MascaraSnake
5ac594abf5
Fixed dust scaling, changed sound captions
2019-06-08 14:12:39 +02:00
MascaraSnake
1aaccfcd5c
Hardcoded dust devil
2019-06-08 09:51:46 +02:00
Monster Iestyn
f5d883bd12
Merge branch 'next' into 2.1.24-prep
...
# Conflicts:
# debian-template/control
# debian/changelog
2019-06-07 23:18:31 +01:00
Alam Ed Arias
ea08ba3fba
Merge branch 'master' into next
2019-06-07 18:07:32 -04:00
Alam Ed Arias
83b8a98df4
Merge branch 'gme-msvc' into 'master'
...
Add GME to MSVC 10 solution
See merge request STJr/SRB2!448
2019-06-07 18:06:51 -04:00
Steel Titanium
c0c1e5416f
Merge branch 'next' into 2.1.24-prep
2019-06-07 18:02:09 -04:00
Steel Titanium
3c08ee1313
Merge branch 'master' into travis-deployer
...
# Conflicts:
# .travis.yml
2019-06-07 16:56:19 -04:00
Steel Titanium
eb99ad0437
Merge branch 'more-limits' into 2.1.24-prep
2019-06-07 11:28:43 -04:00
Monster Iestyn
6f6d912fa6
Update version to 2.1.24
2019-06-07 15:48:33 +01:00
Nev3r
0795c7811a
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into portals2
2019-06-07 13:11:51 +02:00
Nev3r
8c3ddd61d5
Refactored a bit of code regarding visplane bound trimming for portals; reset ffloor's f_clip/c_clip so that FOFs on portals don't interfere with previously acquired bounds.
2019-06-07 13:10:12 +02:00
Nev3r
d2692ddd24
viewx/viewy also need to be stored/restored.
2019-06-06 13:31:48 +02:00
Nev3r
0d77e8afaf
Add pad checks for visplanes; invalidate invalid columns from visplanes (visplane renderer and column renderers don't speak exactly the same language).
...
The visplane portal top boundary offset has been restored since all known bugs involving it have been fixed.
2019-06-06 11:26:13 +02:00
Nev3r
5284817259
Fix sigsegv when there is no main skybox viewpoint.
2019-06-05 18:45:36 +02:00
Nev3r
1c14062e8b
Vissprite clipping improvements.
...
Vissprites are now only clipped against their respective portal's geometry obtained from their BSP run.
Additionally, if a portal is provided, they're clipped to the portal's clip boundaries.
The work on this branch should conclude after a pair of remaining glitches are fixed.
2019-06-05 18:07:08 +02:00
Nev3r
25b56ffecd
Masked elements are now fully grouped individually for each portal/view; fixed viewz-related glitches,.
...
The drawnodes are now fully grouped in separate lists, and then sorted individually. This fixes sorting problems caused by portals belonging to differently perceived scales (skyboxes for example).
Drawsegs and vissprite/drawnode sorting require the viewz, so the viewz is stored for each portal/view, and then restored when needed; without this, the rendering process erroneously sorts the elements, and draws some at wrong positions.
2019-06-05 12:10:59 +02:00
Nev3r
b22aa784fb
Set a default frontscale for visplane portals.
...
I don't know whether this is necessary or not but I'm poking blindly trying to fix the sorting issues for now.
2019-06-04 21:04:35 +02:00
Nev3r
8abecc7f86
Created drawnode lists for each view/portal.
...
Each shall eventually have its specific vissprites/drawsegs; currently only drawsegs are stored in their correct list, vissprites are stored in the first list as a placeholder.
The idea is to sort each list individually, and then render their masked elements, starting from the last drawnode list.
This retains a non-recursive function calling method while still rendering things in order.
2019-06-04 20:15:42 +02:00
Monster Iestyn
0fd3668111
Revert "Merge branch '144-scrolltweaks' into 'master'"
...
This reverts merge request !213
2019-06-04 17:34:59 +00:00
Steel Titanium
742c43cf1c
Some small tweaks
2019-06-03 17:34:51 -04:00
Steel Titanium
81dec89aeb
Merge branch 'next' into public-musicplus-libopenmpt
2019-06-03 15:36:50 -04:00
Steel Titanium
d4dac52766
Upped freeslots limit
2019-06-03 15:23:48 -04:00
Nev3r
2aabf6ffd5
Moving away more portal-related global vars to r_portal.
2019-06-03 13:33:12 +02:00
Nev3r
942c34a6af
Moved validcount++ to where it used to be.
...
It seems to screw up the portal rendering in odd ways if it's in the wrong position. I apologize for not even knowing what it's meant to do nor how it works.
2019-06-03 13:04:27 +02:00
Monster Iestyn
b7f75246e4
Merge branch 'master' into checksight-fixes
...
# Conflicts:
# src/p_sight.c
2019-06-02 18:13:02 +01:00
Nev3r
264386f842
Add visplane portal creation functionality and use it to replace the skybox rendering.
...
The skybox rendering process has been replaced with portals instead. Those are generated after the first BSP tree pass by looking for existing sky visplanes at the time, and their windows are used to define new portals.
The skybox portals are still incomplete and cause visual glitches when masked elements are involved.
2019-06-02 00:07:55 +02:00
Nev3r
df0a40b3c2
Code refactoring to turn portal struct into a more generalized shape.
...
Split portal-related code to its own source files.
Most of the 2-line-specific setup has been moved to the function which adds a 2-line case. The portals should render as they used to so far, anyway.
2019-06-01 13:07:23 +02:00
Monster Iestyn
571c5b89b5
Whoops, forgot to make P_CheckSight support slopes for same-sector FOF plane checking.
2019-05-27 21:18:02 +01:00
Monster Iestyn
abfdac15a8
Fixed P_CheckSight to support slopes, both for normal planes and FOF planes
...
(Untested)
2019-05-27 20:36:35 +01:00
Monster Iestyn
ad4006712e
fix P_CheckSight to consider FOFs that completely block the view
...
(this could probably be in its own branch to be tested properly, but I'm on a roll with this atm)
2019-05-27 19:32:05 +01:00
Jaime Passos
39857a846a
PNG support
2019-05-26 23:37:23 -03:00
Jaime Passos
0bcf89679e
Hardware renderer: Fix polyobjects
2019-05-26 18:16:13 -03:00
Jaime Passos
a4a529bdb5
Hardware renderer: Disable Glide-specific texture handling
2019-05-26 17:41:10 -03:00
Jaime Passos
dfd8beae27
Merge remote-tracking branch 'upstream/jimita-flats' into flats
2019-05-26 16:43:33 -03:00
Jaime Passos
93f60267c1
Minor fixes
2019-05-26 16:22:33 -03:00
Nev3r
36036b6cfd
Permit textures to use the "TEXTURE" tag in addition to "WALLTEXTURE".
...
It's pointless to make any distinctions anymore IMO, given flats can load them just fine now.
2019-05-26 12:02:43 +02:00
Steel Titanium
34ce368895
Merge branch 'next' into jimita-unfuck-awayview
2019-05-25 19:47:45 -04:00
Steel Titanium
dc273d3f23
Merge branch 'next' into jimita-flashpals-on-screenshots
2019-05-25 19:37:17 -04:00
Steel Titanium
c8a5597492
Update libopenmpt to 0.4.4
2019-05-23 22:05:28 -04:00
Monster Iestyn
677801f5ff
Hardcode the bomb's explosion states, the dust object type and states, and the sprite prefixes for both
2019-05-23 21:51:58 +01:00
Monster Iestyn
e60b0b1a80
Update hw_light.c
...
(though I'm not sure why we bother, since coronas have been disabled for a decade now)
2019-05-23 21:08:27 +01:00
Monster Iestyn
7d0509f1cb
Merge branch 'master' into acz-boss-hardcode
2019-05-23 20:38:25 +01:00
Monster Iestyn
742b11c0ff
Hardcoded ACZ3.wad's version of A_TNTExplode under the name of A_Boss5BombExplode. After a lot of confusion and silly misunderstandings on my part (as well as a lot of mess cleaning), I've finally got there!
...
The states for the actual bomb explosion effect itself are yet to be hardcoded, but that I'll do tomorrow afternoon probably.
2019-05-21 21:51:19 +01:00
Jaime Passos
dbb1575a6d
Animations, better flat management.
2019-05-21 15:24:26 -03:00
Jaime Passos
869f1e4e8d
Fix warnings
2019-05-21 11:03:53 -03:00
Jaime Passos
35d6da159d
HOLD UP
2019-05-21 09:50:39 -03:00
Steel Titanium
ce1c1d8c88
Forgot some references
2019-05-20 23:31:23 -04:00
Jaime Passos
714c997aac
Support for patches and textures to be used in place of sector flats
...
Still a work in progress.
2019-05-21 00:28:52 -03:00
Steel Titanium
bf3d5f4188
circleci: Fix compiling error
2019-05-20 23:22:23 -04:00
Steel Titanium
91767a7740
Merge branch 'master' into public-musicplus-libopenmpt
2019-05-20 21:33:10 -04:00
Monster Iestyn
ec0719f74f
Merge branch 'steelt-acz-things-hardcode' into 'master'
...
Hardcode some ACZ things
See merge request STJr/SRB2Internal!220
2019-05-17 12:22:21 -04:00
Monster Iestyn
572328a4fa
Merge branch 'public_flatsprite'
2019-05-16 16:00:24 +01:00
Monster Iestyn
66bc287688
Merge branch 'public_next'
2019-05-16 15:58:17 +01:00
Monster Iestyn
600a373739
Merge branch 'master' into next
2019-05-13 16:07:30 +01:00
Monster Iestyn
2a9019c15e
Merge branch 'archiveworld-sigsegv-fix' into 'next'
...
Fix SIGSEGV from sending lindefs/sidedefs in savegame due to duplicated lines.
See merge request STJr/SRB2!490
2019-05-13 07:02:48 -04:00
Alam Ed Arias
addf2bb3c4
Fix NONET build
2019-05-13 01:51:36 -04:00
Steel Titanium
8a14427420
Merge branch 'perpetual-modifier-updates' into 'master'
...
Set modifiers in a non-reactive manner
See merge request STJr/SRB2!456
2019-05-13 00:36:06 -04:00
Steel Titanium
06961a8f5e
Merge branch 'no-frameskip' into 'next'
...
Don't skip frames when connecting or paused
See merge request STJr/SRB2!489
2019-05-13 00:35:11 -04:00
Steel Titanium
cad65ad5e9
Properly fix crash due to duplicated lines.
2019-05-13 00:23:43 -04:00
Steel Titanium
4e0cc2505a
Revert "Check that lumps are okay"
...
This reverts commit 7ac0a8b4d2
2019-05-13 00:20:39 -04:00
Steel Titanium
b34aa86403
Hardcode some ACZ things
2019-05-11 22:56:23 -04:00
James R
7ac0a8b4d2
Check that lumps are okay
2019-05-08 20:30:19 -04:00
mazmazz
f30d91ee75
Merge remote-tracking branch 'public-gl/md3-vanilla' into md3-vanilla
2019-05-08 17:59:49 -04:00
mazmazz
6d803decb6
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-05-08 17:56:05 -04:00
Monster Iestyn
f0e16cad32
Merge branch 'master' into next
2019-05-08 16:31:05 +01:00
Monster Iestyn
8ea9d0e95c
Merge branch 'alias_recursion_hotfix_2' into 'master'
...
Alias recursion hotfix 2
See merge request STJr/SRB2!482
2019-05-08 11:25:15 -04:00
wolfy852
8f05d75926
Don't skip frames when connecting or paused
2019-05-08 09:39:45 -05:00
wolfs
e394f41c52
Merge branch 'public-musicplus-tagfix' into 'next'
...
Fix music load lag by reverting tag changes
See merge request STJr/SRB2!486
2019-05-07 22:42:13 -04:00
Sryder
b304b268c8
No sprite billboarding on papersprites
2019-05-06 20:24:26 +01:00
Sryder
1f1d67cd7e
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite
...
# Conflicts:
# src/p_user.c
2019-05-06 20:20:57 +01:00
Monster Iestyn
406c3619d7
Merge branch 'master' into next
2019-05-06 19:38:53 +01:00
Nev3r
aab2f55aec
Merge branch 'banip-command' into 'next'
...
Ban IP command
See merge request STJr/SRB2!460
2019-05-06 13:09:14 -04:00
Nev3r
ae25e8ea07
Merge branch 'console-wait-fix' into 'master'
...
Don't count down wait timer when executing a command line
See merge request STJr/SRB2!483
2019-05-06 12:56:07 -04:00
Nev3r
8b8e165d19
Merge branch 'opengl-sprite-billboarding' into 'master'
...
OpenGL Sprite Billboarding
See merge request STJr/SRB2!485
2019-05-06 12:45:53 -04:00
Sryder
8273534967
Add a cvar for sprite billboarding, off by default.
2019-05-06 16:57:32 +01:00
Monster Iestyn
ea951eef78
fix an inconsistency I introduced between counting the waypoints and finding them again
2019-05-05 21:16:44 +01:00
Monster Iestyn
ee0c4b42a6
fix P_CheckSight to consider FOFs that completely block the view
...
(this could probably be in its own branch to be tested properly, but I'm on a roll with this atm)
2019-05-05 21:03:15 +01:00
Monster Iestyn
b9611c3a81
Hardcoded the cork's stun-you-even-while-flashing behaviour
2019-05-05 19:16:30 +01:00
Monster Iestyn
b0087616c7
Hardcoded the boss's TouchSpecial hook.
...
Also cleaned up this part of P_TouchSpecialThing a bit while I'm here
2019-05-05 18:22:19 +01:00
Monster Iestyn
373d12cb82
Hardcode "slapstick"
2019-05-05 17:36:55 +01:00
Monster Iestyn
f7fbf40437
Hardcoded MT_FSGNA's MobjThinker hook function
2019-05-05 16:42:50 +01:00
Monster Iestyn
9c0c0ad3dc
hardcoded the boss's A_BossDeath behaviour.
...
(also turned this part of the function into a switch case to make things neater)
2019-05-05 16:03:34 +01:00
Monster Iestyn
289a412377
Hardcode the boss thinker function
2019-05-05 15:34:06 +01:00
Monster Iestyn
9e26d7bdaa
I just checked how P_LookForPlayers works, and it turns out it doesn't modify the target *unless* it returns true. So I guess we've no need to account for a change in target in A_LookForBetter after all?
2019-05-05 14:09:09 +01:00
Monster Iestyn
09368963dd
hardcode MT_FBOMB's MobjSpawn hook function
2019-05-04 22:46:27 +01:00
Monster Iestyn
d44265a217
Mystery solved, he was turning "invisible" because of this mistake in A_DoNPCSkid
2019-05-04 22:38:14 +01:00
Monster Iestyn
691ae982e7
S_FANG_SLIDE wasn't defined in the Lua script, despite being declared :|
...
Also Fang seems to turn invisible after his first jump for some reason, and I can't figure out why???
2019-05-04 21:31:46 +01:00
Monster Iestyn
7b6b34212b
Swap "S_TNTBARREL_EXPL1" for S_NULL as a temporary measure until I actually hardcode the explosion states.
...
As of now, you can now compile this branch with no issues. But Fang won't work properly for a while yet, we'll get there don't worry.
2019-05-04 20:20:34 +01:00
Monster Iestyn
445709037d
Fix some compiler complaints about A_Boss5FindWaypoint
2019-05-04 20:17:00 +01:00
Monster Iestyn
b205602db6
DO NOT USE FRACUNIT AS A LAZY WAY TO DO UPPER 16 BITS FOR ACTION VARS
2019-05-04 19:43:14 +01:00
Monster Iestyn
a5331f8024
Fix A_LookForBetter to not leave a stray thinker reference lingering potentially forever, as toaster pointed out it might do.
2019-05-04 17:15:59 +01:00
Monster Iestyn
54fea4d0b9
AND I forgot these checks, confound it
2019-05-03 23:16:11 +01:00
Monster Iestyn
ee1fd72f9f
ah, forgot to do this
2019-05-03 23:12:03 +01:00
Monster Iestyn
df99e93288
Hardcoded A_Boss5FindWaypoint
...
...that took a while x_x
2019-05-03 22:58:54 +01:00
Monster Iestyn
0d7cd34882
Hardcoded A_Boss5MakeItRain
2019-05-03 20:52:56 +01:00
Monster Iestyn
b03bfbabe4
Hardcode A_DoNPCSkid
2019-05-03 20:00:31 +01:00
Monster Iestyn
b4d8c2fa29
Hardcoded A_Boss5PinchShot
2019-05-03 19:46:41 +01:00
Monster Iestyn
6cd2b73273
Hardcoded A_LookForBetter
2019-05-03 19:14:17 +01:00
Monster Iestyn
a0220454fd
Hardcoded A_PrepareRepeat and A_Boss5Calm, added missing prototype for A_Boss5ExtraRepeat (and also fixed its description)
2019-05-03 18:51:17 +01:00
Monster Iestyn
1b2afea091
Merge branch 'public_next'
2019-05-03 16:42:42 +01:00
Monster Iestyn
454306cf86
Merge branch 'master' into next
2019-05-03 16:40:13 +01:00
Monster Iestyn
a5dfbe7eff
add parentheses around these conditions to fix sloped lights cutting out lights on FOF walls for apparently no reason
...
not making a merge request because this is so laughably stupidly simple
2019-05-03 16:38:59 +01:00
Monster Iestyn
d4ab2837bb
Merge branch 'master' into next
2019-05-03 16:00:45 +01:00
Steel Titanium
6aac014608
Generic model terminology
2019-05-02 22:55:45 -04:00
mazmazz
904b00e921
Remove song_length tag search
...
Because songs without this tag will skiplag when loading.
2019-05-02 19:14:23 -04:00
mazmazz
3e5b0c4531
Remove MP3 widechar tag searching
...
1. It's slow, 2. It's incorrect
2019-05-02 19:13:56 -04:00
mazmazz
89ab777c40
Merge remote-tracking branch 'origin/master' into menu-execs
2019-05-02 18:47:43 -04:00
mazmazz
05b576dde8
Merge remote-tracking branch 'public-gl/md3-vanilla' into md3-vanilla
2019-05-02 17:56:49 -04:00
Jaime Passos
39c422506e
Unbind VBO from model during mid-frame
...
https://git.magicalgirl.moe/STJr/SRB2/merge_requests/397?commit_id=79fed1e954ce77fabb2f09573e2fcd00d6326cef#note_11536
2019-05-02 17:56:06 -04:00
mazmazz
0bbdfa8bef
Merge remote-tracking branch 'public-gl/md3-vanilla' into md3-vanilla
2019-05-02 17:50:38 -04:00
Jaime Passos
79fed1e954
Unbind VBO from model during mid-frame
2019-05-02 17:49:10 -04:00
mazmazz
3d90488d17
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-05-02 17:43:40 -04:00
Monster Iestyn
266fa05e15
fix a slipup in A_DoNPCPain I just noticed I made, whoops
2019-05-02 21:34:00 +01:00
Monster Iestyn
61eb05eab2
Hardcoded A_Boss5CheckFalling
2019-05-02 21:32:28 +01:00
Monster Iestyn
953a0c2967
Hardcoded A_Boss5ExtraRepeat
2019-05-02 21:21:15 +01:00
Monster Iestyn
fb17c1ac5a
Hardcoded A_Boss5CheckOnGround
2019-05-02 19:09:40 +01:00
Monster Iestyn
3bbc5d0b08
hardcoded A_DoNPCPain
2019-05-02 18:32:43 +01:00
Monster Iestyn
75701294ea
Hardcode Fang waypoint object type (turns out no state is needed)
2019-05-02 18:11:44 +01:00
Monster Iestyn
d92ccf6823
Hardcoded all the main Fang-specific object types, states and sprites.
...
This cannot be compiled as-is right now for the following reasons:
* Numerous actions still need to be hardcoded.
* MT_FBOMB uses the TNT barrel explosion (and by extention A_TNTExplode) for its death state. This is a pickle, I'll deal with it when I get to it.
Also missing:
* Fang waypoint object type+states.
* Fang's good looks (to be put in the resource files obviously).
* Fang's brain.
2019-05-02 18:01:18 +01:00
Sryder
4d77ed925e
OpenGL sprite billboarding
...
Should work on both normal and precipitation sprites.
Sprites that are split by lighting should work correctly.
2019-05-01 20:15:00 +01:00
Nev3r
a56e8e4f8b
Merge branch 'further-mace-advancements' into 'master'
...
Further Mace Advancements
See merge request STJr/SRB2Internal!147
2019-04-30 15:15:35 -04:00
Nev3r
5c240eb9db
Add back the p_slopes.h header guard
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 18:05:16 +02:00
Nev3r
62875d6728
Send the slope thinkers list after the mobj list
...
Keeping the sector list before the mobj list stops the objects from "entering" or "floating" on slopes. However this induces a new slope adhesion problem in fast-moving slopes, so it is more desirable to leave the "indent/float-on" behavior for now since fixing this one seems like a big can of worms and falls off this branch's scope.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 17:16:35 +02:00
Nev3r
a9110c0645
Fixed more mobj thinker iterator oversights and removed all mobj thinker function checks
...
Mobjs got their own thinker list after all, and disappearing thinkers are automatically purged from their lists and sent to the limbo list.
So it's safe to assume all thinkers inside the mobj list must be mobjs.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 16:39:57 +02:00
Nev3r
a3174fb56f
Add a temporary limbo list for thinkers that need to be freed, in order to keep other lists clean, especially the mobj list.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 16:17:47 +02:00
Nev3r
fc9e141460
Give precip. its own thinker list
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 14:58:18 +02:00
Monster Iestyn
8cb0f55a90
Rename thinkers.iterate to mobjs.iterate, kill the "mobjs" arg (though you still need the parentheses). Done a bit messily/lazily, I'll clean up if we can confirm this works
...
I do wonder whether this library can be extended for all of thlist's lists... but for now it's mobj-only, since we only have the ability to mess with mobjs anyway.
2019-04-21 13:52:55 +01:00
Nev3r
696ccbd943
Fix mobj list iteration oversights.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 12:58:22 +02:00
Nev3r
aad78d4985
Give slope thinkers their own list right before mobjs'.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 12:00:10 +02:00
Nev3r
11dba34f43
Remove dynamic slope queue list due to now being unnecessary.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 11:52:18 +02:00
Nev3r
d264d06879
Merge branch 'slopethinkers' into thinkerlists
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 11:47:34 +02:00
Nev3r
134679c287
Fix some of the polyobject thinkers being removed via P_RemoveThinkerDelayed() directly
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 11:08:24 +02:00
Nev3r
b60c66325c
Added a mobj-only list entry for mobj thinkers
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 23:29:20 +02:00
Nev3r
39ba20be6b
Basic multiple thinker list implementation
...
Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 22:39:22 +02:00
Nev3r
7c17ed0aa6
Things spawning over copied slopes now properly align on the new plane
...
While I believe the opposite behavior was intentional at first, it has proven to be problematic and makes alignment a tedious task for copied planes.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 19:03:50 +02:00
Nev3r
b3ac590e5e
Add a slope thinker queue.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 13:06:06 +02:00
Nev3r
83001a5bc9
Fix line-based slopes' normals.
...
The game never uses the normals directly yet so it's been left unnoticed ever since.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-19 20:34:22 +02:00
Nev3r
8a2e11ffa9
Small code cleanup
...
- Removed unused vars from the slope struct. I'm pretty sure they were meant for something at some point, but right now there's nothing using them and frankly I find it hard to understand what they were meant for.
- Removed unused slope flags.
- Flipped dynamic slope flag naming convention.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-19 20:30:13 +02:00
Nev3r
5401e9560f
Dynamic slopes now use thinkers.
...
* Moved dynamic slope-related data into its own thinker.
* Vertex slopes no longer use the mapthings directly.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-19 14:14:43 +02:00
Nev3r
f7d1515888
Perform dynamic slope thinking before other thinkers.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-18 14:43:34 +02:00
Monster Iestyn
3203dc5d4b
Remove old code altogether at Nev3r's request
2019-04-17 16:46:32 +01:00
Monster Iestyn
6bddd131da
Undefine toaster's old define to flip full-brightness default status for planes
2019-04-17 14:51:48 +01:00
Steel Titanium
26fdee8217
Don't enable UPnP support if NONET is defined.
2019-04-16 15:05:09 -04:00
James R
36e678b292
Don't count down wait timer when executing a command
2019-04-14 15:17:47 -07:00
Monster Iestyn
797ca99f42
Detect infinite alias self-recursion mixed with other commands, such as in the case of alias a "echo test; a"; a.
...
(Unfortunately, this does not work if "wait" is used instead of "echo", but oh well)
2019-04-14 16:39:14 +01:00
Monster Iestyn
8a2f8a441b
Merge branch 'master' into opengl-new-patch-features-support
2019-04-11 20:09:57 +01:00
Monster Iestyn
212be85655
added "checkmobjs" boolean to both Polyobj_moveXY and Polyobj_rotate, so we can disable interaction with mobjs for netgames
2019-04-05 12:03:03 +01:00
Nev3r
1d401d8481
Merge branch '144-scrolltweaks' into 'master'
...
Resolve "Let scrollers and wind/current affect front sector if untagged, and use texture offsets as parameters if different from 0"
Closes #144
See merge request STJr/SRB2Internal!213
2019-04-05 06:41:11 -04:00
Nev3r
fec991dedb
Implement displacement-based polyobject rotation.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-05 11:50:59 +02:00
Monster Iestyn
07a66e5355
Merge branch 'public_next'
2019-04-02 15:49:15 +01:00
Monster Iestyn
ab0fe6b164
Merge branch 'master' into next
2019-04-02 15:47:07 +01:00
James R
42d25f67ca
Merge remote-tracking branch 'origin/master' into less-obtuse-console-fixes
2019-03-31 12:29:55 -07:00
Monster Iestyn
27147a9e0b
fix slipup of mine that would have prevented this thing compiling
2019-03-31 14:11:27 +01:00
Monster Iestyn
7ae6d5ee8c
Merge branch 'public_next'
...
# Conflicts:
# src/doomstat.h
# src/g_game.c
2019-03-28 14:19:02 +00:00
James R
917edf720d
Don't close console when starting title screen
2019-03-26 13:05:19 -07:00
James R
9a350eb879
Don't close console when changing map
2019-03-26 13:04:11 -07:00
James R
69d7e98f34
Remove redundant CON_ClearHUD calls
2019-03-26 12:59:13 -07:00
James R
e8071e66e4
Resize console upon resolution change
...
Basically, changing to a lower resolution won't cause your console to extend
past the screen anymore.
2019-03-26 12:30:02 -07:00
jameds
b9b36a44a8
Keep color across wrapped lines
...
And this works by inserting the same color code on each wrapped line.
2019-03-26 12:07:11 -07:00
jameds
587586f4bb
Scroll console immediately upon pressing PageUp
2019-03-26 12:05:23 -07:00
Monster Iestyn
a01a0a3dc3
Merge branch 'master' into next
2019-03-26 13:46:15 +00:00
Monster Iestyn
9ef98471a4
Merge branch 'buildbot' into 'master'
...
Buildbot changes
See merge request STJr/SRB2!477
2019-03-26 09:44:56 -04:00
Monster Iestyn
8e78369f83
Merge branch 'dedicated-server-credits-fix' into 'master'
...
Dedicated server credits fix
See merge request STJr/SRB2!476
2019-03-26 09:44:21 -04:00
Monster Iestyn
67874180b2
Merge branch 'gametype-strings-backport' into 'next'
...
Gametype strings backport
See merge request STJr/SRB2!473
2019-03-26 09:42:52 -04:00
James R
d00cc7cddb
Prevent just anyone from skipping credits but allow admins
...
exitlevel works too
2019-03-25 16:19:40 -07:00
Monster Iestyn
8c1c0875a2
Fix credits gamestate in dedicated mode, by properly separating the timer variable code from the drawing code in a semi-hacky way
2019-03-25 21:35:04 +00:00
Alam Ed Arias
fe22fdc5a3
P_SuperDamage() is too big for inlining
2019-03-25 15:30:25 -04:00
Monster Iestyn
147221cf6e
R_RenderThickSideRange: clamp lights that fail overflow test, rather than skipping them.
2019-03-25 18:54:47 +00:00
Monster Iestyn
7441dd7d9b
Merge branch 'master' into next
2019-03-25 18:08:36 +00:00
James R
ed0f8fd967
Actually allow connecting to "localhost"
...
Because IPv6 doesn't seem to work anyway.
2019-03-20 20:37:00 -07:00
James R
f139ffd1dc
Let localhost connections
2019-03-20 20:37:00 -07:00
Monster Iestyn
ecb6322a52
Merge branch 'sdl-noxinput-nohidapi' into 'master'
...
-noxinput and -nohidapi command line parameters.
See merge request STJr/SRB2!468
2019-03-20 17:33:04 -04:00
Monster Iestyn
2fb569857a
Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa
...
gametype_cons_t is now initialised using the Gametype_Names array, like how Color_cons_t is initialised using Color_Names
# Conflicts:
# src/doomstat.h
# src/m_menu.c
2019-03-18 22:00:23 +00:00
Nev3r
aa43f8b3bf
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into 144-scrolltweaks
2019-03-16 08:14:29 +01:00
Steel Titanium
6d751ff302
Remove the define.
2019-03-15 18:46:25 -04:00
mazmazz
8317155c40
Merge branch 'public-gl-next' into public-musicplus-jingle
2019-03-15 18:42:19 -04:00
Steel Titanium
5a170b9e4e
Merge branch 'master' into errorifpng
2019-03-15 16:40:47 -04:00
Steel Titanium
67a80ba311
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into banip-command
2019-03-15 16:13:31 -04:00
Jimita
6e4b42fc97
Merge branch 'next' into flashpals-on-screenshots
2019-03-15 16:38:33 -03:00
mazmazz
f18103a473
Declare exitfadestarted properly
2019-03-15 11:01:41 -04:00
mazmazz
ad50fa4d9e
Fix MIDI crash bug when changing music between levels
...
This happened when the old music was ERZ2 native midi, then warping to any other level.
2019-03-15 10:02:50 -04:00
mazmazz
7346684bd8
Fade out music upon dying or level change: 2.1 frontport
2019-03-15 04:21:17 -04:00
mazmazz
587a51a957
Fix end-of-level fading for cv_playersforexit
...
(Code in p_user.c was from 2.2, where cv_playersforexit has different values so that the player exit check works differently)
2019-03-15 03:47:30 -04:00
mazmazz
8afaaa80a1
lclear -> _clear typo
2019-03-15 03:15:20 -04:00
mazmazz
a1ccb8512d
Merge branch 'public-gl-next' into public-musicplus-feature-endoflevel
2019-03-15 02:07:53 -04:00
mazmazz
f163633591
Merge branch 'public_next'
2019-03-15 01:43:03 -04:00
mazmazz
6b93ca9221
Intermission: Don't fade out level music when using win32 midi volume hack
2019-03-15 01:26:13 -04:00
mazmazz
e098d6a8b8
Merge branch 'public-musicplus-feature-interfadeout' into public-musicplus-feature-endoflevel
2019-03-15 01:09:12 -04:00
mazmazz
6cf05a4613
Implement MUSICINTERFADEOUT level header
2019-03-15 01:05:52 -04:00
mazmazz
ba77dfd546
Merge branch 'public-musicplus-feature-interfadeout' into public-musicplus-feature-endoflevel
2019-03-15 01:01:24 -04:00
mazmazz
b5fc27c545
Implement MUSICINTERFADEOUT level header
2019-03-15 01:00:50 -04:00
mazmazz
773f9dc2ba
Merge remote-tracking branch 'public-gl/next' into public-musicplus-feature-endoflevel
2019-03-15 00:39:26 -04:00
mazmazz
9064a0b33a
Merge remote-tracking branch 'origin/master'
2019-03-15 00:33:12 -04:00
mazmazz
4377386153
Merge branch 'public_next'
2019-03-15 00:33:06 -04:00
mazmazz
bd9e42ce6e
Merge branch 'public-gl-next' into public-musicplus-inter
2019-03-14 23:42:16 -04:00
mazmazz
3b6be9b419
Remove redundant music reset block for MIXNIGHTSCOUNTDOWN
2019-03-14 23:21:52 -04:00
mazmazz
469ed9cbe3
Implement MIXNIGHTSCOUNTDOWN
...
An alternate mode to NiGHTS countdown jingle: play it as an SFX while fading down the music.
2019-03-14 23:10:14 -04:00
mazmazz
9ec98c588f
Merge branch 'public_next'
2019-03-14 22:15:34 -04:00
mazmazz
fdde5f13c5
When resetting volume on same music, make it fade instead of a hard change
2019-03-13 23:55:30 -04:00
mazmazz
67e2857303
When changing to same music, reset the internal volume
2019-03-13 23:41:35 -04:00
mazmazz
c021e29835
Restore MUSIC_RELOADRESET if block in g_game
2019-03-13 21:18:23 -04:00
mazmazz
2c75d4da69
Fix custom fade source bug for Change Music linedef
2019-03-13 19:53:16 -04:00
mazmazz
aea18f36ba
Remove MP3 warning
2019-03-13 19:51:45 -04:00
mazmazz
93626c2293
Merge remote-tracking branch 'public-gl/next' into public-musicplus-core
2019-03-13 19:45:07 -04:00
Nev3r
ae9f8856ac
Override vectorial magnitude with front X offset, if provided; takes the line's lengths into account otherwise, as usual.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-03-13 12:24:47 +01:00
Nev3r
cd3ea897c3
Dealt with no-tag business:
...
* Wind/current pushers affect front sector if left untagged.
* Plane scrollers affect front sector if left untagged.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-03-13 11:13:54 +01:00
Alam Ed Arias
08784ce58d
Merge branch 'master' into next
2019-03-09 20:37:17 -05:00
Alam Ed Arias
60ca6ae06b
TravisCI: add option for GCC 8.1
2019-03-09 19:41:56 -05:00
Nev3r
83f953edb8
Make FOFs extend to infinity when in contact with a horizon line.
...
Make FOFs extend to infinity when in contact with a horizon line.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-03-07 19:01:02 +01:00
Jimita the Cat
0186f6784b
a
2019-03-06 21:40:38 -03:00
Alam Ed Arias
747995ae6a
Merge branch 'master' into next
2019-03-04 17:15:04 -05:00
Alam Ed Arias
67e246cd53
No more errors for VC6 support
2019-03-04 16:46:14 -05:00
Alam Ed Arias
145ccfd405
no more floating constants warnings, and disable bad array bounds warnings
2019-03-04 16:46:14 -05:00
Steel Titanium
9542a47f7f
New -noxinput and -nohidapi command line parameters.
2019-03-03 22:57:09 -05:00
Steel Titanium
15323328c5
Check using memcmp()
2019-03-03 22:43:21 -05:00
Steel Titanium
34645238d4
Fix MF_NOCLIPTHING
2019-03-03 20:08:11 -05:00
Steel Titanium
3d5d02fc15
Error if the lump is a PNG lump
2019-03-03 19:58:01 -05:00
Monster Iestyn
a93e96c75b
Merge branch 'public_next'
...
# Conflicts:
# src/sdl12/Srb2SDL-vc10.vcxproj
# src/sdl12/Srb2SDL-vc9.vcproj
# src/sdl12/macosx/Srb2mac.pbproj/project.pbxproj
# src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-03-02 20:51:15 +00:00
Alam Ed Arias
c2618fd987
Merge branch 'master' into next
2019-03-01 17:32:17 -05:00
Alam Ed Arias
f823768699
Fix building without BLUA support
2019-03-01 17:31:32 -05:00
Monster Iestyn
008b0bf560
Merge branch 'master' into next
2019-03-01 16:23:51 +00:00
Monster Iestyn
67e721e983
Merge branch 'need-more-time' into 'master'
...
Stop Linux servers from hanging every 34 hours
See merge request STJr/SRB2!465
2019-03-01 11:22:32 -05:00
Monster Iestyn
4459ecdd90
Merge branch 'master' into next
2019-03-01 16:05:49 +00:00
wolfy852
97de2ae4f6
Stop Linux servers from hanging every 34 hours
2019-03-01 00:07:58 -06:00
Monster Iestyn
8920693159
Saving work made so far improving and optimizing addons menu code, also adding some macros and comments for readability
2019-02-28 21:52:01 +00:00
Alam Ed Arias
7cd60a544a
Merge branch 'apng-oh-shit-fixes' into 'master'
...
Compiling errors for apng fixed
See merge request KartKrew/Kart-Public!69
2019-02-28 12:00:58 -08:00
wolfs
5620d0188e
Merge branch 'apng' into 'master'
...
Support aPNG in new versions of libpng
See merge request KartKrew/Kart-Public!63
2019-02-28 12:00:58 -08:00
Monster Iestyn
ae244d2af3
Fix goofup with addonsp patch unlock for loop from 2.1.13 merge
2019-02-28 15:48:27 +00:00
Monster Iestyn
7a0d8b408e
Merge branch 'public_next'
...
# Conflicts:
# src/d_main.c
# src/dehacked.c
# src/m_menu.c
# src/m_menu.h
2019-02-27 22:36:01 +00:00
Steel Titanium
fa990e8603
Remove double define
2019-02-27 16:05:43 -05:00
Steel Titanium
e71977fe6a
Merge branch 'next' into banip-command
2019-02-27 16:03:01 -05:00
Steel Titanium
15b27bb7d7
Upped MAXNETNODES
2019-02-27 15:59:50 -05:00
Monster Iestyn
0340eb0b99
Merge branch 'master' into next
2019-02-27 20:35:07 +00:00
Monster Iestyn
d76e946b3e
Merge branch 'sdl-new-windowicon' into 'master'
...
SDL:Update XPM icon
See merge request STJr/SRB2!441
2019-02-27 13:34:24 -05:00
Monster Iestyn
a25f4b8194
Make sure that B_CheckRespawn can be called even if Tails is dead
2019-02-26 21:14:22 +00:00
Alam Ed Arias
e36193e44e
Merge branch 'hide-error-devmode' into 'next'
...
Show line number on error, also hide under devmode
See merge request STJr/SRB2!458
2019-02-21 23:05:09 -05:00
Alam Ed Arias
2f8eadd211
Merge branch 'master' into next
2019-02-21 22:42:26 -05:00
Steel Titanium
bfbb83df23
Save when quitting the game.
...
Also use default reason if not custom reason is given.
2019-02-21 19:48:15 -05:00
Steel Titanium
bf2f6ebc09
Save ban list right after banning.
2019-02-21 19:47:00 -05:00
Steel Titanium
c9d90f7688
Add command to ban an IP address.
2019-02-21 19:44:18 -05:00
Steel Titanium
c1deea0714
Disable multi statement macros errors.
2019-02-21 18:48:42 -05:00
Monster Iestyn
cb986bf1c0
added support for both horizontal and vertical flipping (not sure if complete or not atm, but I've done enough for tonight I think)
2019-02-13 22:40:48 +00:00
Monster Iestyn
7321df8015
some more mucking about with function arguments (preparing for alpha/flip support adding particularly), also fixed a slipup I made when I first made HWR_DrawColumnInCache
2019-02-13 20:56:59 +00:00
Monster Iestyn
d2c6b995d3
split HWR_DrawPatchInCache into two functions: one for texture patches and one for everything else
2019-02-13 20:12:10 +00:00
Monster Iestyn
497e79d1de
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
55e3e99a94
Merge branch 'master' into opengl-new-patch-features-support
2019-02-13 18:08:17 +00:00
Monster Iestyn
8f667906eb
Fix compiler warnings
2019-02-13 18:06:56 +00:00
Monster Iestyn
ff2ebf20fb
blockmodulo and bpp do not need to be args of HWR_DrawPatchInCache
2019-02-13 17:27:20 +00:00
Monster Iestyn
efa042a995
whoops, removed some variables I shouldn't have, so I've added them back
2019-02-13 16:52:51 +00:00
Monster Iestyn
30a00c812c
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
Steel Titanium
76724c9c13
Show line number on error, also hide under devmode
2019-02-11 16:39:58 -05:00
Monster Iestyn
e6cb47e2f2
Merge branch 'fix_skins_overflow' into 'next'
...
Fix skin overflow error
See merge request STJr/SRB2!455
2019-02-11 15:05:00 -05:00
MascaraSnake
5eb089cc14
Forgot the continue statements
2019-02-03 17:07:13 +01:00
MascaraSnake
00cad05550
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
bc30bd06df
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
8c345b87ca
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
0dd8779b91
Hardcoded emblems of the first four special stages
2019-01-30 23:01:58 +01:00
MascaraSnake
88a6dbae9b
Spring Hill -> Christmas Chime
2019-01-29 22:26:15 +01:00
MascaraSnake
f6dd521fd0
Updated/added emblem locations for GFZ, THZ, DSZ1, CEZ1, FHZ2 and HHZ
2019-01-28 21:28:38 +01:00
Steel Titanium
0aa965c59f
How did I forget about this
2019-01-26 23:22:30 -05:00
Steel Titanium
bce093fd06
Setup the tables even eariler.
...
I really hate that PlayerMenu status hack, but that's really the only
way I could think off to show the entires for Tails, Knuckles and the
Sonic&Tails pair.
2019-01-26 23:16:49 -05:00
Steel Titanium
74bf3164f8
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into polyobj_fix_vanilia
2019-01-26 00:51:39 -05:00
TehRealSalt
0d1c501664
Update the SP menu stuff to use MAXSKINS
...
Co-authoered-by: Steel Titanium (steeltitanium1@gmail.com>
2019-01-26 00:22:05 -05:00
Alam Ed Arias
74850fea17
Merge branch 'master' into next
2019-01-20 17:01:01 -05:00
Sryder
b18a8dbc8d
Disable the APNG code if the version of libpng is greater than 1.4.
...
Since supposedly the current code *can't* work with newer versions of libpng that have the apng patch, it won't compile if that's what people have.
It seems like some distros are adding the apng patch to libpng and that'll make things annoying to compile for people.
I think it goes without saying, but if there's ever a fix to make newer libpng versions work with the APNG code then this can be reverted.
2019-01-20 18:50:28 +00:00
james
356249dade
Set modifiers in a non-reactive manner
2019-01-17 16:47:01 -08:00
Jimita
424b2b1aaf
Merge branch 'next' into flashpals-on-screenshots
2019-01-16 05:59:05 -02:00
Steel Titanium
fad341b0e9
Fix skins overflow
2019-01-15 14:29:43 -05:00
fickleheart
7e026824a4
Fix rendering gaps on polys with upper/lower textures
2019-01-12 20:15:58 -05:00
Monster Iestyn
f3796dc7f6
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
Digiku
d05caf5963
Update hw_md2.c -- add comment about anglef player->frameangle from Kart
2019-01-08 11:26:39 -05:00
mazmazz
a050ed956a
Fixed Addons Menu icons for search bar
2019-01-08 01:31:44 -05:00
mazmazz
47bd042a7e
Misssed alwaysfreelook defaults (first person)
2019-01-08 01:29:12 -05:00
mazmazz
d5de5e9f49
Fix player.dta SIGNA0 overwriting regular end sign frame
2019-01-08 00:19:42 -05:00
mazmazz
e02fd489a7
GCC 7 fallthru bypasses (-Werror-implicit-fallthrough)
2019-01-07 23:06:47 -05:00
mazmazz
8ea8bf2587
Chat arrow offsets
2019-01-07 22:34:48 -05:00
mazmazz
5066e340f4
Update SRB2-CHAT nickname colors to 2.2 skincolors
2019-01-07 22:26:39 -05:00
mazmazz
e403d1bacc
Correct addons menu back color
2019-01-07 21:58:42 -05:00
mazmazz
dfc427e81a
Dummy out SRB2-CHAT console colors
...
Pending translation to 2.2 palette indexes
2019-01-07 21:54:38 -05:00
mazmazz
411b1b4f54
Addons menu merge fixes
2019-01-07 21:45:41 -05:00
mazmazz
a775a63dfd
WIP hu_stuff merge fixes
2019-01-07 17:56:55 -05:00
mazmazz
875aee60a0
Menu merge fixes
2019-01-07 17:56:43 -05:00
mazmazz
b3f7b169b2
Merge errors for compile
2019-01-07 17:05:20 -05:00
Digiku
4f0be1b064
Update f_finale.c - Small credits update
2019-01-07 16:50:59 -05:00
mazmazz
7aa55f24f5
Resolve r_data.c colormap conflict
2019-01-07 15:29:37 -05:00
Nev3r
7d09149b04
Solved conflicts related to PK3s
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-01-07 19:00:31 +01:00
Monster Iestyn
9effa134d2
resolve the conflict in p_spec.c
2019-01-07 17:02:05 +00:00
Monster Iestyn
96ad8dd81a
resolve conflict in r_main.c
2019-01-07 16:52:46 +00:00
mazmazz
66e6a6f940
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-01-07 04:06:45 -05:00
Digiku
1c1331199d
Update f_finale.c - Remove Torgo's real name by request
2019-01-07 03:41:25 -05:00
mazmazz
015e7b9862
Resolve p_setup and d_netcmd conflicts (20190101 public merge)
2019-01-07 03:07:24 -05:00
mazmazz
e18eb69a0b
Resolved filesrch.c conflicts (20190101 public merge)
2019-01-07 02:54:26 -05:00
mazmazz
e9150b6645
Resolve m_menu.c conflicts (20190101 public merge)
2019-01-07 02:31:45 -05:00
mazmazz
24e37a23a5
Merge branch 'musicplus-core' into musicplus-feature-postboss
2019-01-07 01:17:07 -05:00
mazmazz
36f802eb15
Merge remote-tracking branch 'origin/master' into musicplus-core
2019-01-07 01:15:08 -05:00
mazmazz
1e702443e3
Merge remote-tracking branch 'origin/musicplus-core' into musicplus-feature-postboss
2019-01-07 01:10:54 -05:00
Steel Titanium
7d1e59d4ba
Some few changes
2019-01-05 23:42:25 -05:00
mazmazz
578a4fe80d
Merge remote-tracking branch 'public-gl/master' into travis-deployer
2019-01-05 09:08:34 -05:00
Marco Z
882355d24b
Specify HAVE_LIBGME, paths, and depends only for Win32/x64 MSVC
2019-01-04 21:18:55 -05:00
Marco Z
09ed8bd046
Add LibGME to DD vc10 project
2019-01-04 20:43:45 -05:00
Marco Z
88c4a54cea
Add GME to VC10 SRB2SDL project
2019-01-04 20:43:42 -05:00
Digiku
d5870e6f8a
Merge branch 'changecontrol-text-overflow-fix' into 'master'
...
Resolve buffer overflow crash when configuring System Menu and GIF controls
See merge request STJr/SRB2!445
2019-01-04 19:39:17 -05:00
Digiku
c97dc5d3c4
Increase M_ChangecontrolResponse message buffer by 25 chars
2019-01-04 19:38:36 -05:00
mazmazz
87c015e340
MUS_MODPLUG fix
2019-01-04 18:39:09 -05:00
mazmazz
a3fd5e7247
Revert "Un-dummy md5 checks"
...
This reverts commit 908a6d321d
2019-01-04 11:31:20 -05:00
mazmazz
69965b8d98
Flip HAVE_OPENMPT on by default for non-Windows makefile
2019-01-04 01:48:04 -05:00
mazmazz
1bfc4c02e4
CMake fixes for OpenMPT
2019-01-03 21:17:18 -05:00
mazmazz
4a17e9ed9b
Remove dynamic openmpt loading
2019-01-03 20:52:09 -05:00
Marco Z
caab60e9f0
Fix MSVC compile errors
2019-01-03 20:34:10 -05:00
Marco Z
6d2ef74b21
Add libopenmpt to VC10 project
2019-01-03 20:28:00 -05:00
mazmazz
d1534257dd
Add mingw-compiled libopenmpt 0.4.0 DLLs
2019-01-03 16:07:32 -05:00
mazmazz
bbcc82e9b4
Fix blinking MD2 models
...
MD2 models are forced to load float frames, so mesh->indices is never loaded, so glDrawElements can't be used. Use glDrawArrays instead.
2019-01-03 00:57:14 -05:00
mazmazz
908a6d321d
Un-dummy md5 checks
2019-01-02 23:31:29 -05:00
mazmazz
2e4c139551
DD Compile fixes
2019-01-02 06:48:06 -05:00
mazmazz
2bd794c006
Remove S_MusicExists lua
2019-01-02 06:26:18 -05:00
Steel Titanium
827461cc36
Support for per-map intermission music
2019-01-02 05:15:23 -05:00
mazmazz
dd856a8c89
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2019-01-02 05:06:09 -05:00
mazmazz
e2e345988a
Add safe lua music functions
...
S_MusicExists
S_SetInternalMusicVolume
S_StopFadingMusic
S_FadeMusic
S_FadeOutStopMusic
2019-01-02 04:58:03 -05:00
mazmazz
c8d338ca35
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2019-01-02 04:02:13 -05:00
mazmazz
1aacfee80c
Merge branch 'public-musicplus-le-changemusic' into public-musicplus-core
2019-01-02 03:47:51 -05:00
mazmazz
a851c5d7da
Add libopenmpt to cmake
2019-01-02 03:45:40 -05:00
mazmazz
08812b1501
Revised MinGW Makefile logic for OpenMPT
2019-01-02 02:37:48 -05:00
mazmazz
953f5b6297
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2019-01-02 02:15:29 -05:00
mazmazz
109dd70a53
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-02 02:15:16 -05:00
mazmazz
6166fad045
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2019-01-02 02:14:49 -05:00
mazmazz
075f28b7c8
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
Jimita the Cat
c3d69a8a04
Merge branch 'flashpals-on-screenshots' of https://github.com/monster-psychic-cat/SRB2 into flashpals-on-screenshots
2019-01-02 01:02:14 -03:00
Jimita the Cat
892e650712
dumb
2019-01-02 01:01:57 -03:00
Alam Ed Arias
819e4ef2ae
Merge branch 'master' into next
2019-01-01 23:00:39 -05:00
Jimita
8fdff96733
Merge branch 'next' into flashpals-on-screenshots
2019-01-02 01:55:59 -02:00
Jimita the Cat
e765b9400c
Add support for flashpals in screenshots
2019-01-02 00:41:52 -03:00
Digiku
393c64b8bc
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
5278d1ca20
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
bbd878e520
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
mazmazz
7916e020d2
Fix loop_point and song_length floating point comparisons
2019-01-01 10:47:16 -05:00
mazmazz
b7bb570f97
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-01 10:41:40 -05:00
mazmazz
d61eb7edee
Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config
2018-12-31 01:43:47 -05:00
mazmazz
78fa72514f
Implement deployer scripts for Travis -- OSX and Linux package building
2018-12-30 15:22:50 -05:00
Steel Titanium
0ebe5b258c
Inclue PNG file
2018-12-29 23:10:45 -05:00
Steel Titanium
a7b96ab83d
Update XPM icon
2018-12-29 22:52:04 -05:00
mazmazz
3d2e58861d
Rename M5 to ARCHOPTS; allow override by command line
2018-12-29 21:55:35 -05:00
mazmazz
4cfacf5cde
Check for NONX86 in addition to X86_64; move MINGW64 subflags from win32/Makefile.cfg to Makefile
2018-12-29 21:14:50 -05:00
mazmazz
1a4f1e54f3
Merge branch 'timedemo-revise' into md3-vanilla
2018-12-29 12:09:32 -05:00
mazmazz
b3908755af
Add CSV functionality to timedemo
...
* Append timedemo trials to timedemo.csv
* Specify -csv <trialid> to toggle CSV behavior
* Specify -quit to immediately quit after timedemo
* Add ticrate, rendermode, video mode, demo name, bits to CSV timedemo row
2018-12-29 04:51:00 -05:00
mazmazz
56892c13ab
Add framecount to timedemo message
2018-12-28 22:59:54 -05:00
Digiku
80e30c6aaa
Merge branch 'MSVC-ARM' into 'master'
...
ARM and ARM64 support with MSVC toolchain
See merge request STJr/SRB2!412
2018-12-28 01:05:40 -05:00
mazmazz
89c12a4ee8
Reset timedemo counters after wipe
2018-12-27 23:23:09 -05:00
mazmazz
1d9b8d357b
Add framecount increment to HWR_RenderPlayerView
...
Analogue to R_RenderPlayerView; used for timedemo FPS reading
2018-12-27 23:05:06 -05:00
mazmazz
34915f0508
Compile fix -- remove (void)alpha from DoScreenWipe
2018-12-27 22:29:12 -05:00
Arthur
4f1f315563
Eliminate some old GL functions so we don't slide back into bad habits!
2018-12-27 22:10:10 -05:00
Arthur
b83790260f
Fix screen transitions
2018-12-27 22:09:00 -05:00
Steel Titanium
d048e7cbec
Don't set if LINUX64 is defined
2018-12-27 21:17:02 -05:00
Steel Titanium
5ba0863876
Stupid restrictions
2018-12-27 19:00:18 -05:00
Steel Titanium
4a05fd5f26
More explict check
2018-12-27 18:54:10 -05:00
mazmazz
f7a01c60a4
Buildbot fixes
2018-12-27 01:00:09 -05:00
Steel Titanium
6dddf61265
Target nocona for 64-bit builds
2018-12-27 00:56:33 -05:00
mazmazz
f6e8b26af1
Compile fixes -- specify GLubyte for pglColor4ubv
2018-12-27 00:50:43 -05:00
Arthur
587ffa9ada
Removed gr_voodoocompatibility as even low-power mobile devices do not have this limitation
...
No longer using byte2float in DrawPolygon -- use the surface color data directly
Vertex Buffer Objects for non-interpolated model frames
Removed some old unused paletted texture stuff
2018-12-27 00:35:29 -05:00
Arthur
a812acc3d4
Removed unused PF_Md2 flag
...
More OpenGL performance increase by making assumptions about client state
2018-12-27 00:30:07 -05:00
Arthur
0978732ecd
boolean fix for VS
...
add GL_NORMALIZE
2018-12-27 00:24:21 -05:00
mazmazz
8c3e6642a7
Ignored fread fix
2018-12-27 00:01:51 -05:00
mazmazz
5ec40cf906
More mixed d&c fixes
2018-12-26 23:50:35 -05:00
mazmazz
52f668e9b0
byte -> char
2018-12-26 23:40:29 -05:00
mazmazz
036e44aa21
Mixed D&C fixes
2018-12-26 23:39:34 -05:00
mazmazz
b175629748
Fix floating point comparisons
2018-12-26 23:15:28 -05:00
mazmazz
74d6921f47
Merge tag 'SRB2_release_2.1.23' into md3-vanilla-ssn
2018-12-26 22:55:25 -05:00
james
0b857f127f
Update capslock state on window re-focus
2018-12-26 15:49:57 -08:00
Digiku
da9447342c
Merge branch '2123-version' into 'master'
...
Update code versions to 2.1.23
See merge request STJr/SRB2!435
2018-12-26 17:14:58 -05:00
Digiku
ebb4c65d92
Merge branch 'srb2-chat-nonet' into 'master'
...
Hide SRB2-CHAT behind #ifndef NONET
See merge request STJr/SRB2!434
2018-12-26 17:13:23 -05:00
mazmazz
60bdc056f8
Also hide Chat Options if NONET
2018-12-26 16:41:39 -05:00
mazmazz
894c139bf1
Update code versions to 2.1.23
2018-12-26 16:31:43 -05:00
mazmazz
814db7e371
Hide SRB2-CHAT behind #ifndef NONET
2018-12-26 16:20:17 -05:00
Steel Titanium
4f18ec60bc
Fix saving progress on vanilia
2018-12-26 15:47:12 -05:00
mazmazz
fa6f791ec3
Fix -ANGLE_180 because MSVC complains
...
-ANGLE_180 evaluates equal to ANGLE_180.
2018-12-25 01:14:05 -05:00
mazmazz
73a67fc9f5
Merge branch 'ctf-enemy-flag-sound' into 2122-version
2018-12-25 00:27:08 -05:00
mazmazz
842bcfc8a0
Merge remote-tracking branch 'public-gl/master' into 2122-version
2018-12-25 00:19:45 -05:00
mazmazz
a626660564
Merge remote-tracking branch 'public-gl/next' into 2122-version
2018-12-25 00:19:42 -05:00
mazmazz
0b81debf94
Merge remote-tracking branch 'public-gl/master' into undo-old-side-discolor-fix
2018-12-25 00:09:24 -05:00
mazmazz
82a40f0dba
Support Look Up/Down keys for NiGHTS movement
2018-12-24 23:48:03 -05:00
mazmazz
b7edc7f870
Revert "Merge branch 'side-discolor-fix' into 'master'"
...
This reverts commit e721a3d8824656a0d02c
2018-12-24 20:58:26 -05:00
mazmazz
bfc501a271
Revert default console backcolor to green; changed from CHAT commit
2018-12-24 20:57:11 -05:00
Digiku
cb42702e6b
Merge branch 'float-compare-colormap-fix' into 'master'
...
Fix float comparison for colormap maskamt
See merge request STJr/SRB2!428
2018-12-24 20:55:06 -05:00
mazmazz
10a3e3fec9
Define EPSILONs only if not already defined
...
Fixes OSX buildbot
2018-12-24 20:36:28 -05:00
mazmazz
c65f44e805
Remove log message
2018-12-24 20:33:59 -05:00
mazmazz
e9e5128754
Use DBL_EPSILON for colormap comparison
2018-12-24 20:22:10 -05:00
Alam Ed Arias
4651eddc36
Merge branch 'master' into next
2018-12-24 20:15:45 -05:00
mazmazz
58728ec358
Fix float comparison for colormap maskamt
2018-12-24 19:58:05 -05:00
mazmazz
32697ddf61
Fix gcc 8 compile by using strcpy instead of memcpy for PM
2018-12-24 18:51:11 -05:00
mazmazz
7fc79f0b88
Merge remote-tracking branch 'public-gl/master' into 2122-version
2018-12-24 17:31:03 -05:00
mazmazz
c2dc5788bf
Merge remote-tracking branch 'public-gl/next' into 2122-version
2018-12-24 17:30:59 -05:00
Jimita
4c6334f459
cleanup
2018-12-24 17:21:33 -05:00
Digiku
f06fd4149d
Merge branch 'polyobject-crush-fix-waypoint' into 'next'
...
Polyobject crush fix by waypoints [by TehRealSalt]
See merge request STJr/SRB2!426
2018-12-24 17:01:06 -05:00
Alam Ed Arias
c8f4d125b4
Merge branch 'master' into next
2018-12-24 16:56:29 -05:00
Digiku
be9a04e489
Merge branch 'disablespeedadjust-fix' into 'next'
...
Disablespeedadjust fix
See merge request STJr/SRB2!425
2018-12-24 16:31:19 -05:00
TehRealSalt
878b1b2d16
Fix move by waypoints not checking for sector changes
...
It seemed weird at first, but the polyobject sector (backsector) itself DOESN'T need checked (although I still am doing it for safety). Rather, the in-level sector just needs checked.
If someone manually modifies the polyobject sector though, then this bug can still occur... but this fixes it for the most common use-case where this can happen. I'll try to tackle the rarer cases in my next commit.
2018-12-24 14:39:07 -05:00
Monster Iestyn
31c6b6ef77
remove these unnecessary typedefs for assignments to variables that are actually already boolean to begin with, since the rhs resolves to a boolean anyway
2018-12-24 19:37:52 +00:00
Monster Iestyn
936b9ecebc
Fix disablespeedajdust in SOCs being set like an integer value instead of a boolean
2018-12-24 19:29:54 +00:00
Monster Iestyn
01588ea967
Fix bot players using the respawning code meant only for real players to use
2018-12-24 17:59:12 +00:00
Nev3r
caaacf3f76
Fixed the shield spawn/special hook cases on the hook add switch.
...
They basically work now.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-12-24 17:31:00 +01:00
Digiku
47a810decb
Merge branch 'EOL' into 'master'
...
fix EOL on src/p_enemy.c
See merge request STJr/SRB2Internal!208
2018-12-24 01:33:03 -05:00
mazmazz
e708f750a0
Remove inline from ST_drawWeaponSelect() to fix 32-bit compile
...
large-function-growth limit reached
2018-12-24 01:26:22 -05:00
mazmazz
ac9cb59de9
Do not increment mainwads for music.dta
2018-12-23 23:54:26 -05:00
mazmazz
9d1bc3063f
Play flag-returned SFX for the opposing team
2018-12-23 22:57:14 -05:00
Steel Titanium
cb13ace77e
Merge branch 'master' into sdl-autograb
2018-12-23 22:35:44 -05:00
mazmazz
ed410575d6
Only SetWindowGrab if !disable_mouse; toggle cursor visibility
2018-12-23 22:09:16 -05:00
Steel Titanium
46d1a866d8
Another attempt to lock the mouse
2018-12-23 18:54:15 -05:00
mazmazz
cb01ebebed
Merge remote-tracking branch 'public-gl/2122-version' into 2122-version
2018-12-23 18:09:54 -05:00
mazmazz
83a6f5d6ae
Merge remote-tracking branch 'public-gl/master' into 2122-version
2018-12-23 18:09:17 -05:00
mazmazz
c0a0c5ac5d
Merge remote-tracking branch 'public-gl/next' into 2122-version
2018-12-23 18:09:14 -05:00
Digiku
d72e3fe71c
Merge branch '2122-patch-dta-update' into '2122-version'
...
Changes related to 2.1.22 patch.dta update
See merge request STJr/SRB2!417
2018-12-23 18:08:38 -05:00
Digiku
8d56c2f486
Merge branch 'addons-backport' into '2122-version'
...
Addons Menu backport to vanilla
See merge request STJr/SRB2!384
2018-12-23 18:08:06 -05:00
Digiku
fa36b8f5a2
Merge branch 'menu-mpjoy-fix' into '2122-version'
...
Menu: Fix joystick events causing the player to move during multiplayer system menu [2122-version]
See merge request STJr/SRB2!420
2018-12-23 18:06:27 -05:00
mazmazz
2b8cdc0381
Revert "Revert "Merge branch 'menu-mpjoy-fix' into 'next'""
...
This reverts commit c0c05043e6
2018-12-23 18:04:01 -05:00
mazmazz
c0c05043e6
Revert "Merge branch 'menu-mpjoy-fix' into 'next'"
...
This reverts commit b5d4bb35302d675750cf
2018-12-23 17:57:50 -05:00
Digiku
b5d4bb3530
Merge branch 'menu-mpjoy-fix' into 'next'
...
Menu: Fix joystick events causing the player to move during multiplayer system menu
See merge request STJr/SRB2!414
2018-12-23 17:55:02 -05:00
Digiku
7a64e3d1a8
Merge branch 'SRB2-CHAT' into '2122-version'
...
Chat and other multiplayer quality of life improvements.
See merge request STJr/SRB2!398
2018-12-23 17:53:54 -05:00
Digiku
402860dc06
Merge branch 'loadconfig-defaultcontrols' into 'master'
...
Reset default controls for LOADCONFIG command
See merge request STJr/SRB2!403
2018-12-23 17:14:34 -05:00
Arthur
b19252651f
Removed all glBegin/glEnd references
...
MD2/MD3 now works, with the exception of WAD textures for some odd reason
2018-12-23 17:00:11 -05:00
Latapostrophe
b7d7472a88
Merge branch 'next' into SRB2-CHAT
2018-12-23 22:53:24 +01:00
Monster Iestyn
2d675750cf
fix inconsistent "tabbing" in the VS project files from when I added in lua_blockmaplib.c
2018-12-23 21:52:49 +00:00
mazmazz
f55623ef9c
Clear all control keys before loading defaults in LoadConfig
2018-12-23 14:59:26 -05:00
Steel Titanium
40a037f603
A more through out attempt to lock the mouse
2018-12-23 14:54:14 -05:00
mazmazz
f600c5fee0
Credits update
2018-12-23 14:41:41 -05:00
mazmazz
8f596376a9
Merge branch '2122-version' into execversion-filtercontrols
2018-12-23 14:30:24 -05:00
mazmazz
3277cf6976
Add JOY10 default to gc_centerview
2018-12-23 14:29:54 -05:00
mazmazz
dd4c7b539f
Fix joy button default override when filling keynum2 with default
2018-12-23 14:29:10 -05:00
Latapostrophe
db8e1c0393
Fix the chat being displayed in singleplayer if there are stillmessages
2018-12-23 10:50:36 +01:00
Latapostrophe
11f44f7ce9
Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into SRB2-CHAT
2018-12-23 10:30:37 +01:00
Latapostrophe
1b61e15b1b
Merge branch 'master' into SRB2-CHAT
2018-12-23 10:26:08 +01:00
mazmazz
3703a032f0
Buildbot fixes
2018-12-23 03:39:27 -05:00
mazmazz
7fb73cf2da
New patch.dta hash for 2.1.22
2018-12-23 03:22:32 -05:00
mazmazz
aa77038dfc
Add chat_on to non-key move event checks
2018-12-23 03:21:32 -05:00
mazmazz
6ebc41a554
Check target < MAXPLAYERS before PM
2018-12-23 02:25:58 -05:00
mazmazz
ec53032310
Fix mainwads check in d_main
2018-12-23 00:29:59 -05:00
mazmazz
31cfa255f2
Merge branch '2122-version' into 2122-patch-dta-update
2018-12-22 23:50:31 -05:00
mazmazz
e3d106d527
Merge remote-tracking branch 'public-gl/2122-version' into 2122-version
2018-12-22 23:42:25 -05:00
mazmazz
b49cf11fb6
Merge remote-tracking branch 'public-gl/next' into 2122-version
2018-12-22 23:41:55 -05:00
mazmazz
33434395f7
Add SRB2 Community Contributors to Special Thanks
2018-12-22 23:41:43 -05:00
mazmazz
8723eb9aa2
Merge remote-tracking branch 'public-gl/next' into 2122-patch-dta-update
2018-12-22 23:34:24 -05:00
Steel Titanium
66e13cf1cc
SDL:Auto grab input
2018-12-22 23:28:59 -05:00
mazmazz
94858aedfe
Extend HU_FONTSTART to STCFN022 (from 2.2)
2018-12-22 23:20:01 -05:00
mazmazz
a9fb17dab1
Revert "Extend HU_FONTSTART to STCFN022 (from 2.2)"
...
This reverts commit 6400729034
2018-12-22 22:40:58 -05:00
mazmazz
56320a35ce
Use TinyFont for chat arrows
2018-12-22 22:40:04 -05:00
mazmazz
6400729034
Extend HU_FONTSTART to STCFN022 (from 2.2)
2018-12-22 21:48:24 -05:00
mazmazz
e0176670f4
Correct splitscreen check in OLDCHAT
2018-12-22 21:30:39 -05:00
mazmazz
7e9411f320
Minor code cleanup, CHAT
2018-12-22 21:17:01 -05:00
Alam Ed Arias
7285f9ff1d
Netcode: handle NULL in addrinfo lookup
2018-12-22 21:06:13 -05:00
mazmazz
a66a2021ba
Draw up and down arrows by string
2018-12-22 20:57:53 -05:00
mazmazz
fb3722a6f3
Accommodate Kart splitscreen code for CHAT via #define NETSPLITSCREEN
2018-12-22 20:52:32 -05:00
Alam Ed Arias
0ed9665a79
Added static library of SDL2 and SDL2_mixer for ARM systems
2018-12-22 20:48:15 -05:00
mazmazz
0f0e30924f
One more free(nodenum)
2018-12-22 20:35:12 -05:00
mazmazz
5badc11159
Fix integer overflow on for loop decrements
2018-12-22 20:18:25 -05:00
Alam Ed Arias
102fd11cb4
More work to cleanup the ARM builds
2018-12-22 19:50:32 -05:00
Alam Arias
c5ec1e30a4
Merge pull request #391 from monster-psychic-cat/sw_largeroomfix
...
Large room fix
2018-12-22 19:48:08 -05:00
Alam Ed Arias
4265be776c
Merge branch 'master' into next
2018-12-22 19:36:32 -05:00
Alam Arias
194f9ea8c0
Merge branch 'next' into sw_largeroomfix
2018-12-22 19:34:22 -05:00
Latapostrophe
c7060aa5ad
Remove mute boolean from playermsg hook, fix username stuff still being there, potential memory leaks, and added back the ip message.
2018-12-22 16:44:58 +01:00
Latapostrophe
619dd9d08a
Fixed various issues: added some free()s, lua_optboolean, other things, and also made sure chat can't send empty messages.
2018-12-22 12:34:17 +01:00
mazmazz
8707b2f40a
Center window on current monitor during vidmode change
2018-12-22 01:43:58 -05:00
mazmazz
cb619e0353
Don't create movement events from joy or mouse when menu is active
2018-12-22 01:20:24 -05:00
TehRealSalt
1291d35e08
Don't allow non-keyboard keys to screenshot/gif in menus
2018-12-22 00:39:32 -05:00
Steel Titanium
10521d161c
Fix various bugs with the chat.
2018-12-21 22:28:28 -05:00
Steel Titanium
e42bcd5b68
Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into latsrb2chat
2018-12-21 20:29:33 -05:00
Alam Arias
b6a917cda1
Added ARM/ARM64 to whole vc10 sln
...
Added ARM/ARM64 to zlib, libpng
Added ARM/ARM64 to srb2dd/srb2sdl
2018-12-21 16:47:10 -05:00
Monster Iestyn
a72d79da54
Merge branch 'master' into next
2018-12-21 17:41:19 +00:00
mazmazz
90832938c9
Re-order Special Thanks -- groups first, then names in ABC order
2018-12-21 11:40:35 -05:00
mazmazz
06ff171e19
Adjust vid.width floating point comparson for CHAT
2018-12-21 11:37:22 -05:00
mazmazz
e20c70d5fb
Skip setting control if keynum is -1 (for KEY_PAUSE) handling
2018-12-20 18:27:44 -05:00
Digiku
41a25a68c9
Merge branch '2122-credits-update' into 'next'
...
Add sirjuddington and CodeImp to Special Thanks credits
See merge request STJr/SRB2!409
2018-12-20 18:06:08 -05:00
mazmazz
f1fea30045
Properly restrict EXECVERSION from cvar updates
2018-12-20 17:56:51 -05:00
mazmazz
f66ee8c4cd
Add sirjuddington and CodeImp to Special Thanks credits
2018-12-20 17:27:25 -05:00
mazmazz
9be1ee4ac7
Hardcode define MAJOREXECVERSION to MODVERSION
2018-12-20 17:16:04 -05:00
mazmazz
6affe807e8
Merge branch '2122-version' into 2122-execversion
2018-12-20 17:14:53 -05:00
Digiku
58a2cec70f
Merge branch 'float_equal' into 'master'
...
Clear Float equal warnings
See merge request STJr/SRB2!383
2018-12-20 16:58:37 -05:00
Jimita
2b59cfa63f
Merge branch 'next' into sw_largeroomfix
2018-12-20 19:58:16 -02:00
Jimita
b68e01cb2b
Merge branch 'next' into sw_largeroomfix
2018-12-20 19:57:38 -02:00
Digiku
9525de2d83
Merge branch 'camera-backport' into 'next'
...
Suggestion: 2.2 camera changes backport
See merge request STJr/SRB2!393
2018-12-20 16:57:23 -05:00
Digiku
28c8ad3dbb
Merge branch 'jump-spin-axes' into 'next'
...
Feature: Jump/Spin axes
See merge request STJr/SRB2!389
2018-12-20 16:57:05 -05:00
Digiku
75e570f2b4
Merge branch 'joy-jump-defaults' into 'next'
...
Assign joy button defaults for 1 and 2 player
See merge request STJr/SRB2!400
2018-12-20 16:56:09 -05:00
Digiku
50221c47e9
Merge branch 'menu-2pcontrols-fix' into 'master'
...
Fix 2p control menu graying out
See merge request STJr/SRB2!407
2018-12-20 16:54:52 -05:00
Jimita
2bdf56804c
Merge branch 'next' into sw_largeroomfix
2018-12-20 19:53:24 -02:00
Digiku
f405f1ae30
Merge branch 'cmake-dllpath-fix' into 'master'
...
Update CMake paths for Windows DLLs
See merge request STJr/SRB2!406
2018-12-20 16:53:06 -05:00
MPC
9d93f54b67
bland
2018-12-20 18:52:51 -03:00
mazmazz
0519d8c52d
Update CMake paths for Windows DLLs
2018-12-20 16:46:40 -05:00
mazmazz
fe5001a38a
Dummy out 2p pause, system menu, talk, and scores buttons because grayed out in-menu
2018-12-20 16:40:59 -05:00
mazmazz
b57204fc12
Fix 2p control menu graying out
2018-12-20 16:38:58 -05:00
mazmazz
6f8b126586
Add G_FilterKeyByVersion() to setcontrol
2018-12-20 16:30:37 -05:00
MPC
fcb65951b8
change implementation of square root
2018-12-20 17:37:06 -03:00
Jimita
5b285a60a2
Update r_segs.c
2018-12-20 16:15:19 -03:00
Jimita
ffd5061531
Merge branch 'next' into sw_largeroomfix
2018-12-20 16:56:05 -02:00
Monster Iestyn
76fe78571e
fix ffloor.toppic/bottompic to be consistent in behavior with sector.floorpic/ceilingpic
2018-12-20 16:47:17 +00:00
Monster Iestyn
dfbbab35f4
Merge branch 'master' into next
2018-12-20 16:41:21 +00:00
mazmazz
e2b8ff26db
Fix lua_pop -> lua_remove use in G_SetCustomExitVars lua
2018-12-20 10:56:36 -05:00
Digiku
dd107724de
Merge branch 'lua-nextmapoverride' into 'next'
...
Lua: nextmapoverride & skipstats changing outside of G_ExitLevel
See merge request STJr/SRB2!396
2018-12-20 10:55:30 -05:00
mazmazz
71da6836c0
Reset default controls for LOADCONFIG command
2018-12-20 10:13:43 -05:00
mazmazz
04916edc07
Update EXECVERSION to MODVERSION 27
2018-12-20 04:03:35 -05:00
mazmazz
9d212b340b
Update code versions to 2.1.22
2018-12-20 02:35:27 -05:00
Digiku
25f0dc7eae
Merge branch 'version-string-develop' into 'master'
...
Add DEVELOP build flag to version string
See merge request STJr/SRB2!401
2018-12-20 02:28:21 -05:00
mazmazz
7f8d16d3cd
Add DEVELOP build flag to version string
2018-12-20 02:27:30 -05:00
mazmazz
60bcf92525
Adjust execversion retrieval in CV_FilterVarByVersion
2018-12-20 02:18:59 -05:00
mazmazz
969960a1eb
Adjust EXECVERSION define scheme* MAJOREXECVERSION and MINOREXECVERSION* GETEXECVERSION(major, minor) macro
2018-12-20 02:18:11 -05:00
mazmazz
ed7178bca4
Assign joy button defaults for 1 and 2 player
2018-12-20 01:47:35 -05:00
Digiku
722ceb5285
Merge branch 'pk3-stray-blockmap-msg' into 'master'
...
Comment out stray PK3 blockmap message
See merge request STJr/SRB2!399
2018-12-20 01:11:44 -05:00
mazmazz
78501dcd0c
Comment out stray PK3 blockmap message
2018-12-20 01:11:07 -05:00
Digiku
223257e237
Merge branch 'using-offsetof' into 'next'
...
Use the `offsetof` function
See merge request STJr/SRB2!394
2018-12-19 21:53:37 -05:00
mazmazz
6c5bb7f541
Small Mixed D&C fix
2018-12-19 20:56:58 -05:00
AJ Freda
4728ad97eb
Fixed a few unnoticable mistakes [vanilla]
2018-12-19 20:52:47 -05:00
Alam Ed Arias
e5e978f8bd
Merge branch 'master' into next
2018-12-19 13:20:54 -05:00
Digiku
7982b1695a
Merge branch 'ogl-zfighting-fix' into 'master'
...
OpenGL z-fighting fix [by Azeonus]
Closes #43
See merge request STJr/SRB2!395
2018-12-19 13:05:04 -05:00
Digiku
bea76aa4bf
Merge branch 'save-override' into 'next'
...
Feature: Save override for level header
See merge request STJr/SRB2!392
2018-12-19 13:04:41 -05:00
Digiku
4c69fe23f6
Merge branch 'kart-luatextures-backport' into 'next'
...
Lua: Kart textures backport (non-foolish vers)
See merge request STJr/SRB2!391
2018-12-19 13:04:24 -05:00
Latapostrophe
387173ea89
Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into SRB2-CHAT
2018-12-19 16:50:49 +01:00
Latapostrophe
a31b85e124
Some messages relevant to discussions now go in the chat.
2018-12-19 16:44:57 +01:00
mazmazz
59826860ab
Ifdef nextFrame handling under USE_MODEL_NEXTFRAME
2018-12-19 10:33:13 -05:00
mazmazz
90bd80d17a
Interpolation fix attempt?
...
* Fix pglNormal3bv pointer because typo
2018-12-19 01:57:54 -05:00
mazmazz
c4f5bdc347
Adapt re-enabled DrawMD2 code block for meshes
2018-12-19 00:38:00 -05:00
mazmazz
98d18509e6
Hide/add Kart FTransform mirror and anglez behind ifdef
2018-12-19 00:17:51 -05:00
mazmazz
45f0f725cd
More hw_md2 merge errors; re-enable interpolation code block
2018-12-18 23:44:38 -05:00
mazmazz
65543545c6
hw_md2 merge errors
2018-12-18 22:50:00 -05:00
mazmazz
8d10a0b105
Add model sources to sdl1.2 VC project
2018-12-18 21:53:30 -05:00
mazmazz
3a45b169eb
Ignore fread return value (buildbot error)
2018-12-18 20:48:55 -05:00
mazmazz
c844141322
Add new model files to CMake
2018-12-18 20:36:39 -05:00
mazmazz
6b2f4b5858
Buildbot fixes (changed byte types to char; mixed d&c)
2018-12-18 20:23:08 -05:00
mazmazz
3dbda54d3c
GCC compile fixes
2018-12-18 19:17:33 -05:00
mazmazz
980803e0c0
Add MD2/MD3 files to makefile
2018-12-18 17:57:39 -05:00
Arthur
4276758491
Remove CONS_Printf message that isn't even doing what it says it is!
2018-12-18 17:52:53 -05:00
Arthur
4713200fb5
push test
2018-12-18 17:52:50 -05:00
Arthur
76dabd5e9d
Support for 'tinyframes', and lots more optimization
2018-12-18 17:52:47 -05:00
Arthur
3ed0edbcfe
Common model format, with MD2/MD3 loading
2018-12-18 17:52:45 -05:00
Arthur
c4d5afdd80
New fixed math functions - ClosestPointOnVector, and Strength.
...
Normal also returns length now, since it is free.
2018-12-18 17:28:39 -05:00
mazmazz
96cad09db6
Change 0.05 to 0.05f
2018-12-18 16:59:59 -05:00
Azeonus
67cd6dcdd2
dispoffset OGL fix [by Azeonus]
2018-12-18 16:50:03 -05:00
TehRealSalt
42a9e66883
Let lib_gExitLevel call lib_gSetCustomExitVars, for reduced code duplication.
2018-12-18 15:03:54 -05:00
TehRealSalt
0e34e7f32f
G_SetCustomExitVars for setting nextmapoverride & skipstats
...
This is desparately needed for KIMOKAWAIII, since there's many instances I need to change nextlevel but still want to use the existing player exit stuff.
2018-12-18 14:48:04 -05:00
Alam Arias
b62e6ee909
Merge branch 'next' into the_second_remote_view_camera_fix
2018-12-18 14:11:43 -05:00
Alam Ed Arias
d5c7ca1d23
Merge branch 'master' into next
2018-12-18 14:05:07 -05:00
Alam Arias
056cfe71a4
Merge pull request #373 from monster-psychic-cat/sw_planefixes
...
Software plane fixes
2018-12-18 14:02:21 -05:00
Alam Arias
afecb2fc85
Merge branch 'next' into the_second_remote_view_camera_fix
2018-12-18 13:57:48 -05:00
TehRealSalt
03a4bd8f53
Revert default changes
...
Digiku said they'd handle the new button defaults so \m/
2018-12-18 12:55:05 -05:00
Latapostrophe
9f17039e2e
Merge branch 'srb2chat' into 'SRB2-CHAT'
...
fix my fucking code
See merge request SinnamonLat/SRB2!1
2018-12-18 11:51:18 -05:00
mazmazz
1fcf607b41
Fix strncpy nodenum length overflow
2018-12-17 21:31:00 -05:00
mazmazz
876ddd48f1
Change int to INT32
2018-12-17 19:09:05 -05:00
mazmazz
bf21b7c483
Mixed D&C fixes for HU_DrawTeamTabRankings
2018-12-17 19:03:09 -05:00
mazmazz
7a92c9d3d0
Mixed D&C fixes; replace a couple int's with INT32
2018-12-17 19:02:22 -05:00
mazmazz
245a125551
Fix compile errors
2018-12-17 18:55:21 -05:00
Monster Iestyn
bd58ff8c49
Merge branch 'frame-backslash-fix' into 'next'
...
Accept '+' as substitute for '\' for sprite frames (PK3)
See merge request STJr/SRB2!380
2018-12-17 17:34:41 -05:00
MPC
ca4329bcb6
fix the fucking warning
2018-12-17 18:09:29 -03:00
MPC
82601e881b
fix my fucking code
2018-12-17 17:57:53 -03:00
Latapostrophe
2fdf27c507
make sure to change p_dispy and not y for /pm list. Also make MPC happy.
2018-12-17 21:39:49 +01:00
Latapostrophe
ff957baae3
Don't overlap ringslinger HUD
2018-12-17 21:31:31 +01:00
Jimita
1d40676f3a
Merge branch 'master' into automap_fix
2018-12-17 17:46:29 -02:00
Jimita
3329c10b60
Merge branch 'next' into the_second_remote_view_camera_fix
2018-12-17 17:46:17 -02:00
Jimita
f3956ffb4c
Merge branch 'master' into sw_planefixes
2018-12-17 17:45:36 -02:00
Latapostrophe
45aba493c7
2.1.21 and all of the kart additions. Woo.
2018-12-17 20:43:59 +01:00
mazmazz
b64dd82034
Attempt to fix cv_execversion being accessible by console
2018-12-17 13:39:24 -05:00
mazmazz
657e7321f6
Decouple execversion from MODVERSION; add scheme for MINORMODVERSION
2018-12-17 13:38:23 -05:00
Jimita
362fb491f7
Merge branch 'next' into the_second_remote_view_camera_fix
2018-12-17 15:40:20 -02:00
Monster Iestyn
e9be5e895e
Merge branch 'master' into next
2018-12-17 17:34:41 +00:00
mazmazz
b958f00f17
Better rewrite for addons draw adjustment
2018-12-17 10:59:27 -05:00
TehRealSalt
bef3bb23f8
Undo dc92bb49
2018-12-16 21:36:54 -05:00
TehRealSalt
97639848e1
Merge remote-tracking branch 'upstream/next' into kart-luatextures-backport
2018-12-16 21:22:06 -05:00
TehRealSalt
9e596d15af
Save override for level header
...
Kind of like 2.2's, but with backwards-compatability with 2.1
2018-12-16 20:09:59 -05:00
mazmazz
6dbe930997
Use labs for long value
2018-12-16 19:47:02 -05:00
mazmazz
2d2bd59099
Remove FIXUPO0 GCC pragma
2018-12-16 19:39:16 -05:00
mazmazz
296b678d7e
Wstrict-overflow adjustment
2018-12-16 19:38:46 -05:00
TehRealSalt
ec53e12294
Foolish
2018-12-16 18:19:53 -05:00
TehRealSalt
e763eab6cd
2.2 camera changes backport
...
- Very slightly less claustrophobic camera defaults
- Changed camera settings are saved
- Camera distance increases relatively with splitscreen & analog mode.
These changes are kind of debatable because them not saving was an intentional decision initially, and the camera being farther out could potentially clip more geometry where it previously didn't... still, thought I'd open this for consideration
2018-12-16 18:18:59 -05:00
Alam Ed Arias
14e98df69b
Revert "Merge branch 'kart-luatextures-backport' into 'next'"
...
This reverts merge request !387
2018-12-16 22:57:39 +00:00
TehRealSalt
c69cfefb6d
2.2 backport of jump/spin axes
...
Needs the config default-changing shenanigans done still, not sure how to tackle that yet. Now the game is TOTALLY playable from a fresh install if you just plug in a controller.
2018-12-16 17:45:49 -05:00
Monster Iestyn
6b1b11441d
Merge branch 'sdl-sound-fix' into 'master'
...
SDL: Force use DirectSound driver to fix wrong-pitch sound effects
See merge request STJr/SRB2!375
2018-12-16 17:16:49 -05:00
mazmazz
1b7a9aaa01
2.1 Score/Time/Rings lump name
2018-12-16 16:53:13 -05:00
mazmazz
899120e475
Revert NMUSlist to original 2.1
2018-12-16 16:42:57 -05:00
mazmazz
d7321fd8c4
Pull expanded NMUSlist from 2.2
2018-12-16 16:40:40 -05:00
mazmazz
046d36a657
Remove Kart entries from NMUSlist
2018-12-16 16:08:31 -05:00
mazmazz
6d94568f4b
Hide kart-specific addons behavior behind USE_KART
2018-12-16 16:07:47 -05:00
TehRealSalt
cc22ef3f05
Add deprecation warning to admin
2018-12-16 16:05:18 -05:00
TehRealSalt
4ba23e1028
Expose R_TextureNumForName
...
Backport from SRB2Kart
2018-12-16 15:58:47 -05:00
mazmazz
c3ff0b6d16
Uncomment Secrets menu toggle when exiting Addons
2018-12-16 15:52:01 -05:00
Alam Ed Arias
6e79722437
Fix float-equal warning in Win32 interface
2018-12-16 14:01:28 -05:00
Alam Ed Arias
11aef0b3f1
Merge branch 'master' into float_equal
2018-12-16 13:52:45 -05:00
Latapostrophe
25e6d5388c
merge conflict
2018-12-16 16:48:15 +01:00
mazmazz
f0967520ed
Compile fixes; enable PK3 support in addons menu
...
* Add missing vars highlightflags, recommendedflags, warningflags from Kart
* V_GetStringColormap() use vanilla behavior because Kart behavior glitches for us
* V_GetStringColormap() made non-static
2018-12-15 21:44:39 -05:00
mazmazz
37950341ec
Merge remote-tracking branch 'public-gitlab/next' into addons-backport
2018-12-15 20:52:46 -05:00
mazmazz
0a3b3736bf
Handle Kart-specific changes; add PK3 to exttable
2018-12-15 20:50:33 -05:00
mazmazz
b32f50648d
Merge branch 'addons_menu' into 'master'
...
Addons menu
See merge request KartKrew/Kart!8
2018-12-15 20:46:42 -05:00
Alam Ed Arias
15d0673685
fix compiling for clang
2018-12-14 21:31:37 -05:00
Alam Ed Arias
78634679f1
fix compiling for MSVC
2018-12-14 20:42:37 -05:00
Alam Ed Arias
6fd66bdb49
Clear float equal warnings
2018-12-14 20:34:06 -05:00
Monster Iestyn
f4ce770c1c
try out using offsetof for these three macros in d_clisrv.h
2018-12-14 23:56:11 +00:00
Monster Iestyn
e0079ea1a2
remove NearVertice (which was unused anyway), clean up maz's changes
2018-12-14 23:28:07 +00:00
mazmazz
de96fe8e7b
Revert "compiler SSE tweak for 32-bit"
...
This reverts commit 09d9a555c6
2018-12-14 16:47:38 -05:00
mazmazz
abae63a64b
SameVertice floating point match; fixes 64-bit OGL holes
2018-12-14 16:47:24 -05:00
mazmazz
66efc7ea7f
Merge remote-tracking branch 'public-gitlab/opengl-bsp-cleanup' into opengl-bsp-cleanup
2018-12-14 16:23:42 -05:00
Monster Iestyn
c1e0041a0b
copy doom legacy's replacement for the den == 0.0 calc in fracdivline
2018-12-14 21:22:13 +00:00
mazmazz
09d9a555c6
compiler SSE tweak for 32-bit
2018-12-14 16:21:07 -05:00
Monster Iestyn
623d1574ce
minor cleanup
2018-12-14 21:00:53 +00:00
MPC
9c04a066d9
Update r_plane.h
2018-12-14 15:49:32 -03:00
Monster Iestyn
b42c306ef3
remove code from SearchDivline that was disabled ...and doesn't seem to exist anymore anyway
2018-12-14 18:14:08 +00:00
Monster Iestyn
52fd3dcbed
split loading status code into a separate function
2018-12-14 18:11:30 +00:00
Monster Iestyn
02fc845a72
Make sure nptfront is explicitly > 0, so we don't alloc a poly for negative number points at all
2018-12-14 18:01:18 +00:00
Monster Iestyn
4089b6b8e9
use continue if NULL instead of a big if block if ...not NULL
...
also, SplitPoly returns if ps < 0, so there's no need to check for ps >= 0 afterwards
2018-12-14 18:00:08 +00:00
Monster Iestyn
3a125dbbd5
compare with actual doubles, not ints
2018-12-14 17:14:03 +00:00
Jimita
cf792ef4f3
Merge branch 'master' into the_second_remote_view_camera_fix
2018-12-14 15:09:24 -02:00
MPC
9c2197db17
Software plane fixes
2018-12-14 14:08:25 -03:00
Jimita
d70dbada1c
Merge branch 'master' into automap_fix
2018-12-14 15:07:53 -02:00
mazmazz
c49a5ed8d2
Better I_InitJoystick log message
2018-12-14 06:14:21 -05:00
mazmazz
d094a70ec3
Allow use_joystick/2 to be saved once again
2018-12-14 06:07:20 -05:00
mazmazz
fa63ddda86
Fix cv_usejoystick being reset to None when cv_usejoystick was > NumJoys and changing to already-used joystick
2018-12-14 06:05:31 -05:00
mazmazz
70d6845d6c
Fix menu where cv_usejoystick.value > I_JoyNum and selecting an unused controller and the "used!" prompt pops up erroneously
2018-12-14 05:57:10 -05:00
mazmazz
b2c02838c4
Display "joystick used" prompt correctly if setting use_joystick from an old value > I_NumJoys()
2018-12-14 05:31:47 -05:00
mazmazz
e548f6f139
Don't override an already-active controller
...
* Menu improvements to tell the user that they can't set a controller if it's already active
2018-12-14 05:02:41 -05:00
mazmazz
3b6de810e1
Lots of changes to better support hotplugging and unstable device indexes
...
* Don't save cv_usejoystick/2 because hotplugging changes can be made invalid by next run
* Properly set cv_usejoystick/2 for menu toggling
* Force-disable a player's joystick if setting another player's joystick to the same device
* Properly set cv_usejoystick/2 value of BOTH target player AND other players when hotplugging and unplugging
2018-12-14 03:58:07 -05:00
mazmazz
6b9fe87b60
Properly handle unstable device indexes for hotplug
2018-12-14 01:45:18 -05:00
mazmazz
44d6a1d236
Attempt to handle unstable device IDs
2018-12-14 00:22:25 -05:00
mazmazz
216e710b87
Improve hotplug edge case with changing device indexes; return proper joy_open output on error
2018-12-13 23:52:04 -05:00
mazmazz
14cde2d227
Change joystick log messages to DBG_GAMELOGIC
2018-12-13 23:26:07 -05:00
mazmazz
e81f05c496
Handle unstable device index when hotplugging controller
2018-12-13 23:09:05 -05:00
mazmazz
bcd747c1cd
Adjust SDL_JOYDEVICEREMOVED handler by checking the player's joy device explicitly
2018-12-13 22:26:13 -05:00
mazmazz
a3063ce89f
Merge tag 'SRB2_release_2.1.21' into vanilla-hotplug
2018-12-13 22:16:48 -05:00
Monster Iestyn
ef6533fb83
Merge branch 'master' into next
2018-12-13 22:21:31 +00:00
Monster Iestyn
880c017f8f
Merge branch 'cfg-srb2home-fix' into 'master'
...
Apply srb2home path to EXEC, SAVECONFIG, and debugfile
See merge request STJr/SRB2!379
2018-12-13 16:16:52 -05:00
mazmazz
dc7992a815
R_Char2Frame special case for backslash: accept plus as substitute
2018-12-13 14:59:12 -05:00
mazmazz
d18b2cda59
Apply srb2home to saveconfig ONLY if srb2home isn't already there
2018-12-13 13:32:38 -05:00
mazmazz
93f7f0a8df
Apply srb2home to debugfile
2018-12-13 13:23:09 -05:00
mazmazz
b1641aa8e9
Apply srb2home to SAVECONFIG
2018-12-13 13:17:56 -05:00
mazmazz
93eda4e7c9
EXEC: Search for CFG by file path
2018-12-13 13:11:25 -05:00
mazmazz
b84470ec51
Fix savegamename being improperly built due to missing null char after copying timeattackfolder
2018-12-13 12:01:07 -05:00
Jimita
e628d98f20
Update am_map.c
2018-12-12 19:59:21 -02:00
Jimita
a5874019cb
Update am_map.c
2018-12-12 19:57:52 -02:00
MPC
649b6c9ca1
Remove MINIAUTOMAP code
2018-12-12 18:53:13 -03:00
MPC
6b22dc183b
Fix the automap
2018-12-12 18:01:52 -03:00
Jimita
966afb6017
Update p_user.c
2018-12-12 13:09:47 -02:00
MPC
c68875ad93
Fix remote viewpoint cameras for real
...
I'm so sorry
2018-12-11 20:48:45 -03:00
Monster Iestyn
582c5332f4
Add some checks to prevent invalid awayviewmobjs from crashing the game. Not fullproof but at the least the P_CameraThinker crash no longer happens
2018-12-11 18:39:58 +00:00
MPC
348ed1e43f
Large room fix
2018-12-09 19:34:17 -03:00
mazmazz
47ee3525af
Indentation
2018-12-08 14:10:56 -05:00
mazmazz
01f1933f69
Force directsound to fix wrong-pitch sound effects
2018-12-08 14:05:58 -05:00
mazmazz
df89781623
Windows string adjustment
2018-12-06 15:42:58 -05:00
mazmazz
ba60989c00
Adjust version strings
2018-12-06 15:39:19 -05:00
mazmazz
60afce5771
Disable XINPUT before initing the joy subsystem
2018-12-06 14:03:46 -05:00
Digiku
17e9188c89
Merge branch 'execversion' into '21-version'
...
Block previous versions' config defaults with EXECVERSION consvar
See merge request STJr/SRB2!371
2018-12-06 12:41:20 -05:00
mazmazz
3ceeb6a205
Register execversion and remove CV_SAVE because we write manually
2018-12-06 12:28:30 -05:00
mazmazz
0be61e8830
a stray if block
2018-12-06 12:03:53 -05:00
mazmazz
a5eb62b73e
alwaysfreelook -> alwaysmlook string
2018-12-06 12:02:45 -05:00
mazmazz
70aa4ce18e
Add alwaysfreelook2 and mousemove2 to config versioning
...
* Change alwaysfreelook2 to be consistent with alwaysfreelook (the only one that wasn't the same)
2018-12-06 11:59:34 -05:00
mazmazz
6694b7d679
Controller hotplugging by always keeping joy subsystem on (thanks WOLFS)
...
(with log messages)
2018-12-06 10:54:58 -05:00
mazmazz
f0c7848e50
Use proper DD define for use_joystick
2018-12-06 06:50:18 -05:00
mazmazz
5b3a1e0c55
Implement EXECVERSION consvar to invalidate previous versions' default config values
2018-12-06 06:28:34 -05:00
mazmazz
a802069313
Move joyaxis_fire default to right trigger
2018-12-06 05:55:56 -05:00
mazmazz
aaf5d2e1dc
Change 2p controller defaults
2018-12-06 05:26:28 -05:00
mazmazz
9055c9aeab
Hex instead of octal colors
2018-12-05 13:08:25 -05:00
mazmazz
c5b349ddc4
More concise bitness check
2018-12-05 13:06:56 -05:00
mazmazz
1ea2fa447a
Make the ifdefs cleaner
2018-12-05 13:00:42 -05:00
mazmazz
389c2d4ea1
_WINDOWS instead of _WIN32 for DD
2018-12-05 12:55:05 -05:00
mazmazz
6d9fb0d3fd
Merge remote-tracking branch 'public-gitlab/21-version' into versionflags
2018-12-05 12:49:21 -05:00
Monster Iestyn
aee8dcdff8
Fix 64-bit build-using admins not being able to kick players besides themselves, by not checking sendingsavegame[] code at all if not the server
...
it turns out playernode[pn] is typically 255 in the above situation, so sendingsavegame[playernode[pn]] goes out of bounds ...but goodness knows why 32-bit builds didn't suffer the same bug, seems to have been pure luck
2018-12-05 17:39:02 +00:00
mazmazz
a6dcd5555e
Add various flags to version string
2018-12-05 11:43:33 -05:00
Monster Iestyn
ae14fd2f85
Fix motd being broken for admins
...
It turns out the game was sending the full size of the motd buffer (254) rather than just the size of the string made, therefore sending a load of garbage and making the game apparently execute unknown or illegal net commands
2018-12-04 21:09:28 +00:00
Monster Iestyn
b4b82e681c
Fix the game being basically broken due to multi-admin, by porting over some missing changes from Kart
2018-12-04 18:54:36 +00:00
Monster Iestyn
e353e2ef70
Merge branch 'next' into 21-version
2018-12-04 17:19:36 +00:00
Monster Iestyn
f2b0db5a1c
Merge branch 'master' into next
2018-12-04 17:18:19 +00:00
Digiku
e6e5856fd8
Merge branch 'auto-joystick' into 'master'
...
Use Joystick 1 and Joystick 2 by default if plugged in
See merge request STJr/SRB2!364
2018-12-04 11:53:58 -05:00
Digiku
631f6ed406
Merge branch 'joystick-juggling' into 'master'
...
Joystick juggling
See merge request STJr/SRB2!355
2018-12-04 11:51:55 -05:00
Monster Iestyn
d1a8e3acdb
Merge branch 'tiny-makefile-fix' into 'master'
...
Tiny Makefile Fix
See merge request STJr/SRB2!289
2018-12-04 08:09:27 -05:00
mazmazz
c799584f3d
Change joystick default to auto-use joystick 1 and joystick 2 if plugged in (like Kart)
2018-12-03 23:36:36 -05:00
mazmazz
60feae1014
Update OSX icon
2018-12-03 23:09:54 -05:00
Digiku
ba81e26f71
Merge branch 'controller-menu-touchup' into 'master'
...
Controller select menu improvements.
See merge request STJr/SRB2!354
2018-12-03 23:00:36 -05:00
Digiku
42cb597731
Merge branch 'joystick-juggling-two' into 'next'
...
Joystick additions for menu, axis defaults, and vertical look toggle
See merge request STJr/SRB2!359
2018-12-03 22:59:19 -05:00
Steel Titanium
fbb2cde800
Make this be consistent with non-CMake builds
2018-12-03 15:42:37 -05:00
Steel Titanium
168647275c
One small change
2018-12-03 13:32:24 -05:00
mazmazz
6ca1130551
Hardcode Screenshot, GIF, and Viewpoint to their F keys
2018-12-03 13:21:16 -05:00
mazmazz
205e52f6d4
thisjoyaiming fix for chasefreelook
2018-12-03 13:13:01 -05:00
mazmazz
7ce092128b
Revert "Make pause key bring up the menu if it's a joy button"
...
This reverts commit 9de31cf2e7
2018-12-03 13:11:48 -05:00
mazmazz
6730c6c765
Menu for joy first/third person vertical look
2018-12-03 13:10:49 -05:00
mazmazz
ed57d0d9f9
Add Joy2 for network abort
2018-12-03 13:10:47 -05:00
mazmazz
9de31cf2e7
Make pause key bring up the menu if it's a joy button
...
* Add "Pause" entry to multiplayer control panel to give joy users a way to pause in netgames
2018-12-03 13:10:27 -05:00
mazmazz
7e523a1e35
Reset vertical look when toggling joyaiming
2018-12-03 13:10:24 -05:00
mazmazz
0bb113130b
Add alwaysfreelook to joystick menu
2018-12-03 13:10:20 -05:00
mazmazz
59cabea8bd
Add joyaiming qualifier for joystick look up/down
2018-12-03 13:10:19 -05:00
mazmazz
3134d72c12
Preserve event ch for other responders
2018-12-03 13:10:18 -05:00
mazmazz
6bf31492b7
Make M_Responder respond to joy buttons only in-menu (multiplayer bug?)
2018-12-03 13:10:16 -05:00
mazmazz
6dd44ca1de
Change PC axis defaults to 360-friendly values
2018-12-03 13:10:15 -05:00
mazmazz
78dde93f3e
Remap menu actions to better joy keys
2018-12-03 13:10:12 -05:00
mazmazz
06faf6ffe4
Unneeded input header in st_stuff
2018-12-03 12:36:42 -05:00
mazmazz
8851f39b84
Use static joyname instead of malloc
2018-12-03 12:35:12 -05:00
mazmazz
6c78af3542
Missed (unused?) viewpoint strings
2018-12-03 12:20:19 -05:00
mazmazz
3d8bc85494
Forgot config strings for menu keys
2018-12-03 12:19:41 -05:00
mazmazz
5314c0e36b
Make F12 spectator string constant because of wrapping issues
2018-12-03 12:13:36 -05:00
mazmazz
60b16289e5
Change spectator string for "Press F12 to watch"
2018-12-03 12:11:03 -05:00
mazmazz
31f23fda8d
Add gc_viewpoint from Kart
2018-12-03 11:50:57 -05:00
mazmazz
2a87093ece
Add gc_screenshot and gc_recordgif from Kart
2018-12-03 11:31:48 -05:00
mazmazz
8e190932e7
Add gc_systemmenu from Kart
2018-12-03 11:21:25 -05:00
mazmazz
d8e70c32e0
Remove console messages for joynames
2018-12-03 05:39:10 -05:00
mazmazz
19d19543b7
Copy string from SDL_JoystickNameForIndex before the subsystem is shut down
2018-12-03 05:37:07 -05:00
Monster Iestyn
978a28004d
add deadzone + storing of previous joyx/y values etc to attempt to make joysticks less sensitive in menus
2018-12-02 21:52:30 +00:00
Monster Iestyn
13b0e9c3c5
make menu respond to joystick axis events without joyscale having to be 0
2018-12-02 21:18:28 +00:00
MonsterIestyn
10832db244
Merge branch 'next' into lua_mapchange
2018-12-02 20:54:32 +00:00
Monster Iestyn
a63ba7084a
Disable the axis parts of I_GetJoystickEvents and its player2 counterpart.
...
(This is what I should have done in the first place)
2018-12-02 17:42:51 +00:00
Monster Iestyn
ce4e63a366
Miserable half-attempt to support hats in I_GetEvent, I've disabled it for now since I couldn't really figure out how to pull this off ...yet
2018-12-02 17:12:05 +00:00
Monster Iestyn
33c1ac33f5
Merge branch 'next' into 21-version
...
# Conflicts:
# src/d_netcmd.c
2018-12-02 15:45:07 +00:00
wolfy852
e12890c84e
s
2018-12-02 09:08:05 -06:00
wolfy852
2af04203ea
Fix a dumb mistake
2018-12-02 08:57:35 -06:00
Steel Titanium
0f11116e7b
Fix up controller menu support
2018-12-01 20:13:14 -05:00
Monster Iestyn
11cb163435
Backport the Blockmap library I made two years ago
2018-11-30 17:11:11 +00:00
Jimita
6d7689c1a7
Merge branch 'next' into lua_mapchange
2018-11-30 15:10:59 -02:00
MPC
54cae84849
Change MapChange so Lua returns the map number you change
2018-11-30 14:01:40 -03:00
Monster Iestyn
e0a1c43813
Free lump names *before* either lumpinfo or the WAD itself!
2018-11-30 14:19:47 +00:00
Sryder
bc1f08f89d
Fix 2 of the Unsuffixed Float Constant warnings
...
The other one is related to M_PI for me, which I'm still not sure about where it's getting it from
2018-11-29 22:12:14 +00:00
Sryder
c5e8e0badb
Merge branch 'master' into tiny-makefile-fix
2018-11-29 21:57:47 +00:00
Monster Iestyn
305ad4f73e
backport some cleanup that I clearly missed wasn't there already to do with ZWAD lump loading
2018-11-29 14:16:02 +00:00
wolfy852
c517862f7e
I must be some kind of idiot.
2018-11-29 07:34:05 -06:00
wolfy852
d294be2054
Fix a quick merge mistake.
2018-11-29 07:15:54 -06:00
TehRealSalt
c70cf5908d
IsPlayerAdmin support, since admin was removed
...
# Conflicts:
# src/lua_baselib.c
2018-11-29 07:12:15 -06:00
Wolfy
b59718d3ad
Remove hardcoded limit on admins
...
# Conflicts:
# src/d_netcmd.c
2018-11-29 07:05:49 -06:00
Wolfy
b8ce51bff2
Multiple admins
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
2018-11-29 06:46:59 -06:00
Alam Ed Arias
7bd0900fad
Merge remote-tracking branch 'private/master' into EOL
2018-11-27 23:36:09 -05:00
Alam Ed Arias
e39e689aeb
fix EOL on src/p_enemy.c
2018-11-27 21:32:15 -05:00
Monster Iestyn
e158206e55
backport string len tweaks I made to LUA_LoadLump in internal
2018-11-27 23:06:31 +00:00
Monster Iestyn
cb53bc8afe
remove redundant wadfile loop within wadfile loop for ANIMDEFS code
2018-11-27 23:05:33 +00:00
mazmazz
97ea4086a5
Redundant type 1800 check for MT_COIN
2018-11-27 14:10:55 -05:00
Monster Iestyn
cd57be640c
Merge branch '21-controls' into 'next'
...
Default control changes for 2.1.21
See merge request STJr/SRB2!343
2018-11-27 11:50:42 -05:00
Monster Iestyn
3e6388c183
use UINT8 * instead of void or Bytef *
2018-11-27 15:49:41 +00:00
Monster Iestyn
6e839d30a2
Merge branch 'master' into next
2018-11-27 15:31:28 +00:00
Monster Iestyn
95e13d9ad3
Merge branch 'save-soundmenu-toggles' into 'master'
...
Save sound toggles to config
See merge request STJr/SRB2!348
2018-11-27 10:07:06 -05:00
Monster Iestyn
1889c36dea
add HAVE_ZLIB around the rest of the zlib stuff in w_wad.c/h, move zlib.h inclusion down below doomdef.h etc includes in case that does anything for compiling (?)
2018-11-27 13:57:32 +00:00
Alam Ed Arias
b7f7c2ecf7
PK3: fixup support for newer version of zlib
2018-11-26 20:08:26 -05:00
Alam Ed Arias
9a042cd5e2
Merge branch 'master' into next
2018-11-26 19:49:19 -05:00
Alam Ed Arias
78a1931bdf
Makefile: disable implicit-fallthroug warnings
2018-11-26 19:38:14 -05:00
Alam Ed Arias
5a3f469593
Makefile: skip implicit-fallthroug warnings
2018-11-26 19:28:55 -05:00
Alam Ed Arias
ac2ec6c982
Makefile: disable some warnings for GCC 8.x
2018-11-26 19:01:40 -05:00
Alam Ed Arias
4e332b3848
Fix MSVC build
2018-11-26 18:27:07 -05:00
Digiku
a2678dcb2e
Merge branch 'public-nights-invertloopfix' into 'next'
...
NiGHTS fix lap detection on inverted axis
See merge request STJr/SRB2!300
2018-11-26 16:08:24 -05:00
Digiku
fd891aa21d
"Turn Left/Right" control naming instead of "Look Left/Right" due to analog mode keymapping quirk
2018-11-26 15:48:08 -05:00
Monster Iestyn
4b0d45afd8
Merge branch 'opengl-noloading' into 'master'
...
Hide OpenGL loading screen
See merge request STJr/SRB2!349
2018-11-26 15:30:45 -05:00
MonsterIestyn
b53cd70201
Merge branch 'next' into PK3-BackportNext
2018-11-26 18:56:51 +00:00
Monster Iestyn
a71ca1d259
Merge branch 'fof-slope-skew-backport' into 'master'
...
FOF wall slope skewing backport
See merge request STJr/SRB2!341
2018-11-26 08:54:29 -05:00
Steel Titanium
ba111d42ca
Last minute changes.
2018-11-26 00:24:11 -05:00
Steel Titanium
cf01e820c4
Take the command line params into account
...
Really I'm just making it return early if either of the parms are used.
2018-11-25 22:39:11 -05:00
mazmazz
930835f1a2
Dummy out OpenGL loading screen; fix console toggle so it doesn't actually show
2018-11-25 21:47:56 -05:00
mazmazz
900f7e3dc9
FORCEWIPEOFF define in place of wipegamestate = -2
2018-11-25 19:40:18 -05:00
mazmazz
ab47e83939
Merge remote-tracking branch 'origin/master' into menu-execs
2018-11-25 19:03:22 -05:00
Monster Iestyn
1b2aea81dc
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00
mazmazz
73be0c33ae
Use get_number in dehacked readmenu
2018-11-25 15:16:53 -05:00
mazmazz
e2ca92a3db
Remove unused menu hierarchy methods
2018-11-25 15:09:25 -05:00
mazmazz
0439479b3e
Remove M_ApplyMenuPresState
2018-11-25 15:08:36 -05:00
mazmazz
eb95289ea4
Rearranged menu presentation methods
...
* Menu parameter retrieval and hierarchy in m_menu
* Presentation logic (background display) in f_finale
2018-11-25 15:08:12 -05:00
Steel Titanium
7d4c9dda91
Add newline to end of file
2018-11-25 14:24:50 -05:00
Steel Titanium
981a1192fb
Save sound toggles to config
2018-11-25 14:22:52 -05:00
Monster Iestyn
aaabf062b8
Merge branch 'ms-cvars-fix' into 'master'
...
Update server name insantly
See merge request STJr/SRB2!344
2018-11-25 14:04:12 -05:00
Monster Iestyn
5069acb110
Merge branch 'mpc-software-yslope-fix' into 'master'
...
Fix glitches with flats visible when looking up/down in 1st person (software renderer fix)
See merge request STJr/SRB2!282
2018-11-25 11:51:54 -05:00
Monster Iestyn
028236006b
Merge branch '21-copyright-followup' into 'master'
...
Print copyright notice in stdout console on program start
See merge request STJr/SRB2!347
2018-11-25 11:07:34 -05:00
Monster Iestyn
8b4a64ac05
Merge branch 'last-min-cleanup' into 'master'
...
Last min cleanup
See merge request STJr/SRB2!342
2018-11-25 10:14:34 -05:00
Monster Iestyn
11cb2e05ba
Merge branch 'cmake-use-internal-libs' into 'master'
...
CMake: Use internal libs.
See merge request STJr/SRB2!325
2018-11-25 09:33:50 -05:00
Monster Iestyn
85305791d8
Merge branch 'objectplace-skybox-fix' into 'next'
...
Objectplace skybox fix.
See merge request STJr/SRB2!319
2018-11-25 09:30:16 -05:00
mazmazz
e4d7ba39a9
Whitespace
2018-11-25 08:17:57 -05:00
mazmazz
83531469d7
Print GPL license notice and SEGA disclaimer in console on start
2018-11-25 08:12:19 -05:00
Digiku
40dfe89273
Merge branch '21-source-copyright' into 'master'
...
Update source copyrights to 2018
See merge request STJr/SRB2!346
2018-11-25 07:36:41 -05:00
mazmazz
bd4743007e
Update source copyrights to 2018, outdated targets
2018-11-25 07:35:53 -05:00
mazmazz
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Digiku
62443c9090
Merge branch '21-credits-update' into 'master'
...
Extra credits update .21
See merge request STJr/SRB2!345
2018-11-25 07:21:31 -05:00
Nev3r
d7b3cf9314
Forgot the alignment for compact structs.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-25 11:35:19 +01:00
Nev3r
b48c1d1ce6
Merge branch 'PK3-BackportNext' of https://github.com/Nevur/SRB2 into PK3-BackportNext
...
# Conflicts:
# src/w_wad.c
2018-11-25 11:18:28 +01:00
Nev3r
32a9e40baa
Progress?
...
Get all IO outputs used for possible errors.
Attempt to fix errors from travis-ci.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-25 11:11:50 +01:00
Nev3r
7c44054aa3
Take out the ifdef?
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-25 09:48:52 +01:00
Steel Titanium
f3ea628fea
Update server name instantly on change
2018-11-24 21:24:05 -05:00
Alam Ed Arias
1113849f5c
Merge remote-tracking branch 'Nevur/PK3-BackportNext' into PK3-BackportNext
2018-11-24 18:00:14 -05:00
Nev3r
ec67c4cbd6
Fix uninitialized pointer.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-24 23:39:31 +01:00
Alam Ed Arias
1bcfe16933
Do not remove newlines from the end of files
2018-11-24 17:30:49 -05:00
Alam Ed Arias
4ac481bcc6
Merge remote-tracking branch 'Nevur/PK3-BackportNext' into PK3-BackportNext
2018-11-24 17:22:11 -05:00
Nevur
3f69e7c9b4
Merge branch 'next' into PK3-BackportNext
2018-11-24 23:08:52 +01:00
Nev3r
a1fb333e9b
Revamped the lumpinfo_t array generation code.
...
-The resource type is 'adequately*' detected first.
-The type-specific behaviors are now contained in their own functions, which are called accordingly for each.
-The PKZip lumpinfo_t generation has been almost entirely rewritten.
-If the functions return null pointer, the resource addition is considered invalid and pops an error.
2018-11-24 22:58:35 +01:00
mazmazz
f80691eb6e
Revert "Adjust mouse scaling calculation for SDL in windowed mode"
...
This reverts commit 3b298b7c42
2018-11-24 15:36:50 -05:00
Alam Ed Arias
c1d4ef3296
Merge branch 'next' into PK3-BackportNext
2018-11-24 14:54:42 -05:00
Alam Ed Arias
148d8ec9e0
Merge branch 'PK3-Backport' into PK3-BackportNext
2018-11-24 14:54:07 -05:00
Alam Ed Arias
17528a6aa9
LFS fixup for PK3 support
2018-11-24 14:48:56 -05:00
Nev3r
6f5e3d42ff
Merge branch 'PK3-Backport' into 'PK3-BackportNext'
...
Pk3 backport
See merge request Nev3r/SRB2!1
2018-11-24 06:02:19 -05:00
Nev3r
cb0c31fa9a
Final touches
...
-Backported multiple per-wad/pk3 ANIMDEFS supported now, just like TEXTURES.
-Removed now-unused function.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-24 09:26:52 +01:00
mazmazz
cf8b4a6cb1
Additional 2.1 credits update
2018-11-23 21:57:07 -05:00
mazmazz
3b298b7c42
Adjust mouse scaling calculation for SDL in windowed mode
2018-11-23 21:43:50 -05:00
mazmazz
b60c10dc9b
Change default mouse sensitivity
2018-11-23 20:51:57 -05:00
Monster Iestyn
794d27b49e
Kill CheckMissileImpact, it has been useless for probably a decade and a half
2018-11-23 23:14:49 +00:00
Monster Iestyn
0a0336a674
Merge branch 'master' into fof-slope-skew-backport
...
# Conflicts:
# src/r_segs.c
2018-11-23 22:40:28 +00:00
Monster Iestyn
4e616f54ad
Merge branch 'master' into next
2018-11-23 21:01:03 +00:00
Monster Iestyn
d228e35fcb
Merge branch 'responsefile-fix' into 'master'
...
Fix M_FindResponseFile returning garbage data
See merge request STJr/SRB2!254
2018-11-23 15:59:40 -05:00
Steel Titanium
97dd291f3f
Merge branch 'master' into responsefile-fix
2018-11-23 15:29:52 -05:00
Alam Arias
30b9cef043
Merge pull request #326 from monster-psychic-cat/opengl_splitscreen_sky_fix
...
Render the skies correctly on splitscreen in OpenGL mode
2018-11-23 14:48:05 -05:00
Alam Arias
b1587cb0a3
Merge pull request #325 from monster-psychic-cat/opengl_startup_screen
...
Render the startup screen on OpenGL mode
2018-11-23 14:47:56 -05:00
Alam Arias
3d0fd7ff2e
Merge pull request #258 from light2yellow/master
...
m_fixed: asm: cc is not a register
2018-11-23 14:47:36 -05:00
Monster Iestyn
08af33c51f
Add myargmalloc boolean to detect whether we allocated myargv ourselves or not, so we don't free myargv if we didn't
2018-11-23 19:12:48 +00:00
Nev3r
0487558a98
Add missing tweaks
...
Also remove a test printf.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-23 17:58:45 +01:00
Nev3r
c548aaa347
Backported PK3 support to 2.1
...
Hopefully I'm not missing anything.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-23 16:58:16 +01:00
Digiku
9a3d2d0ee5
Merge branch '21-credits-update' into 'master'
...
2.1.21 credits update
See merge request STJr/SRB2!339
2018-11-23 07:38:28 -05:00
Digiku
3c95a63fc2
Merge branch 'public-darker-credits' into 'master'
...
Make the credits pics darker
See merge request STJr/SRB2!336
2018-11-23 07:35:44 -05:00
mazmazz
2f7f472ca2
Update credits for 2.1.21
2018-11-23 07:34:23 -05:00
mazmazz
36e020c366
Update version to 2.1.21
2018-11-23 06:58:45 -05:00
Steel Titanium
fe43deacec
Merge branch 'master' into responsefile-fix
2018-11-22 23:02:20 -05:00
Steel Titanium
933c1311cd
Make the error less confusing
2018-11-22 22:59:46 -05:00
Steel Titanium
6020abab94
Fix the not found errors on DLLs
2018-11-22 22:44:47 -05:00
mazmazz
0d4cd35e13
Make the credits pics darker
2018-11-22 20:08:02 -05:00
mazmazz
edd98842d5
Added chasefreecam to menu
2018-11-22 17:32:03 -05:00
mazmazz
17ff7e69a0
Add chasefreelook to separate third and first person mouselook
2018-11-22 17:05:24 -05:00
Monster Iestyn
8f48f082d1
Merge branch 'master' into next
2018-11-22 20:12:59 +00:00
mazmazz
146dd52d24
Smarter pause/break rejection for setcontrol
2018-11-22 14:48:33 -05:00
mazmazz
a8e01ee69b
Smarter pause/break rejection for setcontrol
2018-11-22 14:47:01 -05:00
mazmazz
7075cdbfa8
Don't accept KEY_PAUSE for control console command
2018-11-22 14:37:28 -05:00
mazmazz
f926774ee1
Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key
2018-11-22 14:37:21 -05:00
mazmazz
4b5246d5b7
Adjust menu for movement and camera controls
2018-11-22 14:13:28 -05:00
Monster Iestyn
37c0e646e4
Merge branch 'ms-update-alert-fix' into 'master'
...
Master Server Update alert fix
See merge request STJr/SRB2!333
2018-11-22 13:34:43 -05:00
Digiku
38b4425030
Merge branch 'new-control-names' into 'master'
...
Change camera control names to Look
See merge request STJr/SRB2Internal!207
2018-11-22 11:32:10 -05:00
mazmazz
dd1ecb04cf
Change camera control names to Look
2018-11-22 11:28:32 -05:00
mazmazz
2a5ae054f9
Make movement controls consistent with 2.2
2018-11-22 10:41:21 -05:00
mazmazz
6a3b41ea6f
Let skins jump their regular strength variances in NiGHTS
2018-11-21 21:24:44 -05:00
mazmazz
40eda0e749
Nerf jumping
2018-11-21 21:13:15 -05:00
Digiku
9e75774fd2
Merge branch 'nights-ideyaspawn-dronebox' into 'master'
...
NiGHTS: Ideya Anchor Points
See merge request STJr/SRB2Internal!160
2018-11-21 21:03:29 -05:00
mazmazz
250aab5889
Missed sign cast
2018-11-21 20:30:26 -05:00
Digiku
c6bd1111e5
Merge branch 'nights-dronebox' into 'master'
...
NiGHTS: Drone hitbox improvements and player position correction on Nightserize
See merge request STJr/SRB2Internal!158
2018-11-21 20:19:39 -05:00
Steel Titanium
ff9c41ca5f
Merge branch 'master' into cmake-use-internal-libs
2018-11-21 20:05:08 -05:00
Digiku
bb38aa649f
Merge branch 'nov20-build-fixes' into 'master'
...
Nov20 build fixes
See merge request STJr/SRB2Internal!205
2018-11-21 17:23:20 -05:00
Digiku
e599428442
Merge branch 'debug_stuff' into 'master'
...
Debug tweaks
See merge request STJr/SRB2Internal!144
2018-11-21 16:41:51 -05:00
Digiku
f3e4cf1f9d
Merge branch 'nights-fastercapsule' into 'master'
...
NiGHTS: Faster Egg Capsule destruct sequence
See merge request STJr/SRB2Internal!164
2018-11-21 16:30:01 -05:00
Digiku
597877773b
Merge branch 'nights-onfootcapsulefix' into 'master'
...
NiGHTS: Allow player to destroy capsule on-foot before transforming into NiGHTS
See merge request STJr/SRB2Internal!185
2018-11-21 16:29:37 -05:00
Monster Iestyn
3acc312923
Fix servers disappearing from the server list when you refresh, by forcefully closing connnections to the servers immediately after sending ASKINFO. Also force close connections to old server list when refreshing, because we don't need to hear from them anymore full stop.
2018-11-21 20:45:03 +00:00
mazmazz
9bdab67de6
Don't accept KEY_PAUSE for control console command
2018-11-21 11:21:17 -05:00
mazmazz
2acad7ad86
Dont show Hold to Retry HUD when using Pause/Break key
2018-11-21 11:10:18 -05:00
mazmazz
8a9c10e633
Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key
2018-11-21 10:58:07 -05:00
mazmazz
74da082c75
Merge remote-tracking branch 'origin/master' into HEAD
2018-11-20 23:19:36 -05:00
Marco Z
c0df7b47c5
Merge branch 'c88bbda028a21a51058488ee0214ce925625f0a0' into nov20-build-fixes
...
# Conflicts:
# src/hardware/hw_main.c
2018-11-20 22:42:20 -05:00
Marco Z
ddd357d27c
VC build fixes
2018-11-20 21:54:20 -05:00
mazmazz
0af071dbca
build errors
2018-11-20 20:23:48 -05:00
mazmazz
dcac157ccd
Merge remote-tracking branch 'origin/master' into menu-execs
2018-11-20 18:31:30 -05:00
mazmazz
5870d145b2
Draw connection screen correctly; make scroll speed inherit global setting
2018-11-20 18:13:18 -05:00
mazmazz
094ec7ce3c
Performance improvements
...
* Don't loop every frame for menu drawing parameters
* Fixed in-game escape menu not dimming correctly
* Fixed glitches on default title screen parameters
2018-11-20 17:28:26 -05:00
Monster Iestyn
b2c3a39a2f
I forgot to do this earlier, welp
2018-11-20 21:17:46 +00:00
Monster Iestyn
224c0fccdb
Merge branch 'public_next'
...
# Conflicts:
# src/Makefile.cfg
# src/d_clisrv.c
# src/p_setup.c
# src/r_segs.c
# src/r_things.c
2018-11-20 14:33:10 +00:00
Monster Iestyn
66900c70ee
Merge branch 'master' into next
2018-11-20 13:55:36 +00:00
Monster Iestyn
948466658f
Merge branch 'fof-wall-rendering-fixes-and-cleanup' into 'master'
...
FOF wall rendering fixes and cleanup
See merge request STJr/SRB2!317
2018-11-20 08:54:09 -05:00
mazmazz
cfaa017e7d
stray #if to #ifdef
2018-11-19 20:52:01 -05:00
mazmazz
6cc6edc137
Changed Mixer X sources to 2.2.0; added x64 gcc support
2018-11-19 20:51:54 -05:00
Monster Iestyn
2d1f927a17
Fix the nonsense going on here regarding dc_colormap, this makes FOF walls appear strange if they were for a fog block with colormap adjacent to a normal sector with a colormap and no FOFs.
...
...that was a mouthful
2018-11-19 22:12:26 +00:00
Monster Iestyn
418943acdc
change return type of M_CheckMODVersion to boolean
2018-11-19 17:47:23 +00:00
Monster Iestyn
797f9d180e
Make sure GetMODVersion and its console equiv properly detect failing to get a reply from the MS, also added extra console/menu messages
2018-11-19 17:46:38 +00:00
Alam Ed Arias
a290c4727b
Merge branch 'master' into Travis_CI-gcc8
2018-11-18 21:23:27 -05:00
Alam Ed Arias
42afd3532d
Merge branch 'master' into next
2018-11-18 20:22:40 -05:00
Alam Ed Arias
0b5069f36c
We need to include the NUL char
2018-11-18 20:21:32 -05:00
Alam Ed Arias
5a09d44fd2
Merge remote-tracking branch 'public/master' into Travis_CI-gcc8
2018-11-18 19:59:21 -05:00
Monster Iestyn
ab39534ef6
Merge branch 'mingw-64bit' into 'master'
...
MinGW: Fix compiling on 64-bit Windows.
See merge request STJr/SRB2!329
2018-11-18 19:49:18 -05:00
mazmazz
4fa6895f60
Fixed skullAnimCounter type for text prompts
2018-11-18 12:56:37 -05:00
Monster Iestyn
8c71cd0b90
Merge branch 'master' into next
2018-11-18 17:11:57 +00:00
Monster Iestyn
a400bb9ef6
Merge branch 'camera-subsector-crash-fix' into 'master'
...
Camera subsector crash fix
See merge request STJr/SRB2!318
2018-11-18 08:28:38 -05:00
mazmazz
53b956f540
Mirror a wipe if it's forced off and the counter-wipe is specified
2018-11-18 04:39:34 -05:00
mazmazz
765e4b3134
Compiler fixes
2018-11-18 04:32:38 -05:00
mazmazz
3d1e5fa7e8
Allow inherited wipes when switching menus without a common ancestor (Multiplayer > Server Settings)
2018-11-18 03:32:19 -05:00
mazmazz
5fc91e8405
Fix lingering titlemapcameraref when reloading title screen
2018-11-18 03:19:32 -05:00
mazmazz
3acabdab93
Fix MN_SPECIAL check for menu meta state
2018-11-18 03:19:07 -05:00
mazmazz
3c2d30072e
Allow backgrounds for player select
2018-11-18 02:49:08 -05:00
mazmazz
f3be97a95a
Allow changing titlemap's cameraref via Line 422 Cut-Away View; change music too
2018-11-18 02:41:35 -05:00
mazmazz
758647fab2
More title screen features; menu meta state implementation (active and previous menu types)
...
* Draw background over titlemap
* HIDEBACKGROUND to show titlemap
* Specify NOMUSIC or IGNOREMUSIC (to not change music)
* Linedef execs implemented for tree hierarchy, including bubbling (NOENTERBUBBLE/NOEXITBUBBLE)
* Specify ENTERWIPE and EXITWIPE
* Menuid hierarchy fixes (Control mapping, joystick setup)
* Time attack handling fixes
* Specify custom wipes on runtime for D_Display and P_SetupLevel (for titlemap)
* Allow for forcing and skipping a wipe
* Wipe utility functions F_GetWipeLength and F_WipeExists
2018-11-17 19:08:30 -05:00
mazmazz
d2bbddbed4
Implemented features
...
* M_SkyScroll optimization with still speeds; refactor background drawing
* Music (in time attack screens so far)
* FadeStrength
* HideTitlePics
* Scrolling backgrounds in Time Attack (moved F_SkyScroll to m_menu)
2018-11-17 01:21:21 -05:00
mazmazz
1e6369e8de
Implement scrolling menu backgrounds
2018-11-16 18:26:26 -05:00
mazmazz
32dc47207d
Merge branch 'menu-execs' into menu-execs-skyscroll
2018-11-16 15:11:02 -05:00
mazmazz
0e0437b894
Extra title SOCs: Music and FadeScreen. TitleScrollYSpeed in MainCfg
2018-11-16 15:01:28 -05:00
mazmazz
4d3ddda5b5
Sky scroll attempt
2018-11-16 14:34:28 -05:00
mazmazz
9c76c61384
Extra title SOCs: Music and FadeScreen. TitleScrollYSpeed in MainCfg
2018-11-16 14:18:35 -05:00
mazmazz
c4cddf8741
Menumeta iterators
2018-11-16 14:16:41 -05:00
mazmazz
199bc155bc
Make MENU dehacked block top-level; TITLESCREEN is not necessary
2018-11-16 12:12:11 -05:00
mazmazz
15c0bab0c9
Title screen menu SOC
2018-11-16 12:07:47 -05:00
mazmazz
75dab7850f
Refactor MM_ menu types to MN_
2018-11-16 09:56:22 -05:00
mazmazz
3ec96d8b99
Menutypes for dehacked
2018-11-16 09:46:32 -05:00
mazmazz
b69756f5e5
Use bitshifting for menu IDs and hierarchy instead
2018-11-16 09:22:27 -05:00
mazmazz
9dab65fce0
Add MM menutype flags to menu defs
2018-11-15 19:41:27 -05:00
mazmazz
c8f5aa688a
Express menu defs as flags
2018-11-15 19:41:05 -05:00
mazmazz
f7cc62d9d9
Define menu enum, encode hierachy by number places
2018-11-15 15:51:29 -05:00
Steel Titanium
02c08a3e10
Some small changes
2018-11-14 21:01:54 -05:00
Steel Titanium
f02105732e
Fix up compiling on DD version
2018-11-14 18:00:10 -05:00
Steel Titanium
c5a97dcfe6
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into mingw-64bit
2018-11-14 17:28:41 -05:00
Alam Ed Arias
4695841b8d
fix format-truncation: need bigger string buffers
2018-11-14 16:50:52 -05:00
Monster Iestyn
09f9572a8f
Merge branch 'master' into next
2018-11-14 21:49:11 +00:00
Monster Iestyn
3e6fcf1b8b
Merge branch 'opengl-hud-scale-fix' into 'master'
...
OpenGL HUD scaling fix
See merge request STJr/SRB2!320
2018-11-14 16:48:13 -05:00
Alam Ed Arias
fb08950c19
Fix stringop-truncation: ‘strncpy’ output truncated before terminating nul copying 8 bytes from a string of the same length
2018-11-14 16:32:57 -05:00
Alam Ed Arias
4e9fc881a2
Fix =sizeof-pointer-memaccess: argument to ‘sizeof’ in ‘strncpy’ call is the same expression as the source; did you mean to use the size of the destination?
2018-11-14 16:26:46 -05:00
Steel Titanium
1b79b9527c
Properly check if cmake is running on wwindows
...
Thanks Monster Iestyn for informing me this is the correct way.
2018-11-14 15:58:45 -05:00
Alam Ed Arias
d4cb81cb28
Merge branch 'master' into next
2018-11-14 15:45:29 -05:00
MonsterIestyn
772c072064
Merge branch 'master' into analog-flipcam-synch-fix
2018-11-14 19:36:39 +00:00
Alam Ed Arias
97fd69951a
Merge branch 'master' into next
2018-11-14 11:07:12 -05:00
Alam Ed Arias
de5b626520
Fix misleading indentation
2018-11-14 11:06:45 -05:00
Alam Ed Arias
f81d01edca
Merge branch 'vc-xpm-fix' into 'master'
...
Remove unnecessary SDLCALL from IMG_xpm.c declarations
See merge request STJr/SRB2!327
2018-11-14 11:00:20 -05:00
Alam Ed Arias
d14f87b8c6
Cleanup whitespace
2018-11-14 10:54:33 -05:00
Alam Ed Arias
938bf1605c
Merge branch 'master' into next
2018-11-14 10:52:49 -05:00
Alam Ed Arias
f73ea4f984
Clean up warnings
2018-11-14 10:52:16 -05:00
mazmazz
cf834f3503
Line 457: Calculate input angle tolerance correctly
2018-11-14 10:13:39 -05:00
Marco Z
8777d5c6c9
Comment context for declaration changes; remove extern terms
2018-11-14 08:15:38 -05:00
Marco Z
51768e7dd1
Remove unnecessary SDLCALL from xpm declarations
2018-11-14 08:06:07 -05:00
Monster Iestyn
f3b59c1731
Fix VC project files to include hw_clip.c/h
2018-11-14 12:11:57 +00:00
Marco Z
0b97b2a76c
Missed #ifdef HAVE_LIBGME in win_snd
2018-11-13 22:50:08 -05:00
Steel Titanium
2ca5e29110
Make sure the new option only works on Windows.
...
Is this how you do it? I'm not really sure.
2018-11-13 20:37:14 -05:00
Steel Titanium
4836e711d3
Fix up 64-bit MINGW
2018-11-13 20:32:18 -05:00
Steel Titanium
d0b64222f7
Merge branch 'master' into cmake-use-internal-libs
2018-11-13 19:46:43 -05:00
Monster Iestyn
302358c403
Merge branch 'mixer-sound-x64-fix' into 'master'
...
mixer_sound fix x64 build issue
See merge request STJr/SRB2!323
2018-11-13 17:42:23 -05:00
Steel Titanium
9029cf5d9c
Fix skybox disappearing after using objectplace command
2018-11-13 17:25:42 -05:00
mazmazz
2db2b6e6af
Win32 boolean fixes
2018-11-13 17:24:19 -05:00
Steel Titanium
95ed3fcf7e
Save current renderer to screenshots
2018-11-13 17:19:22 -05:00
mazmazz
894ee02f3f
Fix x64 build issue
2018-11-13 17:12:18 -05:00
mazmazz
f2bfed7892
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-11-13 14:34:40 -05:00
mazmazz
119cf49452
Merge branch 'master' into musicplus-core
2018-11-13 14:19:04 -05:00
mazmazz
6bb408da08
Remove misplaced tutorialmode = false due to debugging
2018-11-13 14:12:22 -05:00
mazmazz
8f87bf82cd
Merge branch 'master' into musicplus-core
2018-11-13 13:46:30 -05:00
Monster Iestyn
e9fe0ebae1
Fix OpenGL's HUD not being scaled the same way as Software's, by removing an old OpenGL-specific hack for fdupx/fdupy
2018-11-13 18:14:59 +00:00
Monster Iestyn
0d38061db8
Fix V_SNAPTOx code to consider dupx/dupy the same way as Software mode
2018-11-13 18:13:51 +00:00
mazmazz
6c69dd1f78
Merge branch 'master' into text-prompts
2018-11-13 11:12:44 -05:00
Digiku
b6a0b2f1d9
Merge branch 'tutorial-time' into 'master'
...
Tutorial mode handling
See merge request STJr/SRB2Internal!201
2018-11-13 10:49:02 -05:00
Digiku
fae095f9e8
Merge branch 'control-switching' into 'master'
...
Game control switching
See merge request STJr/SRB2Internal!202
2018-11-13 10:48:18 -05:00
Digiku
3ccfd57fba
Merge branch 'tracerangle' into 'master'
...
Line Exec 457, 458: Track mobj's angle to tracer; executes line tag if mobj faces away
See merge request STJr/SRB2Internal!198
2018-11-13 10:48:01 -05:00
Digiku
1b7f7ef7cc
Merge branch 'monitor-exec' into 'master'
...
Run linedef exec upon popping a monitor
See merge request STJr/SRB2Internal!199
2018-11-13 10:47:37 -05:00
mazmazz
dbb4924348
Compile errors
2018-11-13 10:43:40 -05:00
mazmazz
c1c815ce6e
Compile errors
2018-11-13 10:31:06 -05:00
mazmazz
4b3dff3ef3
Tutorial named tag detection adjustment
2018-11-13 02:00:58 -05:00
mazmazz
3d7b185ea0
Check specifically for gcs_fps when starting tutorial
2018-11-13 01:57:51 -05:00
mazmazz
6f435ee410
F_AdvanceToNextPage adjustment
2018-11-13 01:38:20 -05:00
mazmazz
75c4a96e69
NextTag implementation
...
* Adjust named tag implementation to be more portable
* Next page adjustments
2018-11-13 00:13:36 -05:00
mazmazz
f4ad5ebfba
text-prompts gclist -> gcl refactor
2018-11-12 23:31:10 -05:00
mazmazz
3a00439f3a
Merge branch 'control-selector' into text-prompts
2018-11-12 23:26:27 -05:00
mazmazz
96da056f81
tutorial-time gclist -> gcl refactor
2018-11-12 23:25:49 -05:00
mazmazz
870ee89371
Merge branch 'control-selector' into tutorial-time
2018-11-12 23:23:52 -05:00
mazmazz
1d86cc348d
Refactor gclists
2018-11-12 23:23:39 -05:00
mazmazz
eb7718bfeb
PicToStart implementation; fix NumPrompts limitation error
2018-11-12 23:16:24 -05:00
mazmazz
d31b4b792b
F_GetTextPromptTutorialTag implementation
2018-11-12 22:47:20 -05:00
mazmazz
a362407886
Merge branch 'control-selector' into text-prompts
2018-11-12 21:11:53 -05:00
mazmazz
7ec4a42d9f
Force chasecam for tutorialmode
2018-11-12 20:37:55 -05:00
mazmazz
a0926b5314
First time tutorial prompt fixes
2018-11-12 19:10:41 -05:00
mazmazz
5200f55e40
Merge branch 'tutorial-time' into tutorial-time-firstprompt
2018-11-12 18:08:48 -05:00
mazmazz
118da60615
Freeze camera values in tutorialmode with proper defaults
2018-11-12 18:08:24 -05:00
mazmazz
a58461c29e
Merge branch 'tutorial-time' into tutorial-time-camera
2018-11-12 17:41:49 -05:00
mazmazz
80c613561c
->defalutvalue -- .defaultvalue adjustment
2018-11-12 17:37:54 -05:00
mazmazz
40e5a2104b
Also set cv_analog for tutorialgcs
...
* M_TutorialSaveControlResponse CV_Set adjustment
2018-11-12 17:34:56 -05:00
mazmazz
acd922886a
Change mouse cv vars temporarily alongside control scheme
2018-11-12 17:30:21 -05:00
mazmazz
44b42af22b
Merge branch 'control-selector' into tutorial-time
2018-11-12 17:17:02 -05:00
mazmazz
1a5ccb2781
Uncomment gcs_platform
2018-11-12 17:16:54 -05:00
mazmazz
4986d5945b
Restrict control changes if tutorialgcs is active
2018-11-12 16:56:06 -05:00
mazmazz
45381058b3
Merge branch 'control-selector' into tutorial-time
2018-11-12 16:54:49 -05:00
mazmazz
31c1145cf3
Uncomment gcs_platform defaults
2018-11-12 16:54:42 -05:00
mazmazz
ab084f1bc9
Add tutorialgcs variable for optional control scheme loading
2018-11-12 16:50:03 -05:00
Monster Iestyn
e85f73117c
Split camera initialisation code from P_SetupLevel, make sure the camera has an initial subsector set!
2018-11-12 20:07:45 +00:00
Monster Iestyn
63ba59341b
Fix monitors (and other objects) on a floating, bobbing FOF being stuck slightly above said FOF after it has finished bobbing
2018-11-12 16:23:59 +00:00
mazmazz
8f7c1e7f71
Fix CopyControls not firing when starting tutorial while keeping current controls
2018-11-11 23:42:02 -05:00
mazmazz
ce7f168568
Fix PICSMETAPAGE
2018-11-11 14:50:10 -05:00
mazmazz
424bc557c2
Dehacked typos
2018-11-11 14:44:57 -05:00
mazmazz
3f1ade35f3
Merge branch 'tutorial-time' into tutorial-time-firstprompt
2018-11-11 09:37:36 -05:00
mazmazz
703cb6be0f
Check reduced control set for tutorial time; change the entire tutorial control set when prompted
2018-11-11 09:37:19 -05:00
mazmazz
9fc58d0a68
Merge branch 'control-selector' into tutorial-time
2018-11-11 09:35:27 -05:00
mazmazz
c7a855de7a
Split gclist_tutorial_check from gclist_tutorial
2018-11-11 09:35:15 -05:00
mazmazz
3be9981231
Merge branch 'control-selector' into tutorial-time
2018-11-11 09:22:06 -05:00
mazmazz
fd83e1ed5c
num_gclist_tutorial adjustment
2018-11-11 09:21:54 -05:00
mazmazz
c883b13b5d
Merge branch 'tutorial-time' into tutorial-time-firstprompt
2018-11-11 09:21:10 -05:00
mazmazz
54f04fa5cf
Tutorial control message adjustments
2018-11-11 09:15:43 -05:00
mazmazz
ea9f499936
Merge branch 'control-selector' into tutorial-time
2018-11-11 08:57:07 -05:00
mazmazz
181d13fe73
gclist_tutorial include lookup/lookdown for conflict reasons
2018-11-11 08:56:40 -05:00
mazmazz
80b19ff566
gclist adjustments
2018-11-11 08:52:21 -05:00
mazmazz
9ff27ebbae
gclist adjustments
2018-11-11 08:51:51 -05:00
mazmazz
6be583eac6
Merge branch 'control-selector' into tutorial-time
2018-11-11 08:46:06 -05:00
mazmazz
3f72e1bacf
New gclists and const modifier; added tutorialmode declarations to this branch
2018-11-11 08:44:08 -05:00
mazmazz
9f1c40f881
G_CopyControls and G_GetControlScheme adjustment (take input list of gc's to check)
2018-11-11 08:21:11 -05:00
mazmazz
85bcf6d389
Tutorial mode support for control switching
2018-11-11 08:20:08 -05:00
mazmazz
75fc91644b
G_CopyControls and G_GetControlScheme adjustment (take input list of gc's to check)
2018-11-11 08:19:44 -05:00
mazmazz
1e00381075
Merge branch 'control-selector' into tutorial-time
2018-11-10 17:30:33 -05:00
mazmazz
775b34e3f2
Made gamecontrol tables more portable
...
* G_DefineDefaultControls
* G_GetControlScheme
* G_CopyControls
* G_SaveKeySetting
* gamecontrolschemes_e
2018-11-10 17:26:30 -05:00
mazmazz
7deeb8bac4
Stub netgame support; ignore bots on linedef special
2018-11-10 15:34:56 -05:00
mazmazz
0c72d7e70a
Let triggering splitscreen player control the text prompt
2018-11-10 14:47:30 -05:00
mazmazz
80973e8b65
Splitscreen "support" (one prompt only, both players freeze controls)
2018-11-10 14:30:59 -05:00
MPC
eb4a72440a
Render the skies correctly on splitscreen in OpenGL mode
2018-11-10 16:19:41 -03:00
Monster Iestyn
e4f157786c
Merge branch 'public_next'
...
# Conflicts:
# src/Makefile
# src/doomtype.h
# src/hardware/hw_clip.c
# src/hardware/hw_main.c
# src/sdl12/sdl_sound.c
2018-11-10 19:18:34 +00:00
Monster Iestyn
fced19d291
Merge branch 'master' into next
2018-11-10 19:05:33 +00:00
Monster Iestyn
c7e58b7cd5
Merge branch 'opengl-new-clipping-backport' into 'master'
...
OpenGL new clipping backport
See merge request STJr/SRB2!315
2018-11-10 13:57:16 -05:00
Monster Iestyn
46b58cba55
Merge branch 'alias-recursion-hotfix' into 'next'
...
Alias recursion hotfix
See merge request STJr/SRB2!314
2018-11-10 13:56:43 -05:00
Monster Iestyn
51df32dd3d
Merge branch 'gcc-compiling-cleanup' into 'master'
...
Compiling cleanup and fixes
See merge request STJr/SRB2!311
2018-11-10 13:56:17 -05:00
MPC
ff642df1f2
Render the startup screen on OpenGL mode
2018-11-10 15:56:13 -03:00
mazmazz
727ca143b5
Branch G_Controldefault into FPS and PLATFORM
2018-11-10 13:28:10 -05:00
mazmazz
8c6de7ff60
Pictoloop zero-based fix
2018-11-10 12:54:59 -05:00
mazmazz
9a038b28e1
Implemented GFX for text prompts
...
* PicMode SOC
* PicToLoop SOC
2018-11-10 12:42:13 -05:00
Monster Iestyn
323c89dbaf
fix using abs() on unsigned
2018-11-10 17:40:09 +00:00
Monster Iestyn
dd83652b71
Whoops, this broke my non-NEWCLIP test build
2018-11-10 16:10:25 +00:00
Monster Iestyn
8ba0f2a177
clipping code didn't seem so bad this time (at least compared to without), let's enable it now?
2018-11-10 16:09:52 +00:00
Monster Iestyn
c4569e61a8
Made some efforts to improve efficiency of new code, hard to tell if I've made it better or worse though honestly
...
R_IsEmptyLine is now a thing too btw
2018-11-10 16:09:21 +00:00
Monster Iestyn
1e98e3b4f2
More progress, NEWCLIP added to doomdef.h, sadly it actually all lags the game so I've disabled it for now
...
Other notes:
* on second thought I'll keep the hw_clip functions' gld prefixes rather than HWR, not like it matters either way
* despite the extra lag it does fix the issues with translucent walls and such when displayed at different vertical angles, such as with the GFZ1 waterfall
2018-11-10 16:08:56 +00:00
Monster Iestyn
a733a29f4c
Starting work on porting hw_clip.c/h code, Makefiles and CMake can compile them at least
...
Other notes:
* Renamed all new functions to have HWR_ prefix instead of gld_, for consistency
* HWR_FrustrumSetup and HWR_SphereInFrustum are disabled and require HAVE_SPHEREFRUSTRUM. This is because 1) SRB2CB did not need the code, so presumably neither will we, and 2) there are some OpenGL API functions used there that due to our way of using OpenGL we don't use outside of r_opengl.c, which makes dealing with HWR_FrustrumSetup complicated in theory
* The new clipping functions are not added to OpenGL's "main" rendering code itself just yet, they're just available to use now once hw_clip.h is included
2018-11-10 16:08:26 +00:00
mazmazz
631c6f93f5
Implement music switching for prompts
2018-11-10 11:05:33 -05:00
Monster Iestyn
896de73c60
....ow this slipup hurt me badly
2018-11-10 16:00:33 +00:00
Monster Iestyn
d456a5362c
Whoops, mucked up this part of the conflict resolving
2018-11-10 15:55:09 +00:00
Monster Iestyn
a8291c122a
adding lua_maplib.c comments for new slope-related userdata types
2018-11-10 15:47:04 +00:00
Monster Iestyn
268bde3fdf
Merge branch 'public_next'
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
# src/dehacked.c
# src/g_game.h
# src/hardware/hw_draw.c
# src/hardware/hw_main.c
# src/lua_baselib.c
# src/lua_hook.h
# src/lua_hooklib.c
# src/lua_hudlib.c
# src/lua_libs.h
# src/lua_maplib.c
# src/lua_script.c
# src/m_misc.h
# src/p_mobj.c
# src/s_sound.c
# src/sdl12/mixer_sound.c
# src/w_wad.c
2018-11-10 15:41:57 +00:00
mazmazz
3d9ce630d2
SOC for prompt gfx and music
2018-11-10 10:33:58 -05:00
mazmazz
99a0831b0b
Hardcode tutorial prompt offset index
2018-11-10 10:15:16 -05:00
mazmazz
a197c19742
Prompt page string field length adjustment; check empty named tag before prompt search
2018-11-10 09:38:32 -05:00
mazmazz
e1e94c3af2
Added page tags and find page by tag
...
* Added tutorial mode defines to this branch
2018-11-10 09:32:53 -05:00
Monster Iestyn
31301660cd
Merge branch 'master' into next
2018-11-10 14:27:27 +00:00
Monster Iestyn
925a56ad98
Merge branch 'opengl-improvements-backport' into 'master'
...
Opengl improvements backport
See merge request STJr/SRB2!304
2018-11-10 09:25:18 -05:00
Monster Iestyn
e01c7ae743
Merge branch 'copyright-info-update' into 'master'
...
Update copyright info
See merge request STJr/SRB2!309
2018-11-10 08:33:09 -05:00
Monster Iestyn
2da335a1c4
Place limit on the amount of alias recursion allowed, to prevent cycles or otherwise excessive recursion
2018-11-10 13:08:26 +00:00
mazmazz
28238c41df
WIP: First-time tutorial prompt
2018-11-10 02:30:21 -05:00
mazmazz
ffed9f4d20
Force camera defaults during tutorialmode (doesn't work in all cases)
2018-11-10 01:31:30 -05:00
mazmazz
a542006ae8
Hide Tutorial menu option if no tutorialmap
2018-11-10 01:17:11 -05:00
mazmazz
33a94ba2b8
Prompt HUD hiding implementation
2018-11-10 01:00:18 -05:00
mazmazz
54dc5d1892
Merge branch 'text-prompts' into text-prompts-hidehud
2018-11-10 00:10:42 -05:00
mazmazz
19a8b15912
Actually fix empty prompt text crash
2018-11-10 00:10:16 -05:00
mazmazz
7ac641450f
Text prompt Hide HUD dehacked
2018-11-09 23:50:25 -05:00
mazmazz
9ee894f777
Make gray/black text prompt backcolor darker in OpenGL
2018-11-09 22:52:13 -05:00
mazmazz
7daf5d4727
Set up separate background color for prompts vs. console
2018-11-09 22:38:55 -05:00
mazmazz
ae4c1e0e82
Fix tmthing crash in EndTextPrompt when loading an invalid prompt on level start
2018-11-09 22:07:32 -05:00
mazmazz
b8897db308
Fix crash when page text is empty; add checks for MAX_PROMPTS and MAX_PAGES
2018-11-09 21:55:14 -05:00
Monster Iestyn
4b8232d777
Merge branch 'master' into next
2018-11-09 23:18:14 +00:00
Alam Arias
1c22c6a1f9
Merge pull request #320 from monster-psychic-cat/remote_view_fixes
...
Minor remote viewpoint bugfixes.
2018-11-09 16:09:20 -05:00
Monster Iestyn
b3befae143
Merge branch 'public-op-nightsbumper-fix' into 'next'
...
Objectplace: Fix NiGHTS bumper angle being reset when WRITETHINGS
See merge request STJr/SRB2!299
2018-11-09 12:11:11 -05:00
Monster Iestyn
17223aa520
Merge branch 'master' into next
2018-11-09 16:09:49 +00:00
Monster Iestyn
f974bb96ac
Merge branch 'music-clean' into 'master'
...
Some code cleanup.
See merge request STJr/SRB2!298
2018-11-09 10:58:57 -05:00
Monster Iestyn
98fd9f8e42
WHY DID I FORGET THIS
2018-11-08 21:22:45 +00:00
Monster Iestyn
82c738ea4b
Remove hasslope, per colette's warning about it potentially causing desyncs
2018-11-08 21:13:58 +00:00
Monster Iestyn
d8f3a20e65
Merge branch 'Playerquit_hook' into 'next'
...
"PlayerQuit" Lua Hook
See merge request STJr/SRB2!127
2018-11-08 15:53:35 -05:00
Monster Iestyn
a9cfd6a781
Merge branch 'lua-slopes' into 'next'
...
Lua support for slopes
See merge request STJr/SRB2!307
2018-11-08 15:52:44 -05:00
Monster Iestyn
91113cb79c
Merge branch 'master' into next
2018-11-08 20:50:58 +00:00
Monster Iestyn
7cc5caf69c
Merge branch 'winsock-error-handling-fixes' into 'master'
...
Winsock error handling fixes
See merge request STJr/SRB2!303
2018-11-08 15:49:35 -05:00
Monster Iestyn
f50f10ef30
d_main.c: remove the _MAX_PATH define, the file hasn't used it since v2.0
2018-11-08 20:09:00 +00:00
Monster Iestyn
fa80d61799
byteptr.h: include endian.h to help define WRITE/READ macros correctly according to endianness
2018-11-08 17:16:54 +00:00
Monster Iestyn
fd20bbb54e
More doomtype.h cleaning up:
...
* Move the misc types in the file to bottom, so that ATTRPACK at least is usable for RGBA_t
* Include endian.h, so that UINT2RGBA can be defined correctly for big endian builds
* Add more comments to make clear the main sections of the file
2018-11-08 17:05:35 +00:00
Monster Iestyn
5c61c40551
Clean up doomtype.h a bit, add indenting and comments to make some preprocessor code more readable
2018-11-08 16:31:20 +00:00
Monster Iestyn
0bdbdd1b1e
Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified)
2018-11-08 16:26:55 +00:00
Monster Iestyn
c47f0045d6
ST_Ticker also should not have FUNCMATH, as it also has side effects
2018-11-07 21:45:27 +00:00
Monster Iestyn
b3e8a1ed88
HU_Start should not have FUNCMATH, it has side effects
2018-11-07 21:37:42 +00:00
Monster Iestyn
4a4e07e138
D_PostEvent_end is only used by Allegro (used by the DOS port) to help timers work, so check for PC_DOS in preprocessor code. Also remove FUNCMATH from said function.
2018-11-07 21:21:36 +00:00
Monster Iestyn
f66979ba1a
P_NullPrecipThinker no longer should have FUNCMATH (though I'm not sure if it should have had it in the first place anyway)
2018-11-07 21:00:38 +00:00
GoldenTails
a3bc7ddfa0
Add Lua Ultimate Mode global variable so people can use it.
2018-11-06 18:09:45 -06:00
MPC
1cc8619c9e
Minor remote viewpoint bugfixes.
2018-11-05 20:40:51 -02:00
mazmazz
eb204b6cc4
Add exec to GoldMonitorPop; transfer Angle tag to mobj->lastlook for Lua compat
2018-11-05 07:41:02 -05:00
mazmazz
311cb27818
Close text prompt upon level load
2018-11-04 22:32:47 -05:00
mazmazz
96e9b4143a
Pause TextPrompt when game is paused
2018-11-04 22:32:47 -05:00
mazmazz
c16c59fd73
Support underscores -> spaces in TextPrompt name
2018-11-04 22:32:47 -05:00
mazmazz
722da815ea
Move Line 449 to Line 459; allow post exec tag by either Back X offset or line tag
2018-11-04 22:32:47 -05:00
mazmazz
6356a6cf2e
Lowercase font for body text; added ICONFLIP parameter
2018-11-04 22:32:46 -05:00
mazmazz
1ca8fca602
Changed Line 449 post exec tag to line tag
2018-11-04 22:32:46 -05:00
mazmazz
73ae273348
Implemented auto-advancing TextPrompts
...
* Fixed TextSpeed
* New TimeToNext
* Other bugs
2018-11-04 22:32:46 -05:00
mazmazz
0a766dc93b
Implemented progressive text printing for TextPrompt
2018-11-04 22:32:46 -05:00
Monster Iestyn
444462732b
added HWR_DrawTutorialBack for OpenGL
2018-11-04 22:32:46 -05:00
Monster Iestyn
d327f82e85
Fix errors found when compiling
2018-11-04 22:32:46 -05:00
mazmazz
98d532f119
EndTextPrompt: Fix tmthing crash with P_LinedefExecute
2018-11-04 22:32:46 -05:00
mazmazz
57d9e0aef6
TextPrompt: Implement player blocked controls and post-close run line
2018-11-04 22:32:46 -05:00
mazmazz
971151ab83
Fixes: MetaPage, AdvanceToNextPage, center/scale icons, button handling
2018-11-04 22:32:46 -05:00
mazmazz
5f1052729c
Line 449 param rearranging
2018-11-04 22:32:46 -05:00
mazmazz
7778507a70
Basic TextPrompt line action implemented
2018-11-04 22:32:45 -05:00
mazmazz
1855359ac0
Moved TextPrompt logic to f_finale.c
...
* Added basic TextPrompt ticker and drawer functions
* Added chevron animation
2018-11-04 22:32:45 -05:00
mazmazz
edcdf79b60
Text prompt: Fix V_DrawFixedPatch call for non-green resos
2018-11-04 22:32:45 -05:00
mazmazz
63e5cfecff
Linedef Exec 449 Control Text Prompt - beginnings
2018-11-04 22:32:45 -05:00
mazmazz
cbcb6a0d6c
Text prompt features: Name, Icon, IconAlign, Lines
2018-11-04 22:32:42 -05:00
mazmazz
a3d000a37e
Kind of support line breaks with PAGETEXT. Can't trim trailing whitespace yet.
2018-11-04 22:31:52 -05:00
mazmazz
ef241b4521
Broken attempt at supporting linebreaks for PageText, like cutscenes
2018-11-04 22:31:52 -05:00
mazmazz
95c68c331a
TextPrompt/Page freeslots; SOC Prompt/Page parsing
2018-11-04 22:31:52 -05:00
Monster Iestyn
77447492ec
Add V_DrawTutorialBack for drawing a console-like background box, add Lorem ipsum as filler test
2018-11-04 22:31:49 -05:00
mazmazz
b7c6661c76
Add MTF_EXTRA flag to monitors, to run linedef exec by Angle (Tag + 16384) upon pop
2018-11-04 20:16:33 -05:00
mazmazz
eaf89cf7b9
TRACERANGLE: Run exec *after* resetting mobj values
2018-11-04 17:34:00 -05:00
mazmazz
4fc335a26b
Line 458: Only do disable operation if MFE_TRACERANGLE is set
2018-11-04 16:48:18 -05:00
mazmazz
cf6a6991cb
Trigger line exec by whether mobj is facing its tracer
...
* MFE_TRACERANGLE
* Thing 758 MT_ANGLEMAN
* mobj thinker behavior
* Line Exec 457/458 Enable/Disable
2018-11-04 16:28:25 -05:00
mazmazz
eec3f630cf
Merge remote-tracking branch 'origin/master' into tutorial-time
2018-11-03 10:58:11 -04:00
mazmazz
15020ae01d
Removed TextPrompt-specific code for text-prompt branch
2018-11-03 10:57:43 -04:00
Monster Iestyn
02b14959cc
Merge branch 'master' into next
2018-11-03 12:29:04 +00:00
Monster Iestyn
924c3164b0
Merge branch 'soc-sanitising-the-sequel' into 'next'
...
SOC sanitising the sequel!
See merge request STJr/SRB2!308
2018-11-03 08:18:16 -04:00
Monster Iestyn
0f37411e2b
Make sure handles of files opened by W_LoadWadFile are closed if we abort loading the files for whatever reason.
...
ESPECIALLY if the file is already loaded in SRB2, that's just silly.
2018-11-02 20:48:12 +00:00
Monster Iestyn
7b268d15b1
Merge branch 'lua-hudlib-addition' into 'next'
...
Lua: hud.enabled and v.getLocalTransFlag()
See merge request STJr/SRB2!306
2018-11-02 14:29:02 -04:00
Monster Iestyn
f37a573834
Merge branch 'master' into next
2018-11-02 11:02:35 +00:00
Monster Iestyn
ba5f5be3bb
Merge branch 'patch-offsets-fix' into 'master'
...
Patch offsets fix
See merge request STJr/SRB2!305
2018-11-02 07:00:37 -04:00
Steel Titanium
5a0cfc10f4
Update copyright info on some files
2018-11-01 14:47:19 -04:00
Monster Iestyn
4dd5abf534
Merge branch 'master' into next
2018-10-31 23:10:57 +00:00
Monster Iestyn
c450a1aee2
Merge branch 'mi-minor-refactoring-backport' into 'master'
...
MI minor refactoring
See merge request STJr/SRB2!294
2018-10-31 16:49:30 -04:00
Monster Iestyn
61c1b12960
Merge branch 'multipatchtex-translucent-cyanpixel-fix-backport' into 'master'
...
Multi-patch texture support for transparency AND translucency
See merge request STJr/SRB2!293
2018-10-31 16:48:38 -04:00
Monster Iestyn
e9ea1b47d5
Fix the game crashing if you put params with no "=" for some reason in some of the SOC blocks, just stop going through the lines if that happens
2018-10-31 19:26:29 +00:00
Steel Titanium
0f9611df76
Merge remote-tracking branch 'upstream/master' into cmake-use-internal-libs
2018-10-30 21:06:06 -04:00
Steel Titanium
2f62a03f6c
Fix up 64-bit gme
2018-10-30 20:50:36 -04:00
Latapostrophe
6841458546
got rid of the settop as well
2018-10-30 22:51:05 +01:00
Latapostrophe
799d8d2749
remove gL check
2018-10-30 22:29:28 +01:00
Latapostrophe
a0495142df
Small hud library additions
2018-10-30 19:40:59 +01:00
Monster Iestyn
22e8dd1f9d
now that V_FLIP's effects are always supported in V_DrawFixedPatch, there's no need for the "flip" variable anymore
2018-10-30 14:22:21 +00:00
Monster Iestyn
2fa0896fd0
Fix an error I made in HWR_DrawFixedPatch
2018-10-30 13:44:01 +00:00
LJSonik
b52158eb48
Merge branch 'master' into analog-flipcam-synch-fix
2018-10-29 19:52:08 +01:00
Monster Iestyn
b022ff02a5
add missing SHORTs in HWR_DrawPatch and HWR_DrawCroppedPatch as well
2018-10-29 13:34:54 +00:00
Monster Iestyn
f8fd8f8ec5
HWR_DrawFixedPatch: Add V_OFFSET support for V_FLIP in hardware code as well, also add missing SHORTs for gpatch fields
2018-10-29 13:29:16 +00:00
Monster Iestyn
df9c3ef3cd
Make V_OFFSET no thing without V_NOSCALESTART, to remove any potential glitches with using it on its own
2018-10-29 12:36:09 +00:00
Monster Iestyn
834a5e6b35
V_DrawFixedPatch: Tinker with the left/top offsets code so that V_OFFSET can support V_FLIP
2018-10-29 12:06:22 +00:00
Louis-Antoine
3d0daf2202
Fix desynch when toggling analog mode or flipcam
...
Special thanks to Lat' for asking weird questions
2018-10-29 00:49:23 +01:00
Monster Iestyn
32077897b6
Removed all remaining traces of VID_X11 code in hw_drv.h and hw_data.h, the macro is no longer used by Linux etc versions of SRB2.
...
Unlike the rest of the commits in this branch (as of writing), I didn't make this commit between 1 and 2 years ago, I made it right now ;)
2018-10-27 19:58:51 +01:00
Monster Iestyn
aebcf3520b
Remove pointless drawtextured variable and redundant fake planes checks (R_FakeFlat would already have made gr_frontsector/backsector something else if they were)
2018-10-27 19:32:55 +01:00
Monster Iestyn
3d88ee9d55
Added missing checks in HWR_AddLine from the software version, move v** vars to the top since R_PointToAngle calls use the same values anyway
2018-10-27 19:31:24 +01:00
Monster Iestyn
09eecd36b4
Hack to make sure even (extra)subsectors without planepolys have segs adjusted
...
this fixes a crash in (old) GFZ2 at the ramp as a result of creating pv1/pv2. This probably means before pv1/pv2 there could have been some silly typecasting from vertex_t to polyvertex_t to get fixed vertex coords and such...
2018-10-27 19:29:45 +01:00
Monster Iestyn
90cfa5ef16
Make new pv1/pv2 seg pointers, so AdjustSeg doesn't modify the v1/v2 pointers directly anymore
...
Yes I know they're void * in r_defs.h's seg_t definition, it's quicker than trying to figure out if including hardware/hw_glob.h is a good idea or not
2018-10-27 19:29:31 +01:00
Monster Iestyn
1cf2ce63c0
More optimising and otherwise fixing bizarre formatting in hw_trick.c
2018-10-27 18:58:05 +01:00
Monster Iestyn
2107aab666
Moved my added slope checks in hw_trick.c to isCeilingFloating/isFloorFloating
...
I also optimised those two functions while I was there (why keep a "floating" variable when setting it to false guarantees the functions return false?)
2018-10-27 18:57:28 +01:00
Monster Iestyn
787d5b598d
gr_correcttricks fix: don't check if top/bottom textures are missing for sloped sectors, just ignore and cancel the hack
...
This fixes GFZ2's mysterious flying flats at the ramp to the big room
2018-10-27 18:56:38 +01:00
Monster Iestyn
67a2922558
Ensure file is closed whenever MD2 reading errors happen
2018-10-27 18:53:38 +01:00
Monster Iestyn
b150e842fc
Add MD2_INDENT and MD2_VERSION so we can cleanly check that it's a valid MD2 from magic number/version
2018-10-27 18:53:18 +01:00
Monster Iestyn
29d8e34d03
Call V_DoPostProcessor only in software mode (it cancels itself in OGL anyway)
2018-10-27 18:52:34 +01:00
Monster Iestyn
9fb301ecb5
don't bother with inlining the function, on second thoughts
2018-10-27 16:47:56 +01:00
Monster Iestyn
bb3d850bbf
static the buffer, forgot to do this earlier
2018-10-27 16:27:00 +01:00
Monster Iestyn
e4e76f83c3
Use temporary buffer with a max size of 255 bytes instead of having Microsoft's FormatMessageA alloc one for us. Also, provide a fallback message in case no message was available for some reason
2018-10-27 16:09:14 +01:00
Monster Iestyn
3b39a25ade
Save the result of errno (aka WSAGetLastError() for WinSock) as soon as possible, to prevent anything in SOCK_GetNodeAddress resetting the value to 0 while trying to print the message for the error itself!
2018-10-27 15:49:04 +01:00
Monster Iestyn
ab38e6cebb
Creating a quick get_WSAErrorStr function to act as a wrapper for FormatMessageA so we can string-ify Winsock errors properly
...
Untested!
2018-10-27 15:36:15 +01:00
Monster Iestyn
e95b54e64f
missed this ESLOPE-needed area from a few commits ago apparently :V
2018-10-21 20:35:14 +01:00
Monster Iestyn
772004d3fd
Fix editing slope xydirection with Lua
2018-10-21 18:25:13 +01:00
Monster Iestyn
3ec8743c1b
Fix up the ability to edit slope zdelta and zangle with Lua (zangle is untested as of writing)
2018-10-21 17:32:53 +01:00
Monster Iestyn
e15ed742c1
add ESLOPE ifdef checks around all the Lua slope support code that was there before I was involved
2018-10-21 16:27:54 +01:00
Monster Iestyn
bd0c187e68
Merge branch 'next' into lua-slopes
2018-10-21 16:03:48 +01:00
Monster Iestyn
10f9403619
Merge branch 'master' into next
2018-10-21 15:39:30 +01:00
Monster Iestyn
87afae9cf5
Fix unarchiving of mapheader_t userdata Lua variables
2018-10-21 15:15:54 +01:00
Monster Iestyn
efff869e6e
Add mobj.standingslope to Lua
2018-10-21 15:12:51 +01:00
Monster Iestyn
2ec4f2024f
Added support for pslope_t userdata variables in Lua archive/unarchive code
2018-10-21 15:00:07 +01:00
Monster Iestyn
e5d16c520d
Merge branch 'lua-action-userdata-quickfix' into 'master'
...
Lua action userdata quickfix
See merge request STJr/SRB2Internal!196
2018-10-21 06:00:35 -04:00
Monster Iestyn
9296aaa28c
zangle should be shifted down by ANGLETOFINESHIFT if we're to use FINETANGENT on it
2018-10-20 23:36:06 +01:00
Monster Iestyn
4edeeb6953
Add P_GetZAt to Lua
2018-10-20 21:08:59 +01:00
Monster Iestyn
61fa7026a1
add vector2 and vector3 userdata types to simplify getting a slope's o/d/normal
2018-10-20 19:00:37 +01:00
Monster Iestyn
7d4e27937d
Merge branch 'next' into lua-slopes
...
# Conflicts:
# src/lua_maplib.c
2018-10-20 18:31:06 +01:00
Monster Iestyn
b5c4b476a6
Merge branch 'public_next'
...
# Conflicts:
# src/d_main.c
# src/m_menu.c
# src/s_sound.c
# src/sdl/sdl_sound.c
2018-10-20 15:31:48 +01:00
Monster Iestyn
d57c54f93b
Merge branch 'master' into next
2018-10-20 14:13:13 +01:00
Monster Iestyn
7d61201194
Fix slipup from when the smashing spikeballs from HHZ were hardcoded
2018-10-20 12:54:40 +01:00
mazmazz
cc0d1db9d8
Merge remote-tracking branch 'steeltitanium/music-clean' into test-public-music-cleanup
2018-10-19 23:56:56 -04:00
mazmazz
a288b95458
Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup
2018-10-19 22:04:26 -04:00
Monster Iestyn
d4e11762fa
Merge branch 'public_next'
...
# Conflicts:
# src/nds/i_sound.c
# src/r_data.c
# src/sdl12/mixer_sound.c
# src/sdl12/sdl_sound.c
# src/win32ce/win_snd.c
2018-10-19 22:46:19 +01:00
Monster Iestyn
29b242a5bd
Merge branch 'endgame-code-refactor-backport' into 'next'
...
Endgame code refactor
See merge request STJr/SRB2!297
2018-10-19 17:31:19 -04:00
Monster Iestyn
fe2af34ee5
Merge branch 'master' into next
2018-10-14 20:49:35 +01:00
Monster Iestyn
423403eab5
Merge branch 'sound-handle-fix' into 'master'
...
Handle fix for SDL Mixer
See merge request STJr/SRB2!301
2018-10-14 15:46:25 -04:00
Monster Iestyn
b720cb10dc
Merge branch 'pris_accurate-gif-delay' into 'master'
...
More accurate GIF delay
See merge request STJr/SRB2!276
2018-10-14 15:44:33 -04:00
Sryder
3886888b30
Fix missing commas and missed interface
2018-10-14 10:14:07 +01:00
Sryder
6184f91dd3
Add an int to I_PlaySound to tell an interface which channel number SRB2 is using.
...
I've voided this out on other sound interfaces than SDL Mixer ones because I'm both not sure whether they need it, and not sure how to make them work with it if they do.
2018-10-13 23:01:11 +01:00
Monster Iestyn
80cbad61c0
Do lightlist height stepping *after* the heights are used by the FOF rendering code, not before (yes, I caught that they remove a heightstep beforehand for FOFs, but that wasn't done for midtextures it seems?)
...
Additionally add some macros for repeated slope end assignments and overflow tests
2018-10-13 18:57:40 +01:00
Monster Iestyn
bedfed2f00
Move shared code here instead of duplicating it for both dc_numlights and non-dc_numlights rendering code
...
Also added a few comments, and include the out of range check in the "shared code" above
2018-10-13 15:37:11 +01:00
Steel Titanium
450b536147
Remove the condition in restartaudio command.
...
No longer needed as S_RegisterSoundStuff will return early if in
dedicated mode.
2018-10-11 20:11:37 -04:00
Monster Iestyn
8ab4915b5b
Whoops these should be L not gL here (not that it makes much difference normally though)
2018-10-11 21:44:25 +01:00
Steel Titanium
b3faed190b
Move commands and console variable into s_sound.c
2018-10-11 16:29:43 -04:00
Monster Iestyn
feceaf6d30
Removed all code in Y_FollowIntermission that's already handled in G_AfterIntermission
...
Only real difference here is that CEcho messages will always be cleared when going to credits/evaluation, but that's hardly a loss tbh.
2018-10-11 21:25:15 +01:00
Monster Iestyn
2bb7df5f49
G_ExitLevel tweak: Use HU_ClearCEcho() instead of HU_DoCEcho(""), the latter causes an empty line to appear in log.txt
2018-10-11 21:25:04 +01:00
Monster Iestyn
31f3f8b8e7
Moved Y_EndGame from y_inter.c/h to g_game.c/h, renamed it to G_EndGame
2018-10-11 21:24:53 +01:00
Monster Iestyn
c1d5c711a9
Be gone ye old texture hack
2018-10-11 21:08:25 +01:00
Monster Iestyn
9c464742b7
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
2018-10-11 20:00:45 +01:00
Monster Iestyn
ef78c942f7
Remove unused ObjectPlace_OnChange prototype (from when Objectplace was a consvar, which it is not anymore)
2018-10-11 20:00:34 +01:00
Monster Iestyn
49c5a6f7e4
Remove unused "runcount" variable from p_local.h
2018-10-11 20:00:23 +01:00
Monster Iestyn
91b2f5e570
"t" is not needed to take out fencepost cases from viewangletox
2018-10-11 20:00:05 +01:00
Monster Iestyn
07dd527e7e
Removed unused function prototypes in d_main.h
...
Also corrected what appears to be a typo in some comments above?
2018-10-11 19:59:47 +01:00
Monster Iestyn
61a29bed85
Remove unused sscount variable
...
(it's only set to 0 in software, and only ++'d in OpenGL, what kind of sense does that make?)
2018-10-11 19:59:26 +01:00
Monster Iestyn
a4419abfdc
debugfile is only used by DEBUGFILE code, no need to declare/define it for anything else
2018-10-11 19:59:09 +01:00
Monster Iestyn
38ec0cc50a
These convar externs aren't moving files, I'm just shifting them up to live with their relatives
2018-10-11 19:39:28 +01:00
Monster Iestyn
0ad0f8afc4
Move analog consvars to g_game.h
2018-10-11 19:39:11 +01:00
Monster Iestyn
933508db89
Moved screenshot/movie consvar externs to m_misc.h
2018-10-11 19:38:11 +01:00
Monster Iestyn
e2a4c59e21
cv_controlperkey probably belongs in g_input.h too
2018-10-11 19:37:48 +01:00
Monster Iestyn
4b7af892e1
Moved most of d_netcmd.h's 2P mouse consvar externs to the files with their 1P counterparts
2018-10-11 19:37:24 +01:00
Monster Iestyn
72ab305bf4
Change when and specifically what colormap[] is applied to in R_Draw2sMultiPatchTranslucentColumn_8
2018-10-11 17:05:23 +01:00
Monster Iestyn
b9b0a8110c
Add R_Draw2sMultiPatchTranslucentColumn_8, for columns of multi-patch textures used as midtextures on two-sided linedefs with both transparency AND translucency
...
...that was a mouthful
2018-10-11 17:05:13 +01:00
Monster Iestyn
77e85394d8
Change when and specifically what colormap[] is applied to in R_Draw2sMultiPatchTranslucentColumn_8
2018-10-10 14:59:44 +01:00
Monster Iestyn
d3da4cb527
Merge branch 'fof-slope-skew-backport'
2018-10-10 14:53:01 +01:00
Monster Iestyn
291ebf302c
Merge branch 'public_next'
...
# Conflicts:
# src/Makefile
# src/lua_script.c
# src/p_user.c
# src/sdl/i_system.c
# src/v_video.c
# src/w_wad.c
2018-10-10 14:51:34 +01:00
Monster Iestyn
8196c59557
Merge branch 'master' into next
2018-10-09 22:55:55 +01:00
Monster Iestyn
c469fc242f
Merge branch 'movechasecamera-crashfix' into 'next'
...
Fix for Chicmunk's weird camera related crash
See merge request STJr/SRB2!284
2018-10-09 15:20:06 -04:00
Sryder
497314fdc4
Tiny fix so that joystick2 being closed can let the JoystickSubSystem close before game close.
...
No memory leak here, just a very tiny thing I noticed.
2018-10-09 19:43:18 +01:00
toaster
1324e0bfcd
* Fix a memory leak regarding implementation of SOC_ (improperly copypasted code from LUA_LoadLump!!)
...
* Optimise the repeated strlen usage into a single call, which is stored for later.
2018-10-08 18:50:17 +01:00
Monster Iestyn
12e0222929
Merge branch 'drwhoandthesleepingweather' into 'master'
...
Dr. Who And The Sleeping Weather
See merge request STJr/SRB2!288
2018-10-08 09:36:18 -04:00
Monster Iestyn
1049f3451a
Merge branch 'sp-savegame-continue-crash-fix' into 'master'
...
SP savegame continues icon crash
See merge request STJr/SRB2!290
2018-10-08 09:20:45 -04:00
Monster Iestyn
1115f41f8e
Merge branch 'zlib-split' into 'master'
...
Makefile: Split zlib and libpng
See merge request STJr/SRB2!285
2018-10-08 07:20:27 -04:00
Steel Titanium
027e6e8e3c
Change win_snd.c also
2018-10-07 15:00:48 -04:00
Steel Titanium
232a7ae7b7
Change order of the ifdef
2018-10-07 14:52:25 -04:00
Steel Titanium
def090c9f0
Move the ifdef
2018-10-07 14:45:03 -04:00
Sryder
62d7049437
I'm fairly sure GCC64 should enable GCC63.
...
No wonder I never got mixed declaration and code warnings.
2018-10-07 15:44:44 +01:00
toaster
b1e02467bf
Weather is already run client-side. What if we ran it render-side, for major performance gains? This commit will answer all your questions - and more!
2018-10-07 15:00:58 +01:00
Sryder
fb6c329870
Fix the crashing bug hopefully
...
A value of 1 in freesrc for Mix_LoadWAV_RW and Mix_LoadMus_RW calls SDL_RWclose on the RWops anyway.
For Mix_LoadWAV_RW the RWops is freed right after the data is loaded (because it makes a copy of the data in memory)
For Mix_LoadMUS_RW the RWops is freed when Mix_FreeMusic is called (because the data is not a copy)
So setting 1 on freesrc doesn't actually free the RWops immediately on Mix_LoadMus_RW *unless* it failed to load any music.
2018-10-07 10:37:45 +01:00
Sryder
02597e0bf9
Fix compiler warnings.
2018-10-07 09:26:18 +01:00
Sryder
d072dd2725
I think that should be NULL, not 0 actually.
2018-10-07 00:22:23 +01:00
Sryder
7b417b573c
Mix_QuickLoad_RAW sets a flag in the Mix_Chunk so that Mix_FreeChunk doesn't actually Free the sound.
...
Checks for the flag when freeing, and if it's 0, we free the data manually after Mix_FreeChunk.
I went back to Z_Malloc and Z_Free for this because they still work after this.
2018-10-07 00:15:42 +01:00
Sryder
725a65c1f7
Call SDL_RWclose after an SDL_RWFromMem call to close the RWops.
2018-10-07 00:15:11 +01:00
Monster Iestyn
1ec601af6b
Draw a star for continues if invalid skin numbers are somehow supplied
2018-10-05 22:42:36 +01:00
Steel Titanium
b812a6a4ab
Really fix DD compiling this time.
2018-10-04 22:56:11 -04:00
Steel Titanium
fc5d969642
Fix DD compiling
2018-10-04 22:44:26 -04:00
Steel Titanium
49cb1ffe9f
Restore deleted endif
2018-10-04 22:38:59 -04:00
Steel Titanium
79f5f4885c
Split zlib and libpng
2018-10-04 19:47:19 -04:00
Alam Ed Arias
348f4dc2cd
Merge branch 'master' into next
2018-10-02 09:14:59 -04:00
Monster Iestyn
800b3bb240
Move player + player mobj existence checks to top of P_MoveChaseCamera. This is the only place it makes sense to even check them tbh.
...
While I'm at it, let's also use the "mo" variable instead of player->mo throughout the function (to be consistent)
2018-09-30 22:18:48 +01:00
Monster Iestyn
872e2f82c1
Redo OpenGL skewing support, so that it now itself supports the lower unpegged effect for FOFs in OpenGL!
2018-09-28 17:02:02 +01:00
Monster Iestyn
6a6d32e7c2
searchfilemenu: Replace first with 0 here as toaster suggested
2018-09-23 14:17:29 +01:00
mazmazz
f2033350fc
MP Jingle: A brace (Underwater restore, p_inter.c)
2018-09-21 15:53:03 -04:00
mazmazz
e0f9cdcfd1
MP Jingle: Fix underwater music not restoring on air bubble or shield
2018-09-21 15:44:52 -04:00
Steel Titanium
f88708bb75
Fix the weird indentation
2018-09-21 12:05:52 -04:00
Steel Titanium
68ec811909
Rearrange the code.
...
Thanks again MonsterIestyn!
2018-09-21 11:26:08 -04:00
Steel
af58ba9ae3
Remove this that somehow slipped in.
2018-09-21 07:21:49 -04:00
Steel
be74b4e58b
Fix up errors with buildbots
2018-09-21 07:16:54 -04:00
mazmazz
d14db91133
MP Jingle: Remove P_RestoreMusic from space countdown (no reason to have it)
2018-09-20 19:05:05 -04:00
Steel Titanium
378495cb2b
Add some stuff
2018-09-20 18:33:50 -04:00
Steel Titanium
a53f036149
Use MemAvailable instead
2018-09-20 18:30:46 -04:00
mazmazz
d8addda298
MP Jingle: Add fade timing hack after ending a non-looping song
2018-09-20 18:30:21 -04:00
mazmazz
78c1b99cd4
MP Jingle: Changed music_stacks from fixed array to next/prev chain
2018-09-20 17:13:52 -04:00
mazmazz
b7947554e2
MP Core Win32: Fix FadeSong unused callback param (buildbots)
2018-09-20 08:42:28 -04:00
mazmazz
54f94b80db
MP Core Win32: Fix FadeSong unused callback param (buildbots)
2018-09-20 08:41:40 -04:00
mazmazz
551237350e
MP Mixer X: Fix double->UINT32 cast (buildbots)
2018-09-20 08:30:31 -04:00
mazmazz
4b4bd638a9
MP libopenmpt: Add doomdef.h header to load_libraries, resolve CONS_Printf (buildbots)
2018-09-20 08:23:29 -04:00
mazmazz
b38f6f6125
MP Libopenmpt: Fix UINT32->double cast (buildbots)
2018-09-20 07:42:35 -04:00
mazmazz
2896b3e3c4
MP Libopenmpt: SDL header in load_libraries
2018-09-20 07:39:53 -04:00
mazmazz
d5b3d74e6f
MP Libopenmpt: Separate loading into sdl/load_libraries.c
2018-09-19 23:18:06 -04:00
mazmazz
1508f3a320
MP Libopenmpt: Make explicit OPENMPT=1 for non-windows platforms
2018-09-19 23:03:35 -04:00
mazmazz
31343be41b
foundrover ffloor_t -> boolean
2018-09-19 20:11:30 -04:00
mazmazz
03367bdc60
Merge branch 'musicplus-core' into musicplus-feature-postboss
2018-09-19 20:07:03 -04:00
mazmazz
6f1a5cbfc9
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-09-19 20:06:56 -04:00
mazmazz
7290723484
Merge branch 'public-musicplus-core' into public-musicplus-le-changemusic
2018-09-19 19:57:19 -04:00
mazmazz
0bc6b2e4d8
Merge branch 'public-musicplus-core' into public-musicplus-feature-endoflevel
2018-09-19 19:56:54 -04:00
mazmazz
7cd1bfb8d7
Merge branch 'public-musicplus-core' into public-musicplus-jingle
2018-09-19 19:56:50 -04:00
mazmazz
a4fade9b25
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2018-09-19 19:56:49 -04:00
mazmazz
f52659d9f9
MP Postboss: strnicmp -> boolean remove cast (buildbots)
2018-09-19 19:54:14 -04:00
mazmazz
af5aecb246
MP Jingle: Better empty_music_stack_entry initialization (buildbots)
2018-09-19 19:51:04 -04:00
mazmazz
7084fc89bd
MP Core s_sound: I_FadeSongFromVolume call fix (buildbots)
2018-09-19 19:47:21 -04:00
mazmazz
2644180b7e
MP Core s_sound: I_FadeSongFromVolume call fix (buildbots)
2018-09-19 19:46:57 -04:00
mazmazz
37addc02e6
MP Core Mixer: Old-style function dec fixes (buildbots)
2018-09-19 19:41:38 -04:00
mazmazz
49c678d2e9
MP Core s_sound: Mixed D+C fix (buildbots)
2018-09-19 19:41:23 -04:00
mazmazz
de47ab63f2
MP Core Mixer fade: Use fixed instead of double calc (fixes buildbots)
2018-09-19 19:40:24 -04:00
mazmazz
be5555d393
Merge branch 'public-musicplus-core' into public-musicplus-feature-endoflevel
2018-09-19 19:32:52 -04:00
mazmazz
17fc39c62e
Merge branch 'public-musicplus-core' into public-musicplus-le-changemusic
2018-09-19 19:32:51 -04:00
mazmazz
7cc0b6cf95
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2018-09-19 19:32:49 -04:00
mazmazz
affbc89602
Merge branch 'public-musicplus-core' into public-musicplus-jingle
2018-09-19 19:24:57 -04:00
mazmazz
17c796fe74
MP Jingle: Buildbot fixes
2018-09-19 19:24:35 -04:00
mazmazz
164be3056f
MP Core s_sound: Mixed D+C fix (buildbots)
2018-09-19 19:19:18 -04:00
mazmazz
96fa8996db
MP Core Mixer fade: Use fixed instead of double calc (fixes buildbots)
2018-09-19 19:18:35 -04:00
mazmazz
ade637798b
MP Core Mixer: Old-style function dec fixes (buildbots)
2018-09-19 19:06:24 -04:00
mazmazz
75558c40a2
Merge branch 'public-musicplus-core' into public-musicplus-feature-endoflevel
2018-09-19 18:55:01 -04:00
mazmazz
d4cef2bf9b
Merge branch 'public-musicplus-core' into public-musicplus-le-changemusic
2018-09-19 18:55:00 -04:00
mazmazz
af89cf92e2
Merge branch 'public-musicplus-core' into public-musicplus-jingle
2018-09-19 18:55:00 -04:00
mazmazz
86f3fadd5e
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2018-09-19 18:54:58 -04:00
mazmazz
1c314833db
Merge branch 'musicplus-core' into musicplus-feature-postboss
2018-09-19 18:53:46 -04:00
mazmazz
3e9b253438
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-09-19 18:53:41 -04:00
mazmazz
1da3b921dd
Merge remote-tracking branch 'origin/master' into musicplus-core
2018-09-19 18:53:18 -04:00
mazmazz
e08bdec216
MP Jingle: Buildbot fixes
2018-09-19 18:42:35 -04:00
mazmazz
494c5290cf
MP Core Mixer: Unused param fixes (buildbots)
2018-09-19 18:26:59 -04:00
mazmazz
974b1d340a
MP Core Mixer: Unused param fixes (buildbots)
2018-09-19 18:26:33 -04:00
mazmazz
5e1b4272c1
Initialize foundrover to NULL (for debug checking)
2018-09-19 17:50:05 -04:00
mazmazz
24938473a5
Linedef exec FOF specials: Move logic into for (rover =...) block so procedure happens on every FOF match
2018-09-19 17:49:03 -04:00
Digiku
87087c190e
Merge branch 'nights-keeppoints' into 'master'
...
NiGHTS: Deduct marescore when player hits ground, not immediately on timeout
See merge request STJr/SRB2Internal!161
2018-09-19 11:03:24 -04:00
Digiku
106afd48af
Merge branch 'nights-score-lap' into 'master'
...
NiGHTS: Intermission Bonuses
See merge request STJr/SRB2Internal!159
2018-09-19 11:03:14 -04:00
Digiku
e3ecb61173
Nights intermission bonus y_inter.c: A comment
2018-09-19 10:53:11 -04:00
Digiku
1dadee6804
Nights intermission dehacked: a comment
2018-09-19 10:45:51 -04:00
mazmazz
481c0d7623
EndOfLevel: 2.1 _clear -> lclear music in y_inter
2018-09-18 23:32:00 -04:00
mazmazz
db9528f6e4
MP Core: 2.1 dehacked typo
2018-09-18 23:29:18 -04:00
mazmazz
b057b2932d
EndOfLevel: 2.1 dehacked setup fix
2018-09-18 23:28:39 -04:00
mazmazz
1dd47e850b
EndOfLevel: Check player->exiting > 0 && <= TICRATE, fixes start-of-level fading in 2.1
...
Braces in y_inter.c
2018-09-18 23:27:00 -04:00
mazmazz
26749d275c
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2018-09-18 22:24:44 -04:00
mazmazz
00bbb60e69
Mixer: Add back var_cleanup in I_LoadSong
...
Because musicplus-libopenmpt deleted it, I added a cautionary note to ALWAYS clean up your vars!
2018-09-18 22:24:07 -04:00
mazmazz
f99b6a89ed
Mixer: Add back var_cleanup in I_LoadSong
...
Because musicplus-libopenmpt deleted it, I added a cautionary note to ALWAYS clean up your vars!
2018-09-18 22:15:53 -04:00
mazmazz
81ad8f0681
Merge branch 'master' into le-fadefof
2018-09-18 17:11:33 -04:00
mazmazz
d542c2440d
musicplus-feature-endoflevel 2.2 -> 2.1 backport
2018-09-18 15:50:12 -04:00
mazmazz
b55191f09a
Merge branch 'musicplus-core' into musicplus-feature-postboss
2018-09-18 15:35:02 -04:00
mazmazz
2e0e0a3856
musicplus-le-changemusic 2.2 -> 2.1 backport
2018-09-18 15:28:57 -04:00
mazmazz
26721b673a
Lua P_RestoreMusic else if fix
2018-09-18 15:12:09 -04:00
mazmazz
0cfe0824b6
Lua P_RestoreMusic else if fix
2018-09-18 15:11:37 -04:00
mazmazz
be2342799e
Lua P_RestoreMusic else if fix
2018-09-18 15:10:42 -04:00
mazmazz
c60d61a493
musicplus-jingle 2.2 -> 2.1 backport
2018-09-18 15:10:00 -04:00
mazmazz
0f5b7e6630
MusicPlus core: Win32 DD compile fixes
2018-09-18 14:09:24 -04:00
mazmazz
e4f48cfb71
MusicPlus core: Win32 DD compile fixes
2018-09-18 14:09:13 -04:00
mazmazz
68c295c9e1
MusicPlus core: NOMIXER=1 compile fix
2018-09-18 13:23:59 -04:00
mazmazz
b71996106b
MusicPlus core: NOMIXER=1 compile fix
2018-09-18 13:23:42 -04:00
mazmazz
b48b5a29a4
Move cv_modfilter from mixer_sound.c to s_sound.c for other targets
2018-09-18 13:01:34 -04:00
mazmazz
38afb85b47
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2018-09-18 12:59:53 -04:00
mazmazz
1a935eabd5
Mixer I_StopSong: StopFadingSong and var_cleanup call fix
2018-09-18 12:55:19 -04:00
mazmazz
f079c9170f
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-09-18 12:51:55 -04:00
mazmazz
67566f9a2f
Mixer I_StopSong: StopFadingSong and var_cleanup call fix
2018-09-18 12:51:42 -04:00
mazmazz
cf7d913f3b
Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx
2018-09-18 12:46:46 -04:00
mazmazz
8583785d72
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-09-18 12:46:41 -04:00
mazmazz
4cba996a89
Define cv_midiplayer/soundfontpath/timiditypath in s_sound.c when NOMIXER=1
2018-09-18 12:41:49 -04:00
mazmazz
4d89beb105
musicplus-libopenmpt 2.2 -> 2.1 backport
2018-09-18 12:31:47 -04:00
mazmazz
a2c5c331c0
Merge branch 'master' into musicplus-core
2018-09-18 12:20:56 -04:00
mazmazz
66283ce36a
MusicPlus core: Lua separation fixes
2018-09-18 11:39:08 -04:00
Digiku
b7bcc16c98
Merge branch 'fof-fixes-movingplatexists' into 'master'
...
Moving platform fix: Player snaps to floor when setting ~FF_EXISTS
See merge request STJr/SRB2Internal!188
2018-09-18 11:29:11 -04:00
mazmazz
c45d523e8f
420: Don't interrupt existing light fade on duration timing except EFFECT5
...
(cherry picked from commit 3b957c32517a8f5148940c0067af7e88a51d1fee)
2018-09-18 11:08:33 -04:00
Digiku
a036c42973
Merge branch 'colormap-overhaul-fade' into 'master'
...
Linedef Exec 455 Fade Colormap, 456 Stop Fading Colormap
See merge request STJr/SRB2Internal!191
2018-09-18 11:06:09 -04:00
mazmazz
3cdd904fbc
Merge branch 'colormap-overhaul-fade' into le-fadefof
2018-09-18 11:05:30 -04:00
mazmazz
899e8ef2a0
Merge remote-tracking branch 'origin/master' into le-fadefof
2018-09-18 10:52:03 -04:00
Digiku
a32304c9d5
Merge branch 'colormap-overhaul-change-ldef' into 'master'
...
Linedef Exec 447: Change Colormap relative value calc
See merge request STJr/SRB2Internal!190
2018-09-18 10:49:54 -04:00
Digiku
843ed289a6
Merge branch 'polyobj-fade' into 'master'
...
Linedef Exec 492: Fade PolyObject
See merge request STJr/SRB2Internal!192
2018-09-18 10:48:46 -04:00
mazmazz
41964e084d
MusicPlus core: Lua separation fixes
2018-09-18 10:32:38 -04:00
mazmazz
c5ea6b5efe
MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport
2018-09-18 10:22:17 -04:00
mazmazz
34e403afcb
S_ChangeMusic: More specific load/play fail messages
2018-09-18 09:38:41 -04:00
mazmazz
94393e759d
Merge branch 'music-cleanup' into musicplus-core
2018-09-18 08:33:20 -04:00
mazmazz
2b2e179e63
S_ChangeMusic: More specific load/play fail messages
2018-09-18 08:32:34 -04:00
mazmazz
e7ecd84e80
p_setup: Don't fudge texture offsets if EFFECT5 and a linedef exec
2018-09-18 07:37:29 -04:00
mazmazz
5029c01c2b
492: Remove pre-existing thinker when setting up new fade
2018-09-18 07:31:19 -04:00
mazmazz
6567872229
492: Don't interrupt existing polyobj fader unless EFFECT5
2018-09-18 07:31:17 -04:00
mazmazz
9778cc2ad5
455: A line break
2018-09-18 07:30:37 -04:00
mazmazz
56ee711f33
455: Commented out, but allow existing fade overlap of 2 tics (or speed*2)
2018-09-18 07:30:35 -04:00
mazmazz
64b96c7192
455: Don't interrupt current color fading
2018-09-18 07:29:21 -04:00
mazmazz
27aa357053
453: A line break
2018-09-18 07:28:30 -04:00
mazmazz
f5b25c91f5
453: Commented out, but allow existing fade overlap of 2 tics (or speed*2)
2018-09-18 07:28:28 -04:00
mazmazz
5b16590ba2
453: Don't interrupt current FOF fade unless EFFECT5
2018-09-18 07:27:47 -04:00
Monster Iestyn
fab25a451f
Merge branch 'public_next'
2018-09-17 21:50:19 +01:00
mazmazz
20c4702986
Line exec trigger netsync: Save var2s in addition to vars
2018-09-17 14:13:31 -04:00
Digiku
6f1a44432b
Merge branch 'colormap-overhaul' into 'master'
...
Colormap code overhaul
See merge request STJr/SRB2Internal!189
2018-09-17 11:24:14 -04:00
mazmazz
c462bd4b17
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-17 10:57:02 -04:00
mazmazz
71df02c996
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-17 10:56:56 -04:00
mazmazz
69a4906911
Colormap netsync: Count ffloors for colormap loading upper limit
2018-09-17 10:38:17 -04:00
mazmazz
d417f733e5
Colormap netsync: Handle unaccounted dummy colormaps properly
2018-09-17 10:30:21 -04:00
mazmazz
1e7a4af207
Merge branch 'colormap-overhaul' into colormap-overhaul-fade
2018-09-17 08:06:17 -04:00
mazmazz
8b4c4e20d5
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-17 08:06:10 -04:00
mazmazz
752a963037
Colormap netsync: String format numsectors to UINT32 (thanks buildbot)
2018-09-17 08:05:51 -04:00
mazmazz
14339d651d
453: Use new colormap netsync for fade FOF thinker
2018-09-17 00:34:03 -04:00
mazmazz
c44ce7b401
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-17 00:28:16 -04:00
mazmazz
3ebd545523
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-17 00:27:11 -04:00
mazmazz
f3e1d280d0
Colormap netsync: Mixed D+C fixes
2018-09-17 00:26:58 -04:00
mazmazz
67c4e9e8a2
Postboss: S_ChangeMusicAdvanced -> Ex
2018-09-16 23:44:42 -04:00
mazmazz
c5d4ff5712
Merge branch 'musicplus-core' into musicplus-feature-postboss
2018-09-16 23:32:18 -04:00
mazmazz
48445c7733
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-09-16 23:18:11 -04:00
mazmazz
d7f4c9be84
S_ChangeMusicAdvanced -> S_ChangeMusicEx
2018-09-16 23:10:23 -04:00
mazmazz
917dea7070
Separate Lua from musicplus-core
2018-09-16 23:09:37 -04:00
mazmazz
60ba0f5911
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-16 22:42:57 -04:00
mazmazz
4b55415add
New colormap netsync fixes
2018-09-16 22:42:36 -04:00
mazmazz
0a998fec02
New colormap netsync fixes
2018-09-16 22:41:08 -04:00
mazmazz
d4a18fd456
455: Fade colormap netsync use new colormap saving
2018-09-16 20:27:24 -04:00
mazmazz
545602d94d
Merge branch 'colormap-overhaul' into colormap-overhaul-fade
2018-09-16 20:25:59 -04:00
mazmazz
4cdbc7249f
Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector
2018-09-16 20:25:46 -04:00
mazmazz
e9b3cba300
Improve MIDI console parameters
...
* Allow multiple SF2 for midisoundfont
* Correctly branch when toggling midiplayer or midisoundfont
2018-09-16 16:02:26 -04:00
Monster Iestyn
1b7b1f3f79
Fix order of operations messups by adding brackets
2018-09-16 20:25:07 +01:00
mazmazz
45a7d36524
Improve MIDI console parameters
...
* Allow multiple SF2 for midisoundfont
* Correctly branch when toggling midiplayer or midisoundfont
2018-09-16 11:51:39 -04:00
Digiku
7aedb8d035
Merge branch 'lightfade-ticbased' into 'master'
...
Linedef Exec 420: Fade Lighting add duration timing
See merge request STJr/SRB2Internal!186
2018-09-16 08:24:09 -04:00
mazmazz
7c8fa151c4
Merge branch 'lightfade-ticbased' into le-fadefof
2018-09-16 08:20:57 -04:00
mazmazz
d49f0be4ee
420: Strip test comments
2018-09-16 08:20:14 -04:00
mazmazz
1321ab9d92
453: Extra parameter for Add_ColormapFader
2018-09-15 20:40:17 -04:00
mazmazz
17e23f55eb
492: Merge speed and duration logic for fade polyobject
2018-09-15 20:00:37 -04:00
Nev3r
350cd1435b
The thinker is entirely unified now, and there is no difference in the light levels between the "old" behavior and this one now.
2018-09-15 12:21:25 +02:00
mazmazz
d939e597a5
420: Unncessary include
2018-09-15 20:03:43 -04:00
mazmazz
ab4a825385
420: Combine speed and duration logic for fade lighting
2018-09-15 19:01:21 -04:00
mazmazz
809646e7fe
453: Try ResetFakeFloorFader if condition again
2018-09-15 02:24:44 -04:00
mazmazz
a85953a903
453: P_ResetFakeFloorFader stray & address if condition
2018-09-15 02:16:54 -04:00
mazmazz
efe0af960d
Colormap overhaul: Wrap R_CheckNumForNameList under ifdef EXTRACOLORMAPLUMPS
2018-09-15 02:10:55 -04:00
mazmazz
efacf356b0
Merge remote-tracking branch 'origin/master' into music-cleanup
2018-09-15 01:52:48 -04:00
mazmazz
79484de4ea
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-15 01:51:06 -04:00
mazmazz
5e55f6f311
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-15 01:50:53 -04:00
mazmazz
6844ed37c5
Colormap overhaul: %d format size_t -> UINT32 fix
2018-09-15 01:50:33 -04:00
mazmazz
001dbcceea
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-09-15 01:17:33 -04:00
mazmazz
45dbadbbc2
Mixer: Add missing tag declarations in I_LoadSong
2018-09-15 01:14:24 -04:00
mazmazz
5585edf459
453: Mixed D+C fixes; unused param cast in P_FadeFakeFloor
2018-09-15 01:05:21 -04:00
mazmazz
ca4a94eca5
492: Mixed D+C fix
2018-09-15 00:56:46 -04:00
mazmazz
1db8aee539
455: Mixed D+C fix
2018-09-15 00:53:21 -04:00
mazmazz
be6acdb019
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-15 00:52:45 -04:00
mazmazz
57959522e2
Colormap overhaul r_data: Mixed D+C fix
2018-09-15 00:49:03 -04:00
mazmazz
9eb39fb025
Merge branch 'music-cleanup' into musicplus-core
2018-09-15 00:46:02 -04:00
mazmazz
e695cf91fe
Merge branch 'music-cleanup' into music-sdlmixerx
2018-09-15 00:36:16 -04:00
mazmazz
40a8c9c1ee
Mixer: HAVE_LIBGME ifdef in I_LoadSong
2018-09-15 00:35:24 -04:00
mazmazz
30b8408c10
Mixer: HAVE_LIBGME ifdef in I_LoadSong
2018-09-15 00:34:55 -04:00
mazmazz
3c755a85df
Merge branch 'music-cleanup' into music-sdlmixerx
2018-09-15 00:28:38 -04:00
mazmazz
2e2acdd16a
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-14 22:36:09 -04:00
mazmazz
5f2df0f453
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-14 22:35:51 -04:00
mazmazz
2f995f4cbe
Remove possibly wrong comment about extracolormap_t->fog
2018-09-14 22:35:30 -04:00
mazmazz
f85d1da54f
Lua support for floorrover/ceilingrover
2018-09-14 21:43:43 -04:00
mazmazz
20bde0d21c
Fix Windows buildbot for MP3_MAD/MODPLUG define (the header we use is 2.0.2)
...
(cherry picked from commit 9a5eb02459
2018-09-14 17:48:12 -04:00
mazmazz
9a5eb02459
Fix Windows buildbot for MP3_MAD/MODPLUG define (the header we use is 2.0.2)
2018-09-14 17:47:04 -04:00
mazmazz
17ec5d8022
Mixer: Better MODPLUG/MP3_MAD defines
...
(cherry picked from commit 5b724e18b5
2018-09-14 17:27:31 -04:00
mazmazz
5b724e18b5
Mixer: Better MODPLUG/MP3_MAD defines
2018-09-14 17:27:00 -04:00
mazmazz
0563d77812
Fix compile errors on buildbots
...
* Check SDL Mixer 2.0.3 for MUS_MODPLUG_UNUSED, MUS_MP3_MAD_UNUSED
* Mixed D+C in I_LoadSong
(cherry picked from commit fdbe3e80f6
2018-09-14 17:09:21 -04:00
mazmazz
fdbe3e80f6
Fix compile errors on buildbots
...
* Check SDL Mixer 2.0.3 for MUS_MODPLUG_UNUSED, MUS_MP3_MAD_UNUSED
* Mixed D+C in I_LoadSong
2018-09-14 17:07:13 -04:00
mazmazz
3a343cf8f1
Don't call I_StartupSound in SFX toggle
...
* Mixer: make I_StartupSound return early if already set up
* Restartaudio: Add StopSFX call
(cherry picked from commit b330dc2394
2018-09-14 16:43:48 -04:00
mazmazz
b330dc2394
Don't call I_StartupSound in SFX toggle
...
* Mixer: make I_StartupSound return early if already set up
* Restartaudio: Add StopSFX call
2018-09-14 16:39:10 -04:00
Monster Iestyn
546fa383c1
Make sure that T_MarioBlockChecker is synced in netgames, so that the textures of Mario Blocks can change when there are no more items
2018-09-14 21:01:07 +01:00
mazmazz
4a5bcf43a2
Rip out SDL Mixer code from sdl_sound.c because superfluous
...
* Mixer code has been in mixer_sound.c; this file is not invoked unless compiling with NOMIXER=1
* Remove everything under #ifdef HAVE_MIXER because this is never triggered
* Comment out #ifdef HAVE_LIBGME because we don't support playing music anyway (but theoretically, it could have worked separately from Mixer)
* Stub new music calls
(cherry picked from commit 76be77b93a
2018-09-14 14:53:56 -04:00
mazmazz
76be77b93a
Rip out SDL Mixer code from sdl_sound.c because superfluous
...
* Mixer code has been in mixer_sound.c; this file is not invoked unless compiling with NOMIXER=1
* Remove everything under #ifdef HAVE_MIXER because this is never triggered
* Comment out #ifdef HAVE_LIBGME because we don't support playing music anyway (but theoretically, it could have worked separately from Mixer)
* Stub new music calls
2018-09-14 14:52:24 -04:00
Monster Iestyn
b82ddd4f08
Merge branch 'public_next'
2018-09-14 19:51:20 +01:00
mazmazz
517756606c
I_InitMusic SDL2: Don't unload GME indiscriminately
...
(cherry picked from commit cb4e075137
2018-09-14 13:57:24 -04:00
mazmazz
297653fa34
srb2dd music cleanup fixes
...
(cherry picked from commit 0999b0f8a8
2018-09-14 13:57:22 -04:00
mazmazz
a5948c3629
Separate StopMusic and UnloadMusic
...
(cherry picked from commit e72610a3dc
2018-09-14 13:57:20 -04:00
mazmazz
7f884591a7
Bring back music_data handle, for srb2dd
...
(cherry picked from commit 8e05de17f0
2018-09-14 13:56:14 -04:00
mazmazz
09df2c387a
newmusic -> mmusic typo, S_ChangeMusic
2018-09-14 13:55:07 -04:00
mazmazz
5c20aa79dd
More unnecessary if conditions, toggle SFX menu
2018-09-14 13:54:41 -04:00
mazmazz
cb4e075137
I_InitMusic SDL2: Don't unload GME indiscriminately
2018-09-14 13:36:01 -04:00
mazmazz
0999b0f8a8
srb2dd music cleanup fixes
2018-09-14 13:24:15 -04:00
mazmazz
e72610a3dc
Separate StopMusic and UnloadMusic
2018-09-14 12:47:33 -04:00
mazmazz
8e05de17f0
Bring back music_data handle, for srb2dd
2018-09-14 12:29:58 -04:00
mazmazz
aa1ec4d996
Sound menu toggle fix: unnecessary if condition
2018-09-14 11:25:25 -04:00
mazmazz
691de18fbb
Menu sound toggle fixes (and add starpost sfx to menu)
2018-09-14 11:24:28 -04:00
mazmazz
4b1bc53db1
Compile fixes
2018-09-14 10:58:41 -04:00
mazmazz
fac7d19637
Case-insensitive music_name comparison
...
(cherry picked from commit a7ae059949
2018-09-14 10:49:44 -04:00
mazmazz
8541963c61
I_SongPlaying detect GME properly
...
(cherry picked from commit e88d147761
2018-09-14 10:49:44 -04:00
mazmazz
d94f7e3cb0
Stub I_UnloadSong because we already unload in I_StopMusic
...
* Stop-gap for now. Ideally the logic would be in the respective places.
# Conflicts:
# src/sdl/mixer_sound.c
(cherry picked from commit eae5d3333f
2018-09-14 10:49:44 -04:00
mazmazz
5f22b7d973
Volume fixes
...
# Conflicts:
# src/sdl/mixer_sound.c
(cherry picked from commit d39b7011c5
2018-09-14 10:49:44 -04:00
mazmazz
2fbe206ecb
A word
...
(cherry picked from commit fb6f8c8a07
2018-09-14 10:49:44 -04:00
mazmazz
b0c47e2fb1
GME fix: play song in I_PlaySong, not I_LoadSong
...
(cherry picked from commit 5f21bf230d
2018-09-14 10:45:39 -04:00
mazmazz
4d61f00b86
Refactor I_MusicType MusicPlaying and MusicPaused other targets
...
(cherry picked from commit 9e6eebeb8d
2018-09-14 10:45:39 -04:00
mazmazz
eacf0ba00b
Refactor I_MusicType MusicPlaying and MusicPaused -> I_SongType ...
...
(cherry picked from commit 4b82de9e54
2018-09-14 10:45:38 -04:00
mazmazz
d535c14fc6
Refactoring and reordering other targets
...
(cherry picked from commit cf065e106f
2018-09-14 10:43:46 -04:00
mazmazz
5bac836d4c
Minor refactoring and reordering
...
* I_GetMusicType() -> I_MusicType()
* Wrap MIDI volume hack in #ifdef _WIN32
(cherry picked from commit a7d51bf810
2018-09-14 10:42:27 -04:00
mazmazz
8c78d86c36
Play the opposite type music (Digital/MIDI) when toggling between them in menu
...
* S_MusicInfo method to retrieve name, flags, and looping
(cherry picked from commit f6ec93198f
2018-09-14 10:38:32 -04:00
mazmazz
7e7899ae83
Toggle Digi/MIDI music in menu accurately; add S_MusicType
...
(cherry picked from commit 4aa100aa57
2018-09-14 10:37:08 -04:00
mazmazz
17cf310b84
nodigimusic nomusic nosound refactor other targets
...
(cherry picked from commit 86f151db65
2018-09-14 10:35:56 -04:00
mazmazz
a414ccf24a
nodigimusic nomusic nosound -> digital_disabled midi_disabled sound_disabled
...
(cherry picked from commit 07738fb0bc
2018-09-14 10:35:51 -04:00
mazmazz
44557d9c9d
I_MusicPlaying, I_MusicPaused other targets
...
(cherry picked from commit d5ec388159
2018-09-14 10:28:35 -04:00
mazmazz
011a043dba
Refactoring, music statues
...
* S_Init -> S_InitSfxChannels because it did mostly SFX anyway
* S_MusicPlaying, S_MusicPaused, S_MusicName, S_MusicExists new status methods
* I_MusicPlaying, I_MusicPaused
(cherry picked from commit f5f0b5e76c
2018-09-14 10:28:29 -04:00
mazmazz
e58a8f4fe1
Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume other targets
...
(cherry picked from commit 9fb9386f84
2018-09-14 10:23:47 -04:00
mazmazz
a7ed7b2c90
Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume into one method
...
* In s_sound, they are merged to one method as well, but there are still two separate digvolume and seqvolume variables
* Simplified Dig/MidiMusicDisabled in s_sound
* Method reordering
(cherry picked from commit 701cc5a7dd
2018-09-14 10:23:37 -04:00
mazmazz
46b53e8bae
Added I_GetMusicType and removed midimode variable: other targets
...
(cherry picked from commit 14b393ab16
2018-09-14 09:55:45 -04:00
mazmazz
06b7367941
Added I_GetMusicType and removed midimode variable
...
* Revised S_PlayMusic arguments
* Now music plays again!
(cherry picked from commit 55f3803e4b
2018-09-14 09:42:29 -04:00
mazmazz
b59aa27104
Loose ends other targets
...
(cherry picked from commit 9a5fc5f66a
2018-09-14 09:41:08 -04:00
mazmazz
25361713dc
NiGHTS drone loop: Change flyangle comparison to fix detection from vertical angles
...
Use > 90 && < 270 instead of >= 90 && <= 270. Fixes a bug where if you fly directly up (flyangle 90) or directly down (flyangle 270), that registers as a backwards direction, so you trigger the loop detection by flying BACKWARDS, not FORWARDS. This edge case (only possible via JUMPTOAXIS) should default to FORWARDS looping.
(cherry picked from commit ce215195f8
2018-09-14 08:58:19 -04:00
mazmazz
ba7d97733d
Fix NiGHTS drone loop detection by using pl->flyangle
...
(cherry picked from commit 67e4381284
2018-09-14 08:57:37 -04:00
mazmazz
3359b221d6
Merge remote-tracking branch 'public-gitlab/master' into public-op-nightsbumper-fix
2018-09-14 08:55:30 -04:00
mazmazz
b666fa3131
P_SpawnMapThing: Ignore MTF_ flags if MT_NIGHTSBUMPER
...
(cherry picked from commit d85f108997
2018-09-14 08:52:10 -04:00
mazmazz
f8834b0201
MT_NIGHTSBUMPER Spawn: Don't reset mthing->options
...
(cherry picked from commit dc9fd6f02e
2018-09-14 08:52:10 -04:00
mazmazz
e8a5735f75
Merge branch 'lightfade-ticbased' into le-fadefof
2018-09-14 08:42:02 -04:00
mazmazz
714464993e
420: Removed unnecessary include (gametic no longer needed)
2018-09-14 08:26:52 -04:00
Monster Iestyn
6fbc014ea3
Merge branch 'thwomp-fixes' into 'next'
...
Thwomp fixes: Don't trigger on spectator; don't trigger on ~FF_EXISTS
See merge request STJr/SRB2!277
2018-09-13 14:47:40 -04:00
mazmazz
db41034ad9
Block song position changes on GME because unstable
2018-09-13 13:27:42 -04:00
mazmazz
8e4569381f
Merge branch 'master' into musicplus-core
2018-09-13 13:24:46 -04:00
mazmazz
ca5602f13b
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-13 12:19:28 -04:00
mazmazz
adca20b07f
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-13 12:19:10 -04:00
mazmazz
07af82aa84
Missed fog boolean -> integer
2018-09-13 12:18:53 -04:00
mazmazz
761150b12d
455: Fog flag fix for fading
2018-09-13 12:18:10 -04:00
mazmazz
21506873be
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-13 12:10:14 -04:00
mazmazz
103db964fe
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-13 12:08:56 -04:00
mazmazz
6824e6a359
Make extracolormap_t->fog UINT8; it's not boolean, but categorical
2018-09-13 12:08:46 -04:00
Digiku
89a6694d67
Don't trigger thwomp on spectators
2018-09-13 11:32:40 -04:00
mazmazz
c32c72c401
Thwomp fix: Don't trigger (look for players) when ~FF_EXISTS
2018-09-13 11:32:38 -04:00
mazmazz
3fc8ed5a9f
455: Set timing by either Back Y or Front Y, but not line length
2018-09-13 10:53:03 -04:00
mazmazz
94939f6613
455: Don't override fadergba on default/no colormap init (~BOUNCY)
2018-09-13 10:43:41 -04:00
mazmazz
5aa66f8872
455: Add speed increment timing (~EFFECT4) to FadeColormap
2018-09-13 10:43:32 -04:00
mazmazz
539092bec5
491, 492: Allow BLOCKMONSTERS raw translucency value in floorheight
2018-09-13 00:26:49 -04:00
mazmazz
4ab3a986f3
492 PolyObj Fade, 491 PolyObj Translucency, 490 PolyObj changes
...
* 490: Set proper render flags according to spawnflags
* 491: Add relative calc (EFFECT3) and Front X alpha param (DONTPEGTOP)
* 492:
* Tic-based (EFFECT4) and speed timing
* Add relative calc (EFFECT3) and Front X alpha param (DONTPEGTOP)
* Set proper render flags according to spawnflags
* Fix OpenGL >= NUMTRANSMAPS render bug
2018-09-13 00:06:11 -04:00
mazmazz
0697a1b90a
PolyObjFade: Apply RENDER, SOLID, and NOSPECIALS flags according to spawnflags
2018-09-13 00:06:08 -04:00
mazmazz
2f9e014aab
490 PolyVisible: Set proper spawn render flags instead of RENDERALL
2018-09-13 00:06:06 -04:00
mazmazz
63a3125df2
420: A parenthesis
2018-09-12 21:49:03 -04:00
mazmazz
46067f0579
Merge remote-tracking branch 'origin/lightfade-ticbased' into lightfade-ticbased
2018-09-12 21:35:46 -04:00
mazmazz
41fe080a68
420: Allow Back Y Offset for timing parameter
2018-09-12 21:32:12 -04:00
mazmazz
dc72835679
Merge branch 'colormap-overhaul' into colormap-overhaul-fade
2018-09-12 21:06:27 -04:00
mazmazz
3b05f7f925
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-12 21:06:07 -04:00
mazmazz
0b2caa948f
Init side->colormap_data pointer to NULL (for paranoia)
2018-09-12 21:05:50 -04:00
mazmazz
05c91f1f81
455: Change to side->colormap_data
2018-09-12 20:52:05 -04:00
mazmazz
17a78ba674
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-12 20:47:00 -04:00
mazmazz
1fcfa7fcf1
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-12 20:46:02 -04:00
mazmazz
f7ff440250
Add colormap_data to side_t and store colormaps there on setup
2018-09-12 20:43:48 -04:00
mazmazz
fad12d6be3
Merge branch 'master' into le-fadefof
2018-09-12 18:01:42 -04:00
mazmazz
30b9ed59c0
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-12 17:40:24 -04:00
mazmazz
ad9ef5d593
Merge errors
2018-09-12 17:39:30 -04:00
mazmazz
978b9bdea2
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-12 17:30:09 -04:00
mazmazz
c58e9b0bae
Merge remote-tracking branch 'origin/master' into colormap-overhaul
2018-09-12 17:28:22 -04:00
mazmazz
9fb9b44383
Fade FOF colormap support
2018-09-12 16:59:35 -04:00
mazmazz
06fa05f6cd
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-12 16:30:10 -04:00
mazmazz
8535fb01c2
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-12 16:29:02 -04:00
mazmazz
62b6950e33
Use lightlist.extra_colormap double pointers in OpenGL
2018-09-12 16:28:55 -04:00
mazmazz
9170174768
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-12 16:07:07 -04:00
mazmazz
7d36aae7c4
Make lightlists react to control sector colormap changes (double pointer)
2018-09-12 16:06:56 -04:00
mazmazz
42f1f0acdb
P_ResetFakeFloorFader: Argument order error with dolighting
2018-09-12 12:40:56 -04:00
mazmazz
d2f636d5a2
T_FadeColormap: Fade subtraction error
2018-09-12 11:33:44 -04:00
mazmazz
51a2982226
455: TFERLINE - Set target sector's colormap first to control backsector's colormap
2018-09-12 11:21:49 -04:00
mazmazz
b120331151
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-12 11:14:52 -04:00
mazmazz
92c5cb8233
Colormap savegame failsafe - Handle NULL (default colormap)
2018-09-12 11:13:49 -04:00
mazmazz
d85019b4e4
More NULL failsafes
2018-09-12 11:11:22 -04:00
mazmazz
e95cd0f962
Colormap savegame failsafe - Handle NULL (default colormap)
2018-09-12 11:06:18 -04:00
mazmazz
8190433b71
456: Missing break
2018-09-12 09:42:51 -04:00
mazmazz
ee51f586c2
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-12 09:11:35 -04:00
mazmazz
4d9925e8cf
447: ResetColormapFader when changing colormap explicitly
2018-09-12 09:09:10 -04:00
mazmazz
c4079dfca9
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-12 09:07:55 -04:00
mazmazz
14b71bdbc5
Fade colormap special 455! And stop fade colormap 456
...
* Added T_FadeColormap thinker and netsync
* Added sector_t fadecolormapdata property
2018-09-12 09:06:38 -04:00
mazmazz
9a6a8b0b82
Outdated comment; unused var
2018-09-12 08:07:34 -04:00
mazmazz
cb2ac9b4d3
Formatting
2018-09-12 08:06:44 -04:00
mazmazz
7767adbf32
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-12 08:03:45 -04:00
mazmazz
4d26cf6330
447: Allow relative calc from backside colormap (ML_TFERLINE)
2018-09-12 07:55:47 -04:00
mazmazz
6f0b28c48f
447: Allow alternate alpha without relative calc
2018-09-12 07:38:51 -04:00
mazmazz
9a388af8ec
447: AddColormap no longer returns chained colormap, so chain it ourselves
2018-09-12 07:31:10 -04:00
mazmazz
55c43a2161
R_AddColormap will not return an existing colormap, and new colormap is not added to chain
2018-09-12 07:24:22 -04:00
mazmazz
867bde3789
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-12 07:15:26 -04:00
mazmazz
87ad2a87f7
Smarter default fadergbaA and fadeend for relative calc
2018-09-12 07:14:23 -04:00
mazmazz
133c3598a7
Add fadestart/fadeend/fog to R_AddColormaps
2018-09-12 07:07:26 -04:00
mazmazz
6059b8edc9
447: Extra params for R_AddColormaps
2018-09-12 07:06:58 -04:00
mazmazz
8754268abe
Add fadestart/fadeend/fog to R_AddColormaps
2018-09-12 07:06:45 -04:00
mazmazz
5e59b8c55a
Duplicate lines
2018-09-11 22:49:32 -04:00
mazmazz
b56ff10ce7
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-11 22:44:44 -04:00
mazmazz
92a97fb1a6
Split colormap netsync to Load/SaveExtraColormap methods
2018-09-11 22:44:31 -04:00
mazmazz
90aeac5058
Add R_CheckEqualColormaps comparison method
2018-09-11 22:43:12 -04:00
mazmazz
f0c11eb135
R_AddColormaps method
2018-09-11 21:03:55 -04:00
mazmazz
54669a6cc8
Use R_AddColormaps method in 447 relative calc
2018-09-11 21:03:13 -04:00
mazmazz
0fb594ad58
R_AddColormaps method
2018-09-11 21:02:58 -04:00
mazmazz
a1a05c9972
Add relative color change to 447
2018-09-11 19:11:50 -04:00
mazmazz
b9e4cd40ca
Use RGB/RGBA macros in 447 code
2018-09-11 17:32:43 -04:00
mazmazz
3e49cc68d2
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-11 17:31:35 -04:00
mazmazz
548f02eea1
Extra macros R_GetRgbaRGB; R_PutRgbaR/G/B/A/RGB/RGBA
2018-09-11 17:30:43 -04:00
mazmazz
5975f26177
Don't set sector's extra_colormap if we just made a default clone
...
* Allow colormap parsing to proceed in p_setup always
* Add R_CheckDefaultColormap
* Add R_GetRgbaR/G/B/A macros
2018-09-11 17:08:57 -04:00
mazmazz
5523fc3a8d
Account for NULL colormaps in alpha-only code 447
2018-09-11 17:07:50 -04:00
mazmazz
f703c19502
Don't set sector's extra_colormap if we just made a default clone
...
* Allow colormap parsing to proceed in p_setup always
* Add R_CheckDefaultColormap
* Add R_GetRgbaR/G/B/A macros
2018-09-11 17:06:44 -04:00
mazmazz
bb6cf6a807
Added alpha-only, relative calc, and offset params to 447 Change Colormap
2018-09-11 16:50:35 -04:00
mazmazz
71ade23739
Ifdef typo
2018-09-11 15:59:56 -04:00
mazmazz
fb7ac4ccae
Ifdef typo
2018-09-11 15:59:13 -04:00
mazmazz
c6dbf2e560
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-11 15:57:58 -04:00
mazmazz
c920827032
Consolidate colormap matching into R_GetColormapFromList
2018-09-11 15:56:21 -04:00
mazmazz
3290104922
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-11 15:50:21 -04:00
mazmazz
78aefc05cf
Consolidate colormap matching into R_GetExistingColormap
2018-09-11 15:50:12 -04:00
mazmazz
87cf18b60b
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-11 15:20:58 -04:00
mazmazz
85d89287de
Add R_CopyColormap
2018-09-11 15:20:30 -04:00
mazmazz
5dad8d15b0
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-11 15:03:04 -04:00
mazmazz
3da58f436c
Merge branch 'master' into colormap-overhaul
2018-09-11 15:02:35 -04:00
mazmazz
ba88f8ebb6
Smarter string digit parsing; allow alpha-only values
...
* GetDefaultColormap and CheckDefaultColormapValues methods
2018-09-11 15:01:05 -04:00
mazmazz
8695a5f5df
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-11 13:46:47 -04:00
mazmazz
4ef016e40f
Clear colormaps properly (resolve sigsegv crash)
2018-09-11 13:46:34 -04:00
mazmazz
19fbb177ec
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-11 13:33:31 -04:00
mazmazz
506ce43627
Initialize extra_colormaps to NULL on program start
2018-09-11 13:31:09 -04:00
mazmazz
a818b9a1dc
Remove cr/cg/cb/ca in favor of rgba * Change default colormap values to be in sync with rgba/fadergba
2018-09-11 13:27:04 -04:00
Monster Iestyn
82a26580de
Merge branch 'master' into change-colormap-ldef
2018-09-11 16:43:01 +01:00
Monster Iestyn
fd783f09ea
Merge branch 'public_next'
...
# Conflicts:
# src/p_setup.c
# src/r_data.c
2018-09-11 16:41:27 +01:00
Monster Iestyn
3218ab17e0
Merge branch 'master' into next
2018-09-11 16:34:16 +01:00
mazmazz
4494630cdd
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-09-11 11:26:12 -04:00
mazmazz
63699c6e14
Merge branch 'musicplus-core' into musicplus-feature-postboss
2018-09-11 11:25:21 -04:00
mazmazz
5f87f4a47a
Don't decrement fade timer if song is paused
2018-09-11 11:20:46 -04:00
mazmazz
5ea8dc3dfa
Change to percentage calc from interval decrement for volume fade
2018-09-11 11:17:30 -04:00
mazmazz
9a52816cb4
Use percentage calc instead of interval decrement for tic-based fading
2018-09-11 10:28:24 -04:00
mazmazz
c468451a63
Merge branch 'lightfade-ticbased' into le-fadefof
2018-09-11 10:08:13 -04:00
mazmazz
36923ae7b0
Use percentage calc instead of interval decrement for tic-based timing
2018-09-11 10:05:25 -04:00
mazmazz
df4ea79ab7
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-10 22:37:34 -04:00
mazmazz
b7a216c78b
Add COLORMAPREVERSELIST ifdef to toggle Newest -> Oldest extra_colormaps order
2018-09-10 22:37:27 -04:00
mazmazz
36522665c3
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-10 22:35:45 -04:00
mazmazz
17e101a24b
Add COLORMAPREVERSELIST ifdef to toggle Newest -> Oldest extra_colormaps order
2018-09-10 22:35:26 -04:00
mazmazz
f29acffb19
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-10 21:57:09 -04:00
mazmazz
43ae25c4fd
Make default extracolormap on init
...
* Calc fadedist in R_CreateLightTable
2018-09-10 21:56:57 -04:00
mazmazz
0c4f3cbeca
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
2018-09-10 21:15:44 -04:00
mazmazz
22746c1d91
Savegame fixes
2018-09-10 21:15:34 -04:00
mazmazz
c007dfacec
Savegame fixes
2018-09-10 21:12:56 -04:00
mazmazz
75267dfa2c
Merge remote-tracking branch 'origin/change-colormap-ldef' into colormap-overhaul-change-ldef
2018-09-10 21:06:28 -04:00
mazmazz
3da38f2a9b
Fixed colormap matching code again * Added debug messages for matching code
2018-09-10 20:56:59 -04:00
mazmazz
1e4f5e8d45
Remove MAXCOLORMAPS
2018-09-10 20:41:12 -04:00
mazmazz
8d78c22194
extracolormap_t refinement and netsyncing
...
* Store raw values per rgba in extracolormap_t (no maskcolor or fadecolor)
* Crunched some UINT16/32 into UINT8
* Calculate mask values in R_CreateLightTable
* ifdef out EXTRACOLORMAPLUMPS
2018-09-10 20:36:34 -04:00
mazmazz
c92226890e
Remove bottommap and topmap from savegame because unused
2018-09-10 16:50:35 -04:00
mazmazz
7e9297d06e
Savegame netsync for sector colormaps; add spawn_midmap and co for comparison
2018-09-10 16:50:27 -04:00
mazmazz
7608583c6f
Fix shared colormap matching
2018-09-10 16:42:07 -04:00
mazmazz
53733ddf76
Type 606 renderer check allow OGL again
2018-09-10 16:32:54 -04:00
mazmazz
2701976ba3
Compiler fixes
2018-09-10 16:28:39 -04:00
mazmazz
e0d8a6eec0
Get rid of bottommap, midmap, topmap
2018-09-10 16:16:04 -04:00
mazmazz
574a591d43
P_LoadRawSideDefs2 colormap cleanup (merge ogl and software to one block)
2018-09-10 16:08:43 -04:00
mazmazz
e33ed45b7b
Colormap overhaul in r_data.c
...
* Split R_CreateColormap to R_CreateLightTable
* Replace extra_colormaps array with next/prev pointer chain
* Remove foundcolormaps; instead store lumpnum in extracolormap_t
* Add properties to extracolormap_t for portability
2018-09-10 15:59:31 -04:00
mazmazz
fef38acc59
Merge remote-tracking branch 'public-gitlab/colormap-code-cleanup' into colormap-cleanup
2018-09-10 13:24:57 -04:00
PrisimaTheFox
4ada0b0a9e
Update m_anigif.c
...
Remember gif_frames starts at 0
2018-09-10 17:12:10 +01:00
PrisimaTheFox
d26ba2ee54
Update m_anigif.c
...
More accurate GIF delay.
2018-09-10 17:12:04 +01:00
mazmazz
88d9da79e6
Move tic-based to EFFECT4
2018-09-10 12:00:44 -04:00
mazmazz
acea0bfd68
Move tic-based to EFFECT4, relative calc to EFFECT3
2018-09-10 12:00:15 -04:00
Monster Iestyn
40ff436829
Remove commented out stuff, now I've confirmed everything works fine without them
2018-09-10 15:49:21 +01:00
mazmazz
148e3ff538
Use ML_NOCLIMB for FF_TRANSLUCENT handling in type 452
2018-09-10 10:17:39 -04:00
mazmazz
8e75fe50db
Default to using back offset params if back linedef exists; else fallback to distance-based params
2018-09-10 10:11:27 -04:00
mazmazz
da5a7a013d
Add type 452 Set FOF Alpha
...
* Fade FOF moved to type 453
* Stop Fade FOF moved to type 454
2018-09-10 10:09:02 -04:00
mazmazz
02a94dc941
Add distance-based params and make default (ML_DONTPEGBOTTOM to use back offsets)
2018-09-10 09:49:52 -04:00
mazmazz
b8da218b61
Add relative destvalue calc (ML_EFFECT4)
...
* rover->alpha init fixes with invisible FOFs
2018-09-10 09:49:00 -04:00
mazmazz
e171e565ce
Remove bottommap and topmap from savegame because unused
2018-09-10 09:03:58 -04:00
mazmazz
002f1bad8f
Savegame netsync for sector colormaps; add spawn_midmap and co for comparison
2018-09-10 09:01:09 -04:00
mazmazz
a6f959ba21
Set mobj->floorrover and ceilingrover in appropriate places
2018-09-10 00:38:07 -04:00
mazmazz
0d88f31bbd
Add floorrover and ceilingrover to precipmobj_t
2018-09-10 00:23:23 -04:00
mazmazz
943dc9412d
Initialize floorrover and ceilingrover on SpawnMobj
2018-09-10 00:20:51 -04:00
mazmazz
832f891cbb
Remove rovernum increment from P_CheckPosition because unused
2018-09-10 00:13:32 -04:00
mazmazz
03d1baf422
Savegame floorrover fixes
2018-09-10 00:07:22 -04:00
mazmazz
5136293f62
Store sectornum/ffloornum as UINT32, not INT32
2018-09-09 23:52:36 -04:00
mazmazz
dd35871699
Savegame netsync for mobj->floorrover and ceilingrrover
2018-09-09 23:48:42 -04:00
mazmazz
f33f9dd284
Replace sectornum/rovernum index vars with ffloor pointers
2018-09-09 23:12:37 -04:00
mazmazz
9cc186441b
Fix fog visual glitch with fading
2018-09-09 22:14:24 -04:00
mazmazz
d01193df80
Apply ~FF_EXISTS moving plat fix for VERTICALFLIP
2018-09-09 21:59:41 -04:00
mazmazz
231f19aaab
Revert "Merge branch 'random-fof-fixes' into fof-fixes-movingplatexists"
...
This reverts commit cc114590547e3d5cd373
2018-09-09 21:02:43 -04:00
mazmazz
573e1d0017
Replace firsttic with timer increment
2018-09-09 21:01:00 -04:00
mazmazz
7a3eb31b57
A number
2018-09-09 20:51:08 -04:00
mazmazz
0202bbcfd3
Replace firsttic with timer increment
2018-09-09 20:45:12 -04:00
mazmazz
703764d769
Merge branch 'lightfade-ticbased' into le-fadefof
2018-09-09 20:18:57 -04:00
mazmazz
3d5f225702
Replace firsttic with decrement timer
2018-09-09 20:18:43 -04:00
mazmazz
ea2276eb07
Fix tic-based bug returning early
2018-09-09 19:57:41 -04:00
mazmazz
43ae628adc
Cap lightlevel fading at spawn_lightlevel (don't make darker)
2018-09-09 19:44:35 -04:00
mazmazz
c3c4a251f1
Added tic-based logic to FOF fade (ML_EFFECT5)
2018-09-09 19:31:32 -04:00
Monster Iestyn
c0bf79ad8e
R_CreateColormap2 and R_MakeColormaps have been made obsolete, it's just R_CreateColormap now, like it used to be!
...
With that, I moved R_CreateColormap2's exclusive software colormap malloc code to R_CreateColormap, and merged the two software-only blocks of code into one. I also disabled any unneeded variables and fixed a preprocessor-related goofup
2018-09-09 22:48:09 +01:00
mazmazz
80a4a03f8e
Finalize light level on fade finish (not forced stop)
...
* Added destlightlevel property to fade_t
* Fixed dotranslucent, dolighting, docollision order weirdness in function calls
2018-09-09 17:20:35 -04:00
