Commit Graph

504 Commits (8a13e1883b5693823dbeec51ce53698a4c4d08c0)

Author SHA1 Message Date
fgsfds 8a13e1883b Merge pull request #351 from sm64pc/nightly
Merge nightly into master
2020-06-19 23:48:05 +03:00
fgsfds 8a85616d3f Update README.md 2020-06-19 23:43:40 +03:00
fgsfds a9cdc45ede Update README.md 2020-06-19 23:42:57 +03:00
fgsfds e347c10b8f premultiply volume scales by master volume
instead of scaling the output
2020-06-18 02:20:32 +03:00
fgsfds 05ffc179c5 fix segfaults in libaudiofile.cpp
casted the wrong thing?
2020-06-18 01:33:45 +03:00
fgsfds e1b3ad9070 fix JP build 2020-06-17 05:18:05 +03:00
fgsfds 6b6b2e9082 'filter' is a reserved keyword in GLSL
but only Intel drivers get pissed at this
2020-06-17 04:40:14 +03:00
fgsfds a00c516f02 controller_sdl: init haptics separately in case it's not available 2020-06-17 03:11:50 +03:00
fgsfds 75d5975dd9 use GLES shaders in web build 2020-06-17 00:15:27 +03:00
fgsfds 52c149b796 fix web build 2020-06-16 22:24:54 +03:00
fgsfds fb704b8bf3 properly scale sound volumes instead of abusing fadeVolume 2020-06-15 00:20:23 +03:00
fgsfds 9e3b6cedfe remove stray spaces 2020-06-14 23:29:34 +03:00
fgsfds e24ead4036 Merge pull request #329 from KiritoDv/nightly
Music Volume Config
2020-06-14 23:27:06 +03:00
fgsfds f352c2d8cd update the exclamation box texture names in crcmaps 2020-06-14 13:40:53 +03:00
fgsfds 1515c94ee5 give the correct textures a different name instead 2020-06-14 13:37:57 +03:00
fgsfds a03c565feb revert asset version increase 2020-06-14 13:30:39 +03:00
fgsfds 848f39ff1f increment asset file version 2020-06-14 02:40:04 +03:00
fgsfds 36e7b884d7 tools: make some stuff endianness-aware 2020-06-14 02:28:59 +03:00
fgsfds 93cac92d8b 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 83e9f92a71 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 183151618c Added sfx and env volume settings 2020-06-13 02:16:00 -05:00
fgsfds 927d770823 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 ae13e0006b tabledesign should build on linux now 2020-06-13 03:27:56 +03:00
fgsfds 2fd045651c thank you case sensitive file systems very cool 2020-06-13 00:53:01 +03:00
fgsfds 82b2b0e561 sdl2: fix window position saving and alt-enter 2020-06-13 00:51:37 +03:00
fgsfds 70b3a13aa1 fix that damn ERROR() warning in tools 2020-06-13 00:21:02 +03:00
fgsfds 26fef6e320 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 5d0760dd6e Code cleanup & changed max volume to 127 2020-06-12 03:22:08 -05:00
NoHomoBoi d51c281873 Fixed config indentation 2020-06-12 00:56:51 -05:00
NoHomoBoi 7b4560f256 Changed configfile variable value
*Changed from configMasterVolume to configMusicVolume
2020-06-12 00:55:21 -05:00
NoHomoBoi f69369df76 Changed configfile variable name
*Changed from music_enabled to music_volume
2020-06-12 00:53:40 -05:00
NoHomoBoi d59c5bc61f Merge branch 'nightly' of https://github.com/KiritoDv/sm64pc into nightly 2020-06-11 22:40:55 -05:00
NoHomoBoi e5f80a8d62 Added music volume config 2020-06-11 22:39:13 -05:00
fgsfds 9be9ab621f 'properly' disable noise effect scaling 2020-06-12 00:23:47 +03:00
fgsfds eef5f499ef 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 6bb331eee2 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 9fd2477ea0 add apply button to display settings 2020-06-11 22:24:46 +03:00
fgsfds 1559d03293 add D3D12 headers because they're missing in mingw 2020-06-11 22:24:46 +03:00
fgsfds 1cf90a7cec form window title in pc_main; show correct RAPI in it 2020-06-11 22:24:46 +03:00
fgsfds 0493d12839 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 a042b567bd Update README.md 2020-06-10 22:41:29 -03:00
V. R. Miguel 281ccb9312 oops
This reverts commit 4c022a5c9d.
2020-06-10 22:40:31 -03:00
V. R. Miguel 4c022a5c9d Mention pt-BR README 2020-06-10 22:37:48 -03:00
V. R. Miguel 4ee674c1aa Create README_pt_BR.md 2020-06-10 22:36:41 -03:00
fgsfds 46c3727423 use full texture sizes for the eyes of big bomb lad and chuckya
this fixes the incorrect rendering of their eyes when EXTERNAL_DATA is enabled
2020-06-10 19:11:09 +03:00
fgsfds 0ed809dda1 correct star texture size
should fix incorrect star envmap with EXTERNAL_DATA
2020-06-10 18:44:30 +03:00
fgsfds 549fac1415 fix GLEW include on OSX 2020-06-10 04:16:46 +03:00
fgsfds 2d9f31bfb8 use SDL_opengles2.h only when USE_GLES is defined 2020-06-10 01:01:34 +03:00
fgsfds 61709d94bd don't scale the noise to 240 height 2020-06-10 01:00:20 +03:00
fgsfds c551ba9fdd don't use the noise shader on GLES 2020-06-10 00:58:44 +03:00