Jason Yundt
74a18aed51
Add missing <placeholder> for -display
...
Before this change, the documentation for the command-line options that
take arguments was inconsistent. There was a <placeholder> in the
“option” cell for almost all of the command-line options that take
arguments. -display was the only command-line option that takes
arguments that didn’t have a <placeholder>. This change makes the
documentation more consistent by ensuring that all command-line options
that take arguments have <placeholders>.
2024-12-23 13:43:40 -05:00
Jason Yundt
d85e0b606f
Fix description of -dedicated
...
Before this change, USAGE.md said that -dedicated was a boolean option
and that it took 0 arguments. This is not correct, and it contradicts
the wiki’s documentation for -dedicated [1]. This commit fixes that
issue.
[1]: <https://github.com/DescentDevelopers/Descent3/wiki/Running-Descent-3#command-line-options >
2024-12-23 12:49:50 -05:00
Louis Gombert
4ff0665dc4
Merge pull request #657 from sebholt/display
...
Add new command line option: -display
2024-12-20 23:39:52 +01:00
Louis Gombert
72f51b0da9
Merge pull request #656 from halprin/macos-rosetta
...
Compile macOS Intel Version on Apple Silicon
2024-12-18 09:26:42 +01:00
halprin
3b741a9feb
Remove debug programs
2024-12-17 19:17:46 -07:00
halprin
61e77ff8da
Consolidate steps but add some debug output
2024-12-17 18:44:22 -07:00
halprin
842e3149e2
Try not running brew in x86_64
2024-12-17 18:25:48 -07:00
Sebastian Holtermann
bc12e2bf9f
Add documentation for the -display command line argument in USAGE.md
2024-12-17 20:53:55 +01:00
Sebastian Holtermann
0e2ef804dd
Add new command line option: -display
...
The new command line option -display lets the user select the display on
which Descent 3 should be displayed.
This is useful in multi-monitor setups where the game now can be run on any of
the given monitors.
2024-12-17 20:47:04 +01:00
halprin
2f060343e1
Improve if statements and documentation
2024-12-15 21:03:56 -07:00
halprin
3189a29739
this time without all the shell config
2024-12-15 20:27:13 -07:00
halprin
c0d62f94ce
Does it work without arch after install
2024-12-15 20:24:10 -07:00
halprin
dc8aff0b50
Specify shell per runner
2024-12-15 19:49:46 -07:00
halprin
c7f48142c6
Overwrite PATH for future steps when running as macOS Intel
2024-12-15 19:18:11 -07:00
halprin
c049d35725
Tell me the arch of cmake
2024-12-15 19:04:21 -07:00
halprin
b9fb1aa2b8
Do not intall Rosetta with brew
2024-12-15 18:48:44 -07:00
halprin
fd8909296a
Do not use shell when installing Rosetta 2
2024-12-15 18:47:03 -07:00
halprin
cb3aedce3c
Specify the shell for macOS Intel
2024-12-15 18:43:31 -07:00
halprin
572070ad23
use direct arch
2024-12-15 18:16:03 -07:00
halprin
f8d01651a5
eval without arch -x86_64
2024-12-15 17:33:01 -07:00
halprin
f3f8d1e5fa
Set-up brew path correctly before bundle install
2024-12-15 17:23:07 -07:00
halprin
b7b410fe73
try installing Rosetta and build for Intel
2024-12-15 17:05:00 -07:00
Louis Gombert
6583bfe575
Merge pull request #655 from NateEag/patch-1
...
fix typo in USAGE.md
2024-12-14 13:42:40 +01:00
Nate Eagleson
ec07a53d45
fix typo in USAGE.md
2024-12-14 01:51:44 -05:00
Louis Gombert
0bdca225e2
Merge pull request #652 from sebholt/fix_array_size_computation
...
Fix two array size computations
2024-12-05 22:03:42 +01:00
Louis Gombert
584ac21f5e
Merge pull request #644 from winterheart/credits-update
...
Add git-contributors.py to regenerate opensource contributors list
2024-12-05 21:52:39 +01:00
Sebastian Holtermann
8ffbc6c5ea
Fix array size computation
...
This fixes an array size computation that assumed that the array elements
are char * when in fact they are char arrays.
2024-12-02 18:01:00 +01:00
Sebastian Holtermann
73bf2ebeaa
Fix array size computation
...
This fixes an array size computation that assumed that the array elements
are char * when in fact they are char arrays.
2024-12-02 17:56:30 +01:00
Louis Gombert
8823c1cb53
Merge pull request #643 from sebholt/2dlib_fixes
...
Fix some compiler warnings in the 2dlib directory
2024-12-01 12:34:32 +00:00
Azamat H. Hackimov
0d1265ce35
Add oscredits.txt to credit lines
2024-11-29 17:14:09 +03:00
Azamat H. Hackimov
2c8081e832
Implement git-contributors.py
...
Add tool for creating credits file from git history.
2024-11-29 17:14:09 +03:00
Azamat H. Hackimov
90fa0fb8d7
Rewrite credits.cpp to use std::vector
...
Simplify code, convert most global variables to local.
2024-11-29 17:14:05 +03:00
Azamat H. Hackimov
b07f2353ae
Properly declare ShowStaticScreen()
2024-11-29 17:13:20 +03:00
Azamat H. Hackimov
f79e02c638
Cleanup credits.cpp
2024-11-29 17:13:20 +03:00
Azamat H. Hackimov
7fe52ecb97
Merge pull request #642 from Lgt2x/arm64-cross
...
Introduce cross-compiled ARM64 build
2024-11-29 16:15:01 +03:00
Sebastian Holtermann
0e8980ea13
2dlib: Fix set but not used compiler warning in font.cpp
...
This fixes a set but not used compiler warning in Release builds in
2dlib/font.cpp.
2024-11-27 16:13:00 +01:00
Sebastian Holtermann
b43a5bb039
2dlib: Fix unused variable compiler warning in memsurf.cpp
...
This fixes an unused variable compiler warning in Release builds in
2dlib/memsurf.cpp.
2024-11-27 16:13:00 +01:00
Sebastian Holtermann
3ac2cb8382
2dlib: Fix uninitialized bool compiler warning in surface.cpp
2024-11-27 15:56:33 +01:00
Sebastian Holtermann
987a51d38d
2dlib: Fix another set but not used variable compiler warning in surface.cpp
2024-11-27 15:56:33 +01:00
Sebastian Holtermann
d49691143c
2dlib: Fix another set but not used variable compiler warning in surface.cpp
2024-11-27 15:56:33 +01:00
Sebastian Holtermann
a97416fc28
2dlib: Fix set but not used variable compiler warning in surface.cpp
2024-11-27 15:56:33 +01:00
Sebastian Holtermann
e122a16804
2dlib: Fix integer signedness missmatch in comparison in font.cpp
2024-11-27 15:56:33 +01:00
Sebastian Holtermann
10dae4d65b
2dlib: Fix an integer signedness compiler warning in pentext.cpp
...
This fixes an integer signedness compiler warning and cleans up the
grViewport::draw_text_line method in 2dlib/pentext.cpp.
2024-11-27 15:56:13 +01:00
Sebastian Holtermann
9af8c16b6b
2dlib: Fix unused variable compiler warning in pen.cpp
...
This removes some unused variables in 2dlib/pen.cpp.
2024-11-27 15:56:13 +01:00
Louis Gombert
836dd4d382
Merge pull request #645 from jengelh/master
...
Resolve 3301 compiler warnings
2024-11-26 22:24:13 +00:00
Louis Gombert
1803f66f75
Merge pull request #651 from Lgt2x/macos-13
...
MacOS CI builds: use MacOS-13 instead of the deprecated MacOS-12
2024-11-26 19:23:29 +00:00
Louis Gombert
d77383f8ab
MacOS CI builds: use MacOS-13 instead of the deprecated MacOS-12
2024-11-26 20:44:29 +01:00
Louis Gombert
78c1e61a27
Fix USAGE.md instructions with updated file locations
2024-11-25 22:44:37 +01:00
Louis Gombert
390b36ba84
VCPKG: bump SDL2 from 2.30.3 to 2.30.8
2024-11-25 22:44:37 +01:00
Louis Gombert
601765a18f
Add ARM64 build to github actions
2024-11-25 22:44:37 +01:00
