Monster Iestyn
41b4ffd458
Merge branch 'extend-png-metadata' into 'master'
...
Save the current renderer to screenshots.
See merge request STJr/SRB2!324
2018-11-13 17:28:29 -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
2e39e5ffdd
Update SDL Mixer to 2.0.4; remove unnecessary extra lib and include folders
2018-11-13 16:43:16 -05:00
mazmazz
ba821056ce
Update SDL2 to 2.0.9; remove unnecessary extra lib and include folders
2018-11-13 16:40:43 -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
Monster Iestyn
395a67196e
Merge branch 'monitors-floatbob-fix' into 'next'
...
Fix for object z positions on floating, bobbing FOFs
See merge request STJr/SRB2!316
2018-11-13 08:58:08 -05:00
TehRealSalt
d09fd4b861
Carry over old explosion sfx flags
2018-11-13 01:09:36 -05:00
TehRealSalt
29c9448148
Fix clash sound flags not being carried over
2018-11-13 01:06:13 -05:00
TehRealSalt
b009bddd3b
Lowered volume of drift sparks, made local
2018-11-12 17:18:39 -05:00
TehRealSalt
13b51823ba
Some tweaking
...
- Swap order of Silver & Gold, for menu appearances & bug fixing
- Ensure that totalplaytime and matchesplayed aren't kept when M_ClearSecrets getss called in M_EraseDataResponse
- Set sensible defaults for emblem sprite/color
2018-11-12 17:09:37 -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
TehRealSalt
faaea8abe3
Final emblem setup
...
- Added silver time medals for the new maps
- Added gold dev time medals for all maps
- Added 4 more matches played milestone medals
- Changed requirements for most silver time medals to be easier, especially in the early game
- Made all unlockable requirements higher, in both medals & matches, to balance out with the additional medals and make sure stuff is unlocked further into the first release week
2018-11-12 14:42:52 -05: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
TehRealSalt
d0f21ca415
Merge branch 'sfx-clean'
2018-11-12 04:26:02 -05:00
TehRealSalt
91ae26e213
Use S2 rips on the title screen
2018-11-11 19:22:15 -05:00
TehRealSalt
93ab9850a3
Clean-up of unused/removed sfx, replacement of the last remaining Mario sfx, and new sfx in some spots
...
- Replaced eggitem landing sfx
- Replaced banana landing sfx
- Replaced item tossing sfx
- Replaced item clashing sfx
- Added sfx for drift spark tier changing
- Added sfx for brake drifting
- Reverted Mario Mode sound replacement back to vanilla
2018-11-11 17:30:30 -05:00
toaster
71c72bf0c5
Realign YOU ARE THIS PLAYER highlight on non-green-res voting
2018-11-11 14:36:24 +00:00
Sryder
b3f24ecb3e
Merge branch 'nextmerge' into 'master'
...
Merge In Vanilla Next
See merge request KartKrew/Kart!87
2018-11-11 09:22:05 -05:00
Sryder
799efd5b31
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into nextmerge
2018-11-10 22:29:37 +00:00
toaster
aece934083
Fix not found 40833
2018-11-10 22:27:04 +00:00
Sryder
6af56273bf
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
...
# Conflicts:
# src/d_main.c
# src/d_main.h
# src/d_netcmd.c
# src/doomtype.h
# src/hardware/hw_md2.h
# src/p_user.c
# src/r_splats.h
# src/s_sound.c
# src/s_sound.h
# src/screen.c
# src/sdl/i_system.c
2018-11-10 21:14:53 +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
toaster
e1a28bbe1c
Three more CV_NOSHOWHELP's I missed the first time around. (Not making another exe for this, it'll show up the next time one is made... not that important.)
2018-11-10 18:50:19 +00:00
toaster
45fc2c46e9
Merge branch 'fof-slope-skew-backport' of https://git.magicalgirl.moe/STJr/SRB2.git
2018-11-10 18:27:13 +00:00
Sryder
a0165f1ac1
Merge branch 'com_cleanup_redo' into 'master'
...
Improved "HELP" command
See merge request KartKrew/Kart!82
2018-11-10 12:51:51 -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
3608f73d39
Updated SRB2.cbp for hw_clip.c/h
2018-11-10 16:10:08 +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
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
de6cb124cb
Merge branch 'readme-update' into 'master'
...
Update readme
See merge request STJr/SRB2!313
2018-11-10 08:39:02 -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
toaster
5b286d89a8
Hide the numlaps change message in record attack. (It plays every time you load a demo of a map with a differing quantity of laps to the default value...)
2018-11-10 12:34:04 +00:00
toaster
a0badacd22
* Fix spectators having the "YOU ARE THIS PERSON" highlight on the minirankings be done on the person in first.
...
* Apply the "YOU ARE THIS PERSON" highlight to all non-splitscreen circumstances that use the tiny player icons. (New locations: Tab rankings, intermission, completed votes.)
2018-11-10 12:31:41 +00:00
TehRealSalt
fa989f2f7f
Shorter Karma sticker
2018-11-10 01:03:34 -05:00
TehRealSalt
0f01e9513a
Use Silver for brake drift effect
2018-11-10 00:02:21 -05:00
TehRealSalt
571ef7173e
Ranking face highlights
2018-11-10 00:01:44 -05:00
TehRealSalt
60dcd3470b
Separate grow & invincibility alarms, donated by VAda
2018-11-09 21:47:36 -05:00
Steel Titanium
038dfb4aff
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into readme-update
2018-11-09 18:24:42 -05:00
