vrmiguel
/
sm64pc
mirror of https://github.com/sm64pc/sm64pc.git
1
0
Fork 0
Code Issues Releases Wiki Activity
442 Commits 4 Branches 0 Tags 32 MiB
Commit Graph

235 Commits

Author SHA1 Message Date
V. R. Miguel cd2e6c0774
Merge pull request #165 from HeavenVolkoff/save_win_dimensions 
Implement save/restore of window dimensions/position

Thanks for the contribution, @HeavenVolkoff!
 2020-05-18 00:10:42 -03:00
Vinícius R. Miguel 4246242138 Still about #172 2020-05-17 23:58:22 -03:00
Vinícius R. Miguel ba04643b61 Potential fix for #172 
Adds a null-terminator to gCLIOpts.ConfigFile
 2020-05-17 23:55:17 -03:00
Heaven Volkoff 98efed7c51 Reset Window now exit fullscreen 
Change configFullscreen to configWindow.fullscreen
 2020-05-17 23:31:31 -03:00
Heaven Volkoff 9927b3555d Fix fullscreen exit resulting in a slightly lower Y position 2020-05-17 23:31:31 -03:00
Heaven Volkoff 0fa331d961 Implement save/restore window dimensions/position 
- Add an entry in options menu to reset window
 2020-05-17 23:31:31 -03:00
IvanDSM d6495550f5 Release mouse when paused 2020-05-17 22:37:52 -03:00
IvanDSM f29ce2d8f0 Merge branch 'nightly' of github.com:sm64pc/sm64pc into nightly 2020-05-17 21:24:01 -03:00
IvanDSM 5e637bd121 Fix crashing when OOB in BETTERCAMERA builds 
Previously, an attempt to read gMarioState->floor->type was being made even when gMarioState->floor was a null pointer.
This commit makes bettercamera check if gMarioState->floor is not null before accessing it.
 2020-05-17 21:23:30 -03:00
V. R. Miguel 6811d9e01c
Fixed a dumb thing 2020-05-17 21:17:27 -03:00
Vinícius R. Miguel 15c7670ce8 Merge remote-tracking branch 'origin/nightly' into nightly 2020-05-17 21:06:59 -03:00
Vinícius R. Miguel 262963bf88 Restructuring some of the cheat code 2020-05-17 21:06:38 -03:00
fgsfds eaba9656d6
Merge pull request #169 from kurethedead/nightly 
Implemented LoadTile f3d command, I4/I8/RGBA32 texture formats.
 2020-05-18 02:45:11 +03:00
V. R. Miguel 2287fcce9f
Merge pull request #170 from Leon422/nightly 
Added a "responsive controls" cheat
 2020-05-17 20:08:13 -03:00
Daniel 17c6e56907 Added a "super responsive controls" cheat 
Added a "super responsive controls" cheat. When enabled, Mario will look straight into the direction the user inputs when changing directions, with no interpolation at all. (you can still slide / side jump / etc )

The change is especially noticeable when playing with keyboard.
 2020-05-18 00:05:26 +01:00
kurethedead 181e18dfea Implemented LoadTile f3d command, I4/I8/RGBA32 texture formats. 2020-05-17 15:48:06 -07:00
V. R. Miguel 15dabb7c22
Merge pull request #166 from Leon422/nightly 
Enabled a Cheat menu

Thanks for the contribution, @Leon422!
 2020-05-17 19:32:44 -03:00
Leon422 1a9c8dbe47
Fixed tabs/spaces 2020-05-17 23:27:40 +01:00
Daniel 28fc53c207 Enabled a Cheat menu 
Enabled a cheat menu. It includes 4 cheats, and all of them rely on the global "Enable cheats" option so the user can quickly turn all the selected cheats off and back on.
 2020-05-17 22:56:06 +01:00
Andrew Bobulsky fcc4cbb51d
Fix TARGET_WEB builds 2020-05-17 15:22:50 -04:00
fgsfds 094f3ebb33
Merge branch 'nightly' into master 2020-05-17 20:19:42 +03:00
fgsfds ece7649b4b use a wrapper for exiting instead of just calling exit() 
this might also fix the webgl build issue
 2020-05-17 19:56:56 +03:00
