Skip to content

Commit 512f8b4

Browse files
Merge branch 'master' into doxygenify
2 parents c7d05a9 + ff1ae35 commit 512f8b4

25 files changed

Lines changed: 3501 additions & 3877 deletions

DONORS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Redot Engine is a non-profit project developed by a community of voluntary contributors.
44

55
Our Team greatly appreciates any and all donations.
6-
More information about supporting the project can be found on [Redot's Ko-Fi](https://ko-fi.com/redotengine).
6+
More information about supporting the project can be found on [Redot Foundation](https://redotfoundation.org/support).
77

88
Below is a list of our generous donors.
99

README.md

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -63,21 +63,7 @@ nix run .
6363

6464
This will automatically install all build dependencies and compile Redot if the binary doesn't exist.
6565

66-
For manual control over the build process:
67-
68-
```bash
69-
# Enter the Nix development environment
70-
nix develop
71-
72-
# Build Redot (use 'macos' on macOS, 'linuxbsd' on Linux)
73-
scons platform=linuxbsd # or: scons platform=macos
74-
75-
# Run the editor - binary name reflects your platform and architecture
76-
# Examples: redot.linuxbsd.editor.x86_64, redot.macos.editor.arm64
77-
./bin/redot.<platform>.editor.<arch>
78-
```
79-
80-
Nix works on Linux and macOS, and is available at [nixos.org/download.html](https://nixos.org/download.html). The `nix run .` command automatically detects your platform and architecture.
66+
Detailed Nix usage, including passing SCons build flags through `nix run`, forwarding runtime arguments, and manual `nix develop` workflows, is documented in the `Nix usage guide` at `doc/nix.md`.
8167

8268

8369
## Community and contributing

REDOT_AUTHORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ name is available.
3131

3232
## Developers
3333

34+
Abdul Rehman (AR-DEV-1)
3435
Adam Vondersaar (trashguy)
3536
Andevrs (tindrew)
3637
Arctis Fireblight

core/os/os.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,10 @@ String OS::get_system_dir(SystemDir p_dir, bool p_shared_storage) const {
341341
return ".";
342342
}
343343

344+
String OS::expand_path(const String &p_path) const {
345+
return p_path;
346+
}
347+
344348
void OS::create_lock_file() {
345349
if (Engine::get_singleton()->is_recovery_mode_hint()) {
346350
return;

core/os/os.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,8 @@ class OS {
327327
/// Access system-specific dirs like Documents, Downloads, etc.
328328
virtual String get_system_dir(SystemDir p_dir, bool p_shared_storage = true) const;
329329

330+
virtual String expand_path(const String &p_path) const;
331+
330332
virtual Error move_to_trash(const String &p_path) { return FAILED; }
331333

332334
void create_lock_file();

core/variant/type_info.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@
3838
* [Add any documentation that applies to the entire file here!]
3939
*/
4040

41+
#include "core/object/object.h"
4142
#include "core/templates/simple_type.h"
4243
#include "core/typedefs.h"
44+
#include "core/variant/variant.h"
4345

4446
#include <type_traits>
4547

0 commit comments

Comments
 (0)