Skip to content

Commit

Permalink
Mass replaced godot to pandemonium.
Browse files Browse the repository at this point in the history
  • Loading branch information
Relintai committed Mar 23, 2022
1 parent 174326d commit 32f148a
Show file tree
Hide file tree
Showing 554 changed files with 14,184 additions and 13,744 deletions.
4 changes: 2 additions & 2 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ KeepEmptyLinesAtTheStartOfBlocks: false
# SpacesInConditionalStatement: false
# SpacesInContainerLiterals: true
# SpacesInCStyleCastParentheses: false
## Godot TODO: We'll want to use a min of 1, but we need to see how to fix
## Pandemonium TODO: We'll want to use a min of 1, but we need to see how to fix
## our comment capitalization at the same time.
SpacesInLineCommentPrefix:
Minimum: 0
Expand Down Expand Up @@ -185,5 +185,5 @@ ObjCBlockIndentWidth: 4
### Java specific config ###
Language: Java
# BreakAfterJavaFieldAnnotations: false
JavaImportGroups: ['org.godotengine', 'android', 'androidx', 'com.android', 'com.google', 'java', 'javax']
JavaImportGroups: ['net.relintai.pandemonium', 'android', 'androidx', 'com.android', 'com.google', 'java', 'javax']
...
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
name: Bug report
about: Report a bug in Godot
about: Report a bug in Pandemonium
title: ''
labels: ''
assignees: ''

---

**Godot version:**
**Pandemonium version:**