fgsfds 62cc4620ec no need for that, window resize events happen when fullscreen state changes 2020-05-17 19:56:33 +03:00
fgsfds 58dbb04f97 update gfx_sdl2.c with the latest stuff from Emill/n64-fast3d-engine 2020-05-17 19:49:36 +03:00
uncletrunks 6b468f44f6 fix for issue #149 2020-05-17 11:03:02 -05:00
Colton G. Rushton b52560869c
The last of TARGET_N64 finally gets thanos'd 2020-05-17 08:17:37 -03:00
yksoft1 072025d243 Fix cliopts on MinGW.org. 2020-05-17 19:01:13 +08:00
yksoft1 753be9e1b7 Merge remote-tracking branch 'upstream/master' into mingw.org-compatible 2020-05-17 18:33:17 +08:00
Colton G. Rushton c8a5d2ec68
Fix unused code 2020-05-17 05:49:34 -03:00
V. R. Miguel bc5942d189
A better fix to the cylboard problem 
So we've reverted the previous 'fix' and add this one, by @HeavenVolkoff.
 2020-05-17 03:34:05 -03:00
Vinícius R. Miguel d543bd0b3d Revert "Fixes billboarding-related problems" 
This reverts commit 5558ecbd4e.
 2020-05-17 03:29:19 -03:00
Vinícius R. Miguel 5558ecbd4e Fixes billboarding-related problems 2020-05-17 02:15:11 -03:00
Vinícius R. Miguel bdc06d1709
Merge pull request #139 from sm64pc/master 
Add MXE/OSX stuff to nightly
 2020-05-16 22:08:24 -03:00
IvanDSM 5145f2a897 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 2c8382e60e Add --help and --windowed CLI options. 2020-05-16 21:39:48 -03:00
fgsfds 54f986a528
Merge branch 'master' into osx_build_clean 2020-05-17 01:27:51 +03:00
Vinícius R. Miguel e67a5443b7 Fixed some stuff 2020-05-16 18:14:43 -03:00
Vinícius R. Miguel 7bf7b34c57 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 69ff11e459 Add support for saves of both endiannesses. 
Porting from testing. Originally by @fgsfdsfgs.
 2020-05-16 17:57:40 -03:00
fgsfds ff844643d2
Merge branch 'master' into master 2020-05-16 22:47:39 +03:00
fgsfds f6642e9a9d tabs begone 2020-05-16 22:39:37 +03:00
fgsfds f5e73a099b
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 5dd43ad674 OSX_BUILD cleaned commit 2020-05-16 15:30:27 -04:00
Vinícius R. Miguel 9e8290773b Shutdown subsystems on exit 
Porting from testing, originally by @fgsfdsfgs
 2020-05-16 16:23:23 -03:00
wabberz 6c4bf44d93
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 a5d4b22606
Update whomp.inc.c 2020-05-16 20:33:41 +02:00
fgsfds 93cfab086a bettercam: add adjustable camera deceleration 2020-05-16 20:30:06 +03:00
fgsfds 1d557e4c4d only include camera options if BETTERCAM==1 2020-05-16 20:00:51 +03:00
Colton G. Rushton 6736bd7e9c
Fix SL walking penguin for nodrawdistance 2020-05-16 10:23:32 -03:00
Colton G. Rushton fd9909269d
Remove newline in nodrawdistance define 2020-05-16 10:19:58 -03:00
fgsfds 9ae444d2b5 move filtering check to gfx_pc.c for those sweet realtime updates 2020-05-16 16:15:45 +03:00
fgsfds a259cd15a1 add dumb master volume control 2020-05-16 16:15:40 +03:00
fgsfds 92c75fb21b simplify options menu definitions 2020-05-16 16:15:35 +03:00
fgsfds dbca0c413d add fullscreen and filtering settings to options 
filtering only applies to newly loaded textures
 2020-05-16 16:15:27 +03:00
