Commit Graph

305 Commits (cd4705d2ae16ebafe41a6537e0f30abec7e2b941)

Author SHA1 Message Date
Vinícius R. Miguel bb41042767 Revert "Fixes billboarding-related problems"
This reverts commit 94fce064f4.
2020-05-17 03:29:19 -03:00
Vinícius R. Miguel 94fce064f4 Fixes billboarding-related problems 2020-05-17 02:15:11 -03:00
Vinícius R. Miguel 99e7299ff1 Merge pull request #139 from sm64pc/master
Add MXE/OSX stuff to nightly
2020-05-16 22:08:24 -03:00
IvanDSM 1031f9f7ea Fix --fullscreen/--windowed CLI option altering config file.
Previously, when the --fullscreen or --windowed CLI options were set, configFullscreen was overwritten.
This caused the config file to be changed according to the CLI options given when running the executable.
A helper variable that copies configFullscreen stops the game from overwritting the config file.
2020-05-16 21:53:00 -03:00
IvanDSM d936b980df Add --help and --windowed CLI options. 2020-05-16 21:39:48 -03:00
fgsfds e519d970fa Merge branch 'master' into osx_build_clean 2020-05-17 01:27:51 +03:00
Vinícius R. Miguel 63b015f737 Fixed some stuff 2020-05-16 18:14:43 -03:00
Vinícius R. Miguel ca0a8311a4 Add a `--configfile` CLI option
Usage: `--configfile yahoo.ini` will load up a file named yahoo.ini as the configuration file.
2020-05-16 18:07:14 -03:00
Vinícius R. Miguel 3007a5e2a4 Add support for saves of both endiannesses.
Porting from testing. Originally by @fgsfdsfgs.
2020-05-16 17:57:40 -03:00
fgsfds 23055c2a44 Merge branch 'master' into master 2020-05-16 22:47:39 +03:00
fgsfds ea24922e4b tabs begone 2020-05-16 22:39:37 +03:00
fgsfds e266530f6c Merge pull request #126 from HeavenVolkoff/gfx_use_second_light_color
Consider second color column of Light_t when calculating vertex colors
2020-05-16 22:38:36 +03:00
Hyenadae 227c3cdb90 OSX_BUILD cleaned commit 2020-05-16 15:30:27 -04:00
Vinícius R. Miguel c0665cf4f1 Shutdown subsystems on exit
Porting from testing, originally by @fgsfdsfgs
2020-05-16 16:23:23 -03:00
wabberz 62edfbb601 Merge pull request #123 from HeavenVolkoff/wf_no_drawing_distance
Fix Whomp, PiranhaPlant and Walking Penguin not appearing from a distance
2020-05-16 20:34:50 +02:00
wabberz ac7a4a5b96 Update whomp.inc.c 2020-05-16 20:33:41 +02:00
fgsfds 0a639cdaec bettercam: add adjustable camera deceleration 2020-05-16 20:30:06 +03:00
fgsfds dcab1c62f3 only include camera options if BETTERCAM==1 2020-05-16 20:00:51 +03:00
Colton G. Rushton 30082cfe0c Fix SL walking penguin for nodrawdistance 2020-05-16 10:23:32 -03:00
Colton G. Rushton 5f78765cf4 Remove newline in nodrawdistance define 2020-05-16 10:19:58 -03:00
fgsfds f1beb17a4a move filtering check to gfx_pc.c for those sweet realtime updates 2020-05-16 16:15:45 +03:00
fgsfds 06dc422c44 add dumb master volume control 2020-05-16 16:15:40 +03:00
fgsfds 61210ba708 simplify options menu definitions 2020-05-16 16:15:35 +03:00
fgsfds c83f44e0bb add fullscreen and filtering settings to options
filtering only applies to newly loaded textures
2020-05-16 16:15:27 +03:00
Heaven Volkoff 4b67e3d36f Consider second color column of Light_t when calculating vertex colors 2020-05-16 04:48:11 -03:00
Heaven Volkoff 4607c1f9f9 Fix Whomp and PiranhaPlant not appearing from a distance in WF 2020-05-16 03:03:54 -03:00
fgsfds b57c96209e fix build on all toolchains except mine 2020-05-16 08:11:48 +03:00
fgsfds cd9f835063 add OPT_BUTTON option type; move Exit Game button from pause to options menu 2020-05-16 08:03:50 +03:00
uncletrunks 06e39e41ff Rebind camera centering to left trigger. 2020-05-15 19:26:44 -05:00
IvanDSM 281770eb28 skip_intro now skips Lakitu and Bowser intros 2020-05-15 17:09:02 -03:00
IvanDSM c5bf367c30 Fix configfile skip_intro option 2020-05-15 16:47:04 -03:00
Vinícius R. Miguel b7c209cb84 Add in-game control binding menu
Originally on the testing branch
2020-05-15 15:38:35 -03:00
Vinícius R. Miguel 8cacc39769 Add a `--fullscreen` CLI option 2020-05-15 12:51:06 -03:00
Vinícius R. Miguel 4095ee3fb9 Merge pull request #102 from sm64pc/skipintro
Add command line parsing and --skip-intro option
2020-05-15 12:36:15 -03:00
Heaven Volkoff da4587d1a4 Fix incorrect cursor position calculation on Mario head screen (related to #28) 2020-05-15 01:09:28 -03:00
uncletrunks 7c7287b33a putting out fires 2020-05-14 21:50:10 -05:00
IvanDSM 736641dcbc Merge branch 'master' into skipintro 2020-05-14 23:05:21 -03:00
IvanDSM 94947c5b18 Add <strings.h> include
Oops!
2020-05-14 23:02:04 -03:00
uncletrunks 31d6a2a3b2 more cylindrical billboarding stuff 2020-05-14 20:47:55 -05:00
uncletrunks d0c0a31fea adds cylindrical billboarding, enables it for trees. 2020-05-14 20:31:52 -05:00
fgsfds c9cbdbe769 fix cursor on Mario head screen (fixes #28)
gDPSetScissor fix originally by Emil
2020-05-15 01:28:21 +03:00
uwabami 8866110ee5 fix Fire Spitter 2020-05-14 19:08:30 +02:00
uwabami 5072b85ed6 several fixes and improvements 2020-05-14 18:47:12 +02:00
yksoft1 0a2212978e Better way to detect mingw-w64; fix bettercamera for mingw.org; close
.assets-local.txt before deleting it.
2020-05-15 00:26:56 +08:00
yksoft1 29888bfd35 Make the code buildable on MinGW.org (not mingw-w64) and MSYS1. 2020-05-14 23:47:00 +08:00
uwabami 5492d2ee74 fix Fwoosh in Tall, Tall Mountain 2020-05-14 17:07:14 +02:00
uwabami 010ee50f10 fix Lakitu's cloud not appearing from a distance 2020-05-14 16:24:00 +02:00
uwabami bbd3cb5abe fix bugged Heave-Ho in Wet-Dry World 2020-05-14 16:11:59 +02:00
Hyenadae 352f0c8b9b Fixed more border-related code and fixes to N64 build removal 2020-05-14 05:18:12 -04:00
Vinícius R. Miguel 8c311a62f0 Fix some overflow issues
As found out by @fgsfdsfgs, increase the GFX pool size as to eliminate current overflow-related crashes.
2020-05-13 11:25:22 -03:00
Hyenadae 3c38191956 Removed majority of TARGET_N64 logic from code 2020-05-13 07:57:25 -04:00
uwabami 0209a83621 Increase GFX_POOL_SIZE to fix overflow in 32bit version - thanks fgsfds 2020-05-13 09:25:45 +02:00
uwabami 9791e95ae7 adding option to disable draw distance 2020-05-12 09:26:16 +02:00
Vinícius R. Miguel aef044e9ac Merge pull request #59 from Hyenadae/master
Add Pi Script + WIP Addition of in-game menu quit -- Good job! Superb contribution :- )
2020-05-12 01:42:15 -03:00
vanfanel cc4f619c2b Hide mouse cursor when in fullscreen mode. 2020-05-11 13:37:48 +02:00
Hyenadae 708e3fd684 WIP In-Game Exit via pause+save menus w/ Localizations 2020-05-11 06:58:33 -04:00
IvanDSM ed524acd12 Add option in the configfile for skipping the intro
Now it's possible to either provide the --skip-intro command line argument or have skip_intro set to 1 on the config file.
2020-05-11 05:13:51 -03:00
BlankPixel ea3d8f2721 Fix incorrect arguments for newcam_clamp(), min and max were swapped; Simplified newcam_change_setting() with clamp function.
Also added a nice sound effect when closing the camera menu.
2020-05-10 23:42:29 -07:00
IvanDSM 61e7e8d032 Added CLI functionality with --skip-intro option. 2020-05-11 02:42:22 -03:00
IvanDSM 50bb799718 Fix hardcoded sensitivity (again?) 2020-05-11 01:53:52 -03:00
IvanDSM 5a4848e3f6 Fix analogue camera axis inversion, mouse now obeys inversion. 2020-05-11 01:51:17 -03:00
Vinícius R. Miguel f25b4dcbc6 Adds credit to Emil.
For implementing n64-fast32-engine
2020-05-10 17:47:10 -03:00
fgsfds 44f0512bd8 move bettercamera settings to config file; cleanup 2020-05-10 21:39:23 +03:00
Vinícius R. Miguel 0edbb78e1f Merge pull request #42 from vanfanel/master
Thanks!
2020-05-10 14:02:27 -03:00
vanfanel c5efdc2018 Remove redundant code. Make GLES and GL modes respect DESIRED_WIDTH and DESIRED_HEIGHT in windowed mode, but in fullscreen mode just use the system video mode. 2020-05-10 18:23:34 +02:00
fgsfds 86101aa4bf might as well check for L while we're at it 2020-05-10 19:15:13 +03:00
fgsfds 67e348cb2a rebind Z trigger back to L 2020-05-10 19:14:59 +03:00
fgsfds dffd75949f whoops, this is supposed to be the Z button 2020-05-10 19:09:43 +03:00
vanfanel 2056beeaff Do not call gfx_sdl_set_fullscreen() just after creating the game window: create window fullscreen or not directly. 2020-05-10 18:07:26 +02:00
fgsfds 775786310b allow rebinding of joystick and mouse buttons 2020-05-10 19:05:54 +03:00
vanfanel 4fb20a14b6 Fix for GLES on windowed rendering contexts (X11) 2020-05-10 17:52:01 +02:00
fgsfds bfbe62daed make use of mouse buttons 2020-05-10 18:41:46 +03:00
vanfanel 12434a79b1 Use the system video mode in GLES platforms instead of setting a new one. 2020-05-10 15:41:46 +02:00
IvanDSM 953ac95582 Fix build without new camera, add example to README
This fixes an oversight of mine that broke building with BETTERCAMERA=0 and adds an example to the README of how to build with the new camera disabled.
2020-05-10 05:47:38 -03:00
IvanDSM dc78761056 Merge branch 'master' into camera-rebase 2020-05-10 05:13:38 -03:00
IvanDSM e21210f238 New Makefile and fgsfdsfgs fixes
New Makefile based on master branch Makefile.
Ported fdsfgsfds' OOB memory access and save buffer corruption fixes.
2020-05-10 05:11:27 -03:00
Colton G. Rushton 6dc027226c More fixes ported from fdsfgsfds' fork 2020-05-10 00:05:33 -03:00
Colton G. Rushton c3e450122c Fix save corruption in some 64-bit builds 2020-05-09 21:13:57 -03:00
y0shin 3a4f4b4bc1 Merge pull request #22 from Hyenadae/master
L (Trigger) is real (now). Added key_l to config. L_TRIG and CONT_L inputs are now accepted by Mario 64
2020-05-09 06:21:20 -04:00
Hyenadae b2d424799c L (Trigger) is real. Keyboard only for now. 2020-05-09 09:31:15 +01:00
Hyenadae e0b22eccab L (Trigger) is real. Keyboard only for now. 2020-05-09 09:28:19 +01:00
IvanDSM a2017555de Fix goddard/sfx.h header 2020-05-09 02:32:57 -03:00
IvanDSM b2831a2478 Fix goddard/sfx.h header 2020-05-09 02:30:14 -03:00
IvanDSM 85dbb70e38 Mouse Look ported to camera_rebase
With check for settings SDL_SetRelativeMouseMode only if Mouse Look is enabled.

We always send regards to Fastblitters.
2020-05-09 02:10:56 -03:00
Vinícius R. Miguel 4448d4d9b5 True analog camera control has been added. 2020-05-09 01:19:13 -03:00
vanfanel 19cc217dbb Pass -DUSE_GLES to sdl2 GL init context instead of -DTARGET_RPI, since there are more GLES platforms out there that this engine will run on. 2020-05-08 17:06:23 +02:00
HengiFettlich 0047ec939e refactor fullscreen into own static function 2020-05-08 14:35:38 +02:00
Jan200101 d0eac210c3 port analog camera code to the master codebase 2020-05-08 13:41:35 +02:00
Jan200101 68c3eb3e10 revert -O2 when non matching,fix EU compile,disable cursor in fullscreen
- O2 caused problems with audio on US builds when targeting generic systems
- compiling an EU version previously caused problems due to race condition in the Makefile
- not being able to see the cursor on a small window is annoying, only hide on fullscreen
2020-05-08 13:41:12 +02:00
HengiFettlich 44c381f70a Update gfx_sdl2.c
if fullscreened, escape to exit fullscreen
2020-05-08 12:24:40 +02:00
Vinícius R. Miguel d9b6d452fb Merge branch 'master' into master 2020-05-08 04:53:41 -03:00
Hyenadae 37df664c45 Makefile additions and part of SDL2.C Pi-GLES define 2020-05-08 08:38:50 +01:00
Vinícius R. Miguel 9cfee50bbe Removes the cursor from view when on the game's window. 2020-05-08 04:36:17 -03:00
Vinícius R. Miguel c30450a1d2 Add RPi-related optimizations. 2020-05-08 04:14:56 -03:00
HengiFettlich a898c89b3f add Hotkeys for Fullscreen (ALT+Enter) 2020-05-07 20:46:35 +02:00
Jan200101 9267bdd8a8 merge PC port onto the decompile 2020-05-07 20:21:22 +02:00
n64 4d54e2f91a Refresh 8 2020-04-03 14:57:26 -04:00
n64 88e2433da5 Refresh 7 2020-03-01 22:42:52 -05:00
n64 88b91e7c75 refresh 6 2020-02-03 00:51:26 -05:00
n64 ced3a63505 refresh 5 2020-01-03 10:38:57 -05:00
n64 99e662fa5d refresh 4 2019-12-01 21:52:53 -05:00
n64 8bc51a5025 Refresh 3 2019-11-03 14:36:27 -05:00
n64 5effc886be Refresh 2 2019-10-05 15:08:05 -04:00
n64 33b27a1ceb Refresh 1 2019-09-01 15:50:50 -04:00
n64 89e8690857 init2 2019-08-25 00:46:40 -04:00