Commit Graph

513 Commits

Author SHA1 Message Date
fgsfds 57c203465b
Merge pull request #438 from s4Ys369/revert-434-patch-1
Revert "Bugfix: Discord Integration crashes"
2020-10-09 19:27:21 +03:00
s4Ys369 e6d2e7afea
Revert "Bugfix: Discord Integration crashes" 2020-10-09 11:40:45 -04:00
fgsfds 9d0c4dd94a
Merge pull request #434 from s4Ys369/patch-1
Bugfix: Discord Integration crashes
2020-10-04 02:20:20 +03:00
s4Ys369 9ee16a3ef6
Bugfix: Discord Integration crashes
Fix by PeachyPeach to stop crashes with Discord Integration when enter later Bowser courses and fights early
2020-10-03 19:10:55 -04:00
fgsfds a7ea882d4a
Merge pull request #420 from sodomon2/master
Update README_es_ES.md
2020-09-09 18:42:58 +03:00
Victor Diego Alejandro Diaz Urbaneja d88bd76041
Update README_es_ES.md 2020-09-09 01:25:51 -04:00
fgsfds 420d82ce8c fix spaces 2020-08-30 15:39:41 +03:00
fgsfds b897f30c2f
Merge pull request #411 from theofficialgman/master
Check for zero rumble setting before allowing rumble
2020-08-30 15:35:03 +03:00
Garrett 468887a6f9 Check for zero rumble setting before allowing rumble
Fixes controllers which don't check for rumble_strength and have constant rumble from rumbling even when set to 0 in the config.
2020-08-29 17:08:17 -04:00
fgsfds f500541834
Merge pull request #351 from sm64pc/nightly
Merge nightly into master
2020-06-19 23:48:05 +03:00
fgsfds af8c4fc4fa
Update README.md 2020-06-19 23:43:40 +03:00
fgsfds 4bdc3ecfa8
Update README.md 2020-06-19 23:42:57 +03:00
fgsfds 34af21bad4 premultiply volume scales by master volume
instead of scaling the output
2020-06-18 02:20:32 +03:00
fgsfds 94db04aaf0 fix segfaults in libaudiofile.cpp
casted the wrong thing?
2020-06-18 01:33:45 +03:00
fgsfds 29e915e4df fix JP build 2020-06-17 05:18:05 +03:00
fgsfds 7526a998cb 'filter' is a reserved keyword in GLSL
but only Intel drivers get pissed at this
2020-06-17 04:40:14 +03:00
fgsfds 5abf1baf6a controller_sdl: init haptics separately in case it's not available 2020-06-17 03:11:50 +03:00
fgsfds 6686a2d7d9 use GLES shaders in web build 2020-06-17 00:15:27 +03:00
fgsfds 1d6469d2cf fix web build 2020-06-16 22:24:54 +03:00
fgsfds 2e989e4831 properly scale sound volumes instead of abusing fadeVolume 2020-06-15 00:20:23 +03:00
fgsfds 91f50a4089 remove stray spaces 2020-06-14 23:29:34 +03:00
fgsfds b1b3fef112
Merge pull request #329 from KiritoDv/nightly
Music Volume Config
2020-06-14 23:27:06 +03:00
fgsfds 69513ef0bc update the exclamation box texture names in crcmaps 2020-06-14 13:40:53 +03:00
fgsfds 8749ebda17 give the correct textures a different name instead 2020-06-14 13:37:57 +03:00
fgsfds ee789bd18d revert asset version increase 2020-06-14 13:30:39 +03:00
fgsfds a558942beb increment asset file version 2020-06-14 02:40:04 +03:00
fgsfds f02c1cab49 tools: make some stuff endianness-aware 2020-06-14 02:28:59 +03:00
fgsfds 2e03057182 swap width and height for wing cap and vanish cap sides
this fixes the doubled up texture with EXTERNAL_DATA enabled
2020-06-14 02:28:16 +03:00
fgsfds fd05cd3adb don't use small resource alignment for large textures
thanks to Emil for this one

see https://docs.microsoft.com/en-us/windows/win32/api/d3d12/ns-d3d12-d3d12_resource_desc#alignment for an explanation
2020-06-13 22:54:33 +03:00
NoHomoBoi b15bd727c2 Added sfx and env volume settings 2020-06-13 02:16:00 -05:00
fgsfds 208bfdcbf3 move all the discordrpc stuff to pc_main.c
that means it will now work in D3D11 and D3D12

also 'normalized' the sdl2 main loop
2020-06-13 04:21:47 +03:00
fgsfds b673f38516 tabledesign should build on linux now 2020-06-13 03:27:56 +03:00
fgsfds 7fe8645fcd thank you case sensitive file systems very cool 2020-06-13 00:53:01 +03:00
fgsfds eed923e442 sdl2: fix window position saving and alt-enter 2020-06-13 00:51:37 +03:00
fgsfds 05bccd107a fix that damn ERROR() warning in tools 2020-06-13 00:21:02 +03:00
fgsfds 8c1257eca1 replace full audiofile source with a stripped down single-file version
same idea as n64decomp/sm64's armips.cpp

you can generate the file by applying tools/util/audiofile_strip.patch and running tools/util/generate_audiofile_cpp.py on a full audiofile source package
2020-06-12 23:43:45 +03:00
NoHomoBoi 7c341334f0 Code cleanup & changed max volume to 127 2020-06-12 03:22:08 -05:00
NoHomoBoi 56c6590bf3 Fixed config indentation 2020-06-12 00:56:51 -05:00
NoHomoBoi 66923e05af Changed configfile variable value
*Changed from configMasterVolume to configMusicVolume
2020-06-12 00:55:21 -05:00
NoHomoBoi a632ee21ff Changed configfile variable name
*Changed from music_enabled to music_volume
2020-06-12 00:53:40 -05:00
NoHomoBoi 2fa7e4f4ba Merge branch 'nightly' of https://github.com/KiritoDv/sm64pc into nightly 2020-06-11 22:40:55 -05:00
NoHomoBoi 49dc1e3495 Added music volume config 2020-06-11 22:39:13 -05:00
fgsfds aa5dfaa7c2 'properly' disable noise effect scaling 2020-06-12 00:23:47 +03:00
fgsfds 36bdb54d5e remove precision specifiers from the three-point shader
gives better compatibility on desktop GL

probably shouldn't be used on GLES anyway
2020-06-11 22:24:46 +03:00
fgsfds 8788cfa3ad d3d11 renderer now uses the configWindow values
d3d12 renderer still doesn't because I can't test it
2020-06-11 22:24:46 +03:00
fgsfds 3557e895fe add apply button to display settings 2020-06-11 22:24:46 +03:00
fgsfds 3dff608c7b add D3D12 headers because they're missing in mingw 2020-06-11 22:24:46 +03:00
fgsfds 383983ef9d form window title in pc_main; show correct RAPI in it 2020-06-11 22:24:46 +03:00
fgsfds a81a8e6ef1 added D3D11 and D3D12 renderers from Emil/n64-fast3d-engine
along with options to select backends for windowing, rendering, audio and controls in the Makefile

use RENDER_API=D3D11 or D3D12 for the D3D renderers, that will also automatically enable using DXGI for windowing; SDL2 will still be used for input and audio for the time being

also adds three-point filtering to the OpenGL backend and an option for it in the menu
2020-06-11 22:24:46 +03:00
V. R. Miguel fe1a8a8602
Update README.md 2020-06-10 22:41:29 -03:00