Heaven Volkoff 1a3034898c Consider second color column of Light_t when calculating vertex colors 2020-05-16 04:48:11 -03:00
Heaven Volkoff aba9a57e14 Fix Whomp and PiranhaPlant not appearing from a distance in WF 2020-05-16 03:03:54 -03:00
fgsfds de49bf1ac2 fix build on all toolchains except mine 2020-05-16 08:11:48 +03:00
fgsfds ed59481560 add OPT_BUTTON option type; move Exit Game button from pause to options menu 2020-05-16 08:03:50 +03:00
uncletrunks 59a33aa604
Rebind camera centering to left trigger. 2020-05-15 19:26:44 -05:00
IvanDSM 2b098781b8 skip_intro now skips Lakitu and Bowser intros 2020-05-15 17:09:02 -03:00
IvanDSM e96bbef650 Fix configfile skip_intro option 2020-05-15 16:47:04 -03:00
Vinícius R. Miguel 4a13fd3380 Add in-game control binding menu 
Originally on the testing branch
 2020-05-15 15:38:35 -03:00
Vinícius R. Miguel fd74e20373 Add a `--fullscreen` CLI option 2020-05-15 12:51:06 -03:00
Vinícius R. Miguel f39d9ad096
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 339735392f Fix incorrect cursor position calculation on Mario head screen (related to #28) 2020-05-15 01:09:28 -03:00
uncletrunks ab23b8907b putting out fires 2020-05-14 21:50:10 -05:00
IvanDSM 86a3f84010
Merge branch 'master' into skipintro 2020-05-14 23:05:21 -03:00
IvanDSM 59d0cc16c1 Add <strings.h> include 
Oops!
 2020-05-14 23:02:04 -03:00
uncletrunks 8e1412a2ac more cylindrical billboarding stuff 2020-05-14 20:47:55 -05:00
uncletrunks 70ca0af987 adds cylindrical billboarding, enables it for trees. 2020-05-14 20:31:52 -05:00
fgsfds 8017d1dfa4 fix cursor on Mario head screen (fixes #28) 
gDPSetScissor fix originally by Emil
 2020-05-15 01:28:21 +03:00
uwabami a26c36b6b4 fix Fire Spitter 2020-05-14 19:08:30 +02:00
uwabami 2bdb1ab551 several fixes and improvements 2020-05-14 18:47:12 +02:00
yksoft1 1b03e251bb 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 fa9af3227e Make the code buildable on MinGW.org (not mingw-w64) and MSYS1. 2020-05-14 23:47:00 +08:00
uwabami 8d2e0f5ffd fix Fwoosh in Tall, Tall Mountain 2020-05-14 17:07:14 +02:00
uwabami a773e68c15 fix Lakitu's cloud not appearing from a distance 2020-05-14 16:24:00 +02:00
uwabami 87dac5d916 fix bugged Heave-Ho in Wet-Dry World 2020-05-14 16:11:59 +02:00
Hyenadae 829c1f29a8 Fixed more border-related code and fixes to N64 build removal 2020-05-14 05:18:12 -04:00
Vinícius R. Miguel d5d151f322 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 31f0d68ca2 Removed majority of TARGET_N64 logic from code 2020-05-13 07:57:25 -04:00
uwabami bea82c00bc Increase GFX_POOL_SIZE to fix overflow in 32bit version - thanks fgsfds 2020-05-13 09:25:45 +02:00
uwabami c98a263cf4 adding option to disable draw distance 2020-05-12 09:26:16 +02:00
Vinícius R. Miguel 0ec63e46ac
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 d59c081905 Hide mouse cursor when in fullscreen mode. 2020-05-11 13:37:48 +02:00
Hyenadae 691d6f382b WIP In-Game Exit via pause+save menus w/ Localizations 2020-05-11 06:58:33 -04:00
IvanDSM bd93878c56 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 5957be7bf6 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 4cbe3af070 Added CLI functionality with --skip-intro option. 2020-05-11 02:42:22 -03:00
IvanDSM ef3b0ba52d Fix hardcoded sensitivity (again?) 2020-05-11 01:53:52 -03:00
IvanDSM 595be623a0 Fix analogue camera axis inversion, mouse now obeys inversion. 2020-05-11 01:51:17 -03:00
Vinícius R. Miguel ff2ec85f8c Adds credit to Emil. 
For implementing n64-fast32-engine
 2020-05-10 17:47:10 -03:00
fgsfds a0ba46eaf6 move bettercamera settings to config file; cleanup 2020-05-10 21:39:23 +03:00
Vinícius R. Miguel aa046c76d9
Merge pull request #42 from vanfanel/master 
Thanks!
 2020-05-10 14:02:27 -03:00
vanfanel f24d44c9c7 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 d0b85785fe might as well check for L while we're at it 2020-05-10 19:15:13 +03:00
fgsfds 2234e28625 rebind Z trigger back to L 2020-05-10 19:14:59 +03:00
fgsfds d6820f6073 whoops, this is supposed to be the Z button 2020-05-10 19:09:43 +03:00
vanfanel 16a4495bf2 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 690283da13 allow rebinding of joystick and mouse buttons 2020-05-10 19:05:54 +03:00
vanfanel fd02d88b59 Fix for GLES on windowed rendering contexts (X11) 2020-05-10 17:52:01 +02:00
fgsfds e427aaa894 make use of mouse buttons 2020-05-10 18:41:46 +03:00
vanfanel f70ebeb2b3 Use the system video mode in GLES platforms instead of setting a new one. 2020-05-10 15:41:46 +02:00
IvanDSM e3a2613328 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 6ed071e49e
Merge branch 'master' into camera-rebase 2020-05-10 05:13:38 -03:00
IvanDSM 88b063d7a1 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 ad89f663f3
More fixes ported from fdsfgsfds' fork 2020-05-10 00:05:33 -03:00
Colton G. Rushton 1c86dca581
Fix save corruption in some 64-bit builds 2020-05-09 21:13:57 -03:00
y0shin 879958617f
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 0413703a60 L (Trigger) is real. Keyboard only for now. 2020-05-09 09:31:15 +01:00
Hyenadae f43c06303f L (Trigger) is real. Keyboard only for now. 2020-05-09 09:28:19 +01:00
IvanDSM 75aeb9d686 Fix goddard/sfx.h header 2020-05-09 02:32:57 -03:00
IvanDSM 89cd99608e Fix goddard/sfx.h header 2020-05-09 02:30:14 -03:00
IvanDSM 3ebfc225ca 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 ef2cd47343 True analog camera control has been added. 2020-05-09 01:19:13 -03:00
vanfanel ab52a3cbf5 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 c4707eb36f refactor fullscreen into own static function 2020-05-08 14:35:38 +02:00
Jan200101 be340547c4
port analog camera code to the master codebase 2020-05-08 13:41:35 +02:00
Jan200101 c540898c71
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 848f7c352b Update gfx_sdl2.c 
if fullscreened, escape to exit fullscreen
 2020-05-08 12:24:40 +02:00
Vinícius R. Miguel 1e246386bc
Merge branch 'master' into master 2020-05-08 04:53:41 -03:00
Hyenadae dba8760aad Makefile additions and part of SDL2.C Pi-GLES define 2020-05-08 08:38:50 +01:00
Vinícius R. Miguel 0c10f9eacc
Removes the cursor from view when on the game's window. 2020-05-08 04:36:17 -03:00
Vinícius R. Miguel 7e97699076
Add RPi-related optimizations. 2020-05-08 04:14:56 -03:00
HengiFettlich 1cca3ef4ea add Hotkeys for Fullscreen (ALT+Enter) 2020-05-07 20:46:35 +02:00
Jan200101 e87c070517
merge PC port onto the decompile 2020-05-07 20:21:22 +02:00
n64 c45aa301bb Refresh 8 2020-04-03 14:57:26 -04:00
n64 06ec56df7f Refresh 7 2020-03-01 22:42:52 -05:00
n64 9a801cb96d refresh 6 2020-02-03 00:51:26 -05:00
n64 9273f38df1 refresh 5 2020-01-03 10:38:57 -05:00
n64 04732af90b refresh 4 2019-12-01 21:52:53 -05:00
n64 a7c423cb43 Refresh 3 2019-11-03 14:36:27 -05:00
n64 52e605f075 Refresh 2 2019-10-05 15:08:05 -04:00
n64 1ef98ec785 Refresh 1 2019-09-01 15:50:50 -04:00
n64 89e8690857 init2 2019-08-25 00:46:40 -04:00