**OS/device including version:**

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Build Godot
description: Build Godot with the provided options.
name: Build Pandemonium
description: Build Pandemonium with the provided options.
inputs:
target:
description: The scons target (debug/release_debug/release).
Expand All @@ -11,7 +11,7 @@ inputs:
description: If tests are to be built.
default: false
platform:
description: The Godot platform to build.
description: The Pandemonium platform to build.
required: false
sconsflags:
default: ""
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Setup Godot build cache
description: Setup Godot build cache.
name: Setup Pandemonium build cache
description: Setup Pandemonium build cache.
inputs:
cache-name:
description: The cache base name (job name by default).
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions .github/actions/upload-artifact/action.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Upload Godot artifact
description: Upload the Godot artifact.
name: Upload Pandemonium artifact
description: Upload the Pandemonium artifact.
inputs:
name:
description: The artifact name.
Expand All @@ -11,7 +11,7 @@ inputs:
runs:
using: "composite"
steps:
- name: Upload Godot Artifact
- name: Upload Pandemonium Artifact
uses: actions/upload-artifact@v2
with:
name: ${{ inputs.name }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/android_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,33 +33,33 @@ jobs:
with:
java-version: 11

- name: Setup Godot build cache
uses: ./.github/actions/godot-cache
- name: Setup Pandemonium build cache
uses: ./.github/actions/pandemonium-cache
continue-on-error: true

- name: Setup python and scons
uses: ./.github/actions/godot-deps
uses: ./.github/actions/pandemonium-deps

- name: Compilation (armv7)
uses: ./.github/actions/godot-build
uses: ./.github/actions/pandemonium-build
with:
sconsflags: ${{ env.SCONSFLAGS }} android_arch=armv7
platform: android
target: release
tools: false

- name: Compilation (arm64v8)
uses: ./.github/actions/godot-build
uses: ./.github/actions/pandemonium-build
with:
sconsflags: ${{ env.SCONSFLAGS }} android_arch=arm64v8
platform: android
target: release
tools: false

- name: Generate Godot templates
- name: Generate Pandemonium templates
run: |
cd platform/android/java
./gradlew generateGodotTemplates
./gradlew generatePandemoniumTemplates
cd ../../..
ls -l bin/
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ios_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Setup Godot build cache
uses: ./.github/actions/godot-cache
- name: Setup Pandemonium build cache
uses: ./.github/actions/pandemonium-cache
continue-on-error: true

- name: Setup python and scons
uses: ./.github/actions/godot-deps
uses: ./.github/actions/pandemonium-deps

- name: Compilation (armv7)
uses: ./.github/actions/godot-build
uses: ./.github/actions/pandemonium-build
with:
sconsflags: ${{ env.SCONSFLAGS }}
platform: iphone
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/javascript_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ jobs:
run: |
emcc -v
- name: Setup Godot build cache
uses: ./.github/actions/godot-cache
- name: Setup Pandemonium build cache
uses: ./.github/actions/pandemonium-cache
continue-on-error: true

- name: Setup python and scons
uses: ./.github/actions/godot-deps
uses: ./.github/actions/pandemonium-deps

- name: Compilation
uses: ./.github/actions/godot-build
uses: ./.github/actions/pandemonium-build
with:
sconsflags: ${{ env.SCONSFLAGS }}
platform: javascript
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/linux_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
cache-name: linux-editor
target: release_debug
tools: true
bin: "./bin/godot.x11.opt.tools.64"
bin: "./bin/pandemonium.x11.opt.tools.64"
artifact: true

- name: Template (target=release, tools=no)
Expand All @@ -47,17 +47,17 @@ jobs:
libxinerama-dev libgl1-mesa-dev libglu-dev libasound2-dev libpulse-dev \
libdbus-1-dev libudev-dev libxi-dev libxrandr-dev yasm xvfb wget unzip
- name: Setup Godot build cache
uses: ./.github/actions/godot-cache
- name: Setup Pandemonium build cache
uses: ./.github/actions/pandemonium-cache
with:
cache-name: ${{ matrix.cache-name }}
continue-on-error: true

- name: Setup python and scons
uses: ./.github/actions/godot-deps
uses: ./.github/actions/pandemonium-deps

- name: Compilation
uses: ./.github/actions/godot-build
uses: ./.github/actions/pandemonium-build
with:
sconsflags: ${{ env.SCONSFLAGS }} ${{ matrix.sconsflags }}
platform: linuxbsd
Expand All @@ -67,7 +67,7 @@ jobs:
- name: Prepare artifact
if: ${{ matrix.artifact }}
run: |
strip bin/godot.*
strip bin/pandemonium.*
- name: Upload artifact
uses: ./.github/actions/upload-artifact
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/macos_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
cache-name: macos-editor
target: release_debug
tools: true
bin: "./bin/godot.osx.opt.tools.64"
bin: "./bin/pandemonium.osx.opt.tools.64"

- name: Template (target=release, tools=no)
cache-name: macos-template
Expand All @@ -34,17 +34,17 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Setup Godot build cache
uses: ./.github/actions/godot-cache
- name: Setup Pandemonium build cache
uses: ./.github/actions/pandemonium-cache
with:
cache-name: ${{ matrix.cache-name }}
continue-on-error: true

- name: Setup python and scons
uses: ./.github/actions/godot-deps
uses: ./.github/actions/pandemonium-deps

- name: Compilation
uses: ./.github/actions/godot-build
uses: ./.github/actions/pandemonium-build
with:
sconsflags: ${{ env.SCONSFLAGS }}
platform: osx
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/server_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,17 @@ jobs:
libxinerama-dev libgl1-mesa-dev libglu-dev libasound2-dev libpulse-dev \
libdbus-1-dev libudev-dev libxi-dev libxrandr-dev yasm xvfb wget unzip
- name: Setup Godot build cache
uses: ./.github/actions/godot-cache
- name: Setup Pandemonium build cache
uses: ./.github/actions/pandemonium-cache
with:
cache-name: ${{ matrix.cache-name }}
continue-on-error: true

- name: Setup python and scons
uses: ./.github/actions/godot-deps
uses: ./.github/actions/pandemonium-deps

- name: Compilation
uses: ./.github/actions/godot-build
uses: ./.github/actions/pandemonium-build
with:
sconsflags: ${{ env.SCONSFLAGS }} ${{ matrix.sconsflags }}
platform: server
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/windows_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
cache-name: windows-editor
target: release_debug
tools: true
bin: "./bin/godot.windows.opt.tools.64.exe"
bin: "./bin/pandemonium.windows.opt.tools.64.exe"

- name: Template (target=release, tools=no)
cache-name: windows-template
Expand All @@ -35,17 +35,17 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Setup Godot build cache
uses: ./.github/actions/godot-cache
- name: Setup Pandemonium build cache
uses: ./.github/actions/pandemonium-cache
with:
cache-name: ${{ matrix.cache-name }}
continue-on-error: true

- name: Setup python and scons
uses: ./.github/actions/godot-deps
uses: ./.github/actions/pandemonium-deps

- name: Compilation
uses: ./.github/actions/godot-build
uses: ./.github/actions/pandemonium-build
with:
sconsflags: ${{ env.SCONSFLAGS }}
platform: windows
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -338,10 +338,10 @@ cscope.files
cscope.out
cscope.in.out
cscope.po.out
godot.creator.*
pandemonium.creator.*

projects/
platform/windows/godot_res.res
platform/windows/pandemonium_res.res

# Visual Studio 2017 and Visual Studio Code workspace folder
/.vs
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ years as an in-house engine, used to publish several work-for-hire titles.

### Binary downloads

I don't have anything (lik an official webpage) set up at the moment, but temporarily you can download binaries from the github actions tab [[here]](https://github.com/Relintai/pandemonium_engine/actions).
I don't have anything (lik an official webpage) set up at the moment, but temporarily you can download binaries from the github actions tab [[here]](https://github.com/Relintai/pandemonium_engine).

### Compiling from source

Expand Down
6 changes: 3 additions & 3 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,12 @@ opts = Variables(customs, ARGUMENTS)
# Target build options
opts.Add("p", "Platform (alias for 'platform')", "")
opts.Add("platform", "Target platform (%s)" % ("|".join(platform_list),), "")
opts.Add(BoolVariable("tools", "Build the tools (a.k.a. the Godot editor)", True))
opts.Add(BoolVariable("tools", "Build the tools (a.k.a. the Pandemonium editor)", True))
opts.Add(EnumVariable("target", "Compilation target", "debug", ("debug", "release_debug", "release")))
opts.Add("arch", "Platform-dependent architecture (arm/arm64/x86/x64/mips/...)", "")
opts.Add(EnumVariable("bits", "Target platform bits", "default", ("default", "32", "64")))
opts.Add(EnumVariable("optimize", "Optimization type", "speed", ("speed", "size", "none")))
opts.Add(BoolVariable("production", "Set defaults to build Godot for use in production", False))
opts.Add(BoolVariable("production", "Set defaults to build Pandemonium for use in production", False))
opts.Add(BoolVariable("use_lto", "Use link-time optimization", False))
opts.Add(BoolVariable("use_rtti", "Use RTTI", False))
opts.Add(BoolVariable("use_exceptions", "Use exceptions", False))
Expand Down Expand Up @@ -243,7 +243,7 @@ else:
if selected_platform in ["linux", "bsd", "linuxbsd"]:
if selected_platform == "linuxbsd":
# Alias for forward compatibility.
print('Platform "linuxbsd" is still called "x11" in Godot 3.x. Building for platform "x11".')
print('Platform "linuxbsd" is still called "x11" in Pandemonium 3.x. Building for platform "x11".')
# Alias for convenience.
selected_platform = "x11"

Expand Down
2 changes: 1 addition & 1 deletion core/SCsub
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ if env["builtin_zstd"]:
env.core_sources += thirdparty_obj


# Godot source files
# Pandemonium source files

env.add_source_files(env.core_sources, "*.cpp")
env.add_source_files(env.core_sources, "script_encryption_key.gen.cpp")
Expand Down
4 changes: 2 additions & 2 deletions core/bind/core_bind.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -473,9 +473,9 @@ String _OS::get_executable_path() const {

Error _OS::shell_open(String p_uri) {
if (p_uri.begins_with("res://")) {
WARN_PRINT("Attempting to open an URL with the \"res://\" protocol. Use `ProjectSettings.globalize_path()` to convert a Godot-specific path to a system path before opening it with `OS.shell_open()`.");
WARN_PRINT("Attempting to open an URL with the \"res://\" protocol. Use `ProjectSettings.globalize_path()` to convert a Pandemonium-specific path to a system path before opening it with `OS.shell_open()`.");
} else if (p_uri.begins_with("user://")) {
WARN_PRINT("Attempting to open an URL with the \"user://\" protocol. Use `ProjectSettings.globalize_path()` to convert a Godot-specific path to a system path before opening it with `OS.shell_open()`.");
WARN_PRINT("Attempting to open an URL with the \"user://\" protocol. Use `ProjectSettings.globalize_path()` to convert a Pandemonium-specific path to a system path before opening it with `OS.shell_open()`.");
}
return OS::get_singleton()->shell_open(p_uri);
};
Expand Down
2 changes: 1 addition & 1 deletion core/color.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ Color Color::from_hsv(float p_h, float p_s, float p_v, float p_a) const {
return c;
}

// FIXME: Remove once Godot 3.1 has been released
// FIXME: Remove once Pandemonium 3.1 has been released
float Color::gray() const {
WARN_DEPRECATED_MSG("'Color.gray()' is deprecated and will be removed in a future version. Use 'Color.v' for a better grayscale approximation.");
return (r + g + b) / 3.0;
Expand Down
4 changes: 2 additions & 2 deletions core/crypto/SCsub
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if not has_module:
env_thirdparty.disable_warnings()
# Custom config file
env_thirdparty.Append(
CPPDEFINES=[("MBEDTLS_CONFIG_FILE", '\\"thirdparty/mbedtls/include/godot_core_mbedtls_config.h\\"')]
CPPDEFINES=[("MBEDTLS_CONFIG_FILE", '\\"thirdparty/mbedtls/include/pandemonium_core_mbedtls_config.h\\"')]
)
thirdparty_mbedtls_dir = "#thirdparty/mbedtls/library/"
thirdparty_mbedtls_sources = [
Expand All @@ -34,7 +34,7 @@ if not has_module:
"md5.c",
"sha1.c",
"sha256.c",
"godot_core_mbedtls_platform.c",
"pandemonium_core_mbedtls_platform.c",
]
thirdparty_mbedtls_sources = [thirdparty_mbedtls_dir + file for file in thirdparty_mbedtls_sources]
env_thirdparty.add_source_files(thirdparty_obj, thirdparty_mbedtls_sources)
Expand Down
2 changes: 1 addition & 1 deletion core/io/file_access_pack.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include "core/print_string.h"
#include "core/set.h"

// Godot's packed file magic header ("GDPC" in ASCII).
// Pandemonium's packed file magic header ("GDPC" in ASCII).
#define PACK_HEADER_MAGIC 0x43504447
// The current packed file format version number.
#define PACK_FORMAT_VERSION 1
Expand Down
Loading

0 comments on commit 32f148a

Please sign in to comment.