Commit Graph

342 Commits

Author SHA1 Message Date
fgsfds 2714708ca9 avoid redefining CLOCK_MONOTONIC and shit 2020-05-20 17:56:35 +03:00
fgsfds 5e17e23393
Merge pull request #232 from Tarnadas/nightly
fix non mingw builds
2020-05-20 17:53:21 +03:00
Mario Reder f99298943c fix non mingw builds
resolves #230
2020-05-20 16:50:05 +02:00
fgsfds c540712154 add GL1.3 (or 1.2 with some extensions) rendering backend
there are still some graphical glitches and no fog
2020-05-20 07:00:04 +03:00
IvanDSM fb706c42f6 CLI improvements 2020-05-19 21:22:05 -03:00
fgsfds c57bacdfd7 clean up some toolchain compatibility fixes
also rename the abs() macro to not cause any fucking conflicts ever again
2020-05-19 22:22:52 +03:00
fgsfds 06f02dc210 separate text saves; fix build without TEXTSAVE 2020-05-19 21:56:23 +03:00
fgsfds 725567873a
Merge pull request #216 from Leon422/patch-1
Cheats can be enabled by pressing "L" 3 times while in the options menu.
2020-05-19 21:26:09 +03:00
Leon422 c0a79af79c
Fixed spacing, added brackets. Ready to merge 2020-05-19 19:15:20 +01:00
Leon422 1590976046
Cheats can be enabled by pressing the L trigger 3 times while in the options menu.
Also plays a sound to confirm the user that it worked.
2020-05-19 18:31:01 +01:00
zerocloude b75dba9020
Merge pull request #213 from coltongit/patch-27
Update the README
2020-05-20 00:28:38 +09:00
Colton G. Rushton fee577cedd
Update to add text-save support mention 2020-05-19 12:27:15 -03:00
zerocloude 4c483cdfd5
Merge pull request #178 from zerocloude/nightly
Added support text-based savefile support. Added new parsing library for toml-life files.
2020-05-20 00:14:39 +09:00
Zerocker 6a628322ba Merge remote-tracking branch 'upstream/nightly' into nightly 2020-05-20 00:02:29 +09:00
Colton G. Rushton f0c45a772e
Update the README 2020-05-19 12:00:33 -03:00
zerocloude f1698b9081
Merge pull request #205 from porcino/nightly
Option to hide the hud
2020-05-19 23:46:19 +09:00
zerocloude 0c03280516
Merge pull request #93 from yksoft1/mingw.org-compatible
Making code MinGW.org and MSYS1 compatible
2020-05-19 23:45:44 +09:00
zerocloude d604711468
Merge pull request #153 from coltongit/patch-23
TARGET_N64 removal
2020-05-19 23:37:51 +09:00
zerocloude 2b2572db4b
Merge pull request #150 from coltongit/patch-21
Fix unused code
2020-05-19 23:26:40 +09:00
zerocloude fb537f409e
Merge pull request #211 from coltongit/msys2-build-simplification
Add MSYS2 build fix/simplification
2020-05-19 23:26:03 +09:00
zerocloude 1d4d92fe6d
Merge pull request #210 from coltongit/controller-axis-fix
Fix to controller axis invert issue
2020-05-19 23:25:33 +09:00
zerocloude da295dd349
Merge pull request #209 from coltongit/mxe-build-fix
Yet another MXE build fix
2020-05-19 23:25:15 +09:00
zerocloude 5889f837be
Merge pull request #207 from coltongit/webgl-build-fix 2020-05-19 23:24:53 +09:00
Colton G. Rushton 2904658341
Add MSYS2 build fix/simplification
Adds the CFLAG normally added during building in MSYS2 to make MSYS2 builds easier to perform.
2020-05-19 11:04:46 -03:00
Colton Rushton 08ad740b1c Refactor PR #176 2020-05-19 10:51:49 -03:00
Colton Rushton 41828987f2 Made the game even easier to compile in MXE. 2020-05-19 10:38:08 -03:00
Colton Rushton 9230cb832d Refactor PR #156 2020-05-19 10:32:01 -03:00
Colton Rushton b0081e8d60 Refactor PR #151 2020-05-19 10:14:44 -03:00
yksoft1 5cb3bfd2f6 Fix types.h include guard to avoid any conflict with <sys/types.h>. 2020-05-19 20:39:01 +08:00
yksoft1 ee795fa7af My hacks to cliopts.h is not necessary anymore. 2020-05-19 20:15:25 +08:00
U-ALTTP-PC\ALTTP e97d25c2c6 option to hide the hud 2020-05-19 03:24:51 -03:00
V. R. Miguel 3a204f25c2
Merge pull request #180 from Leon422/master
Added "Exit course at any time", "Huge Mario" and "Tiny Mario" cheats
2020-05-18 23:02:59 -03:00
V. R. Miguel 29bfb1b9b8
Merge branch 'nightly' into master 2020-05-18 23:00:42 -03:00
fgsfds 1046cc1301 Merge pull request #179 from dernett/fix-fullscreen-text
Fix fullscreen text
2020-05-19 03:19:37 +03:00
fgsfds c18e70f44e Revert "Merge branch 'nightly' into master"
This reverts commit 2e8a821fa3, reversing
changes made to d499f55402.
2020-05-19 02:38:59 +03:00
fgsfds 2e8a821fa3
Merge branch 'nightly' into master 2020-05-19 02:33:30 +03:00
fgsfds d499f55402
Merge pull request #194 from Leon422/patch-4
Update README_es_ES.md to reflect the fact that cheats now use a CLI
2020-05-19 02:05:57 +03:00
Leon422 18c197dbff
Update README_es_ES.md 2020-05-19 00:04:07 +01:00
fgsfds 1d845c4f81
Merge pull request #193 from Leon422/patch-3
Update README.md to reflect the fact that cheats now use a CLI
2020-05-19 02:03:40 +03:00
Leon422 8e60f9960e
Update README.md 2020-05-19 00:02:03 +01:00
fgsfds 26705aed7a disable cheats by default; use --cheats CLI option to enable for now 2020-05-19 01:59:29 +03:00
fgsfds 6a79a9af99 bring back the old frame timing method (if vsync != 2) 2020-05-19 01:32:49 +03:00
fgsfds 59913a9beb Revert "Revert "(hopefully) fix the timing crap; add vsync option""
This reverts commit c6961b8606.
2020-05-19 01:25:59 +03:00
fgsfds c6961b8606 Revert "(hopefully) fix the timing crap; add vsync option"
This reverts commit 2bd840a299.
2020-05-18 18:48:11 -03:00
fgsfds c3c2451c6a Revert "(hopefully) fix the timing crap; add vsync option"
This reverts commit 2bd840a299.
2020-05-18 18:44:35 -03:00
V. R. Miguel ba26931aa1
Merge pull request #189 from sm64pc/master
Update nightly
2020-05-18 18:26:00 -03:00
V. R. Miguel 4f783c6822
Merge pull request #188 from Leon422/patch-2
Updated the Spanish readme
2020-05-18 18:24:39 -03:00
V. R. Miguel b9e54b9792
Merge pull request #186 from Leon422/patch-1
Added the cheats menu to the list of features
2020-05-18 18:24:31 -03:00
Leon422 1d9398abb3
*commits in Spanish again*
Added the cheats menu to the feature list, and updated the feature list in general to match the English version.
2020-05-18 22:15:06 +01:00
Leon422 7ad1b1f12b
*commits in Spanish* 2020-05-18 22:13:00 +01:00