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
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
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
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
fgsfds
93cfab086a
bettercam: add adjustable camera deceleration
2020-05-16 20:30:06 +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
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
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
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
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
vanfanel
d59c081905
Hide mouse cursor when in fullscreen mode.
2020-05-11 13:37:48 +02: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
IvanDSM
4cbe3af070
Added CLI functionality with --skip-intro option.
2020-05-11 02:42:22 -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
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
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
