Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Godot Migration 1.0.0.0 to 1.0.0.5 #8

Merged
merged 131 commits into from
Oct 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
8b533db
Create a script to generate map data for the future.
Makosai Oct 27, 2022
b53e80a
Add a connection status check for the Client Manager.
Makosai Oct 27, 2022
f0a220d
Update HDRPExamples (automated).
Makosai Oct 27, 2022
44f06f1
Update packages for HDRP and terrain development.
Makosai Oct 27, 2022
9df0dc7
Update the Main Menu for the Client Manager changes.
Makosai Oct 27, 2022
ff9a4d5
Create a default scene, Rasa, to serve as a testing ground going forw…
Makosai Oct 27, 2022
709f610
Start creating the water shader.
Makosai Oct 28, 2022
7325121
Create Multi Build Manager.
Makosai Mar 20, 2023
0881f9f
Switch to Super Unity Build.
Makosai Mar 20, 2023
1ec0dcf
Generate build data.
Makosai Mar 20, 2023
e8bb672
Upgrade to Unity 2022.2.11f1.
Makosai Mar 20, 2023
a464288
Improve both the server manager and client manager.
Makosai Aug 15, 2023
65a6a6c
Begin migration to Godot 4.1
Makosai Sep 21, 2023
4a655ef
Implement a basic start to the project in Godot.
Makosai Sep 21, 2023
7123e48
Implement a basic start to the project in Godot.
Makosai Sep 22, 2023
5c242b2
Add an early combat test and physics layers.
Makosai Sep 22, 2023
a8cc345
Fix a bug with exported viewport content.
Makosai Sep 22, 2023
b5003a5
Update .gitignore
Makosai Sep 26, 2023
af39295
Improve the third person camera.
Makosai Sep 26, 2023
26037ee
Create placeholder skills for the player.
Makosai Sep 26, 2023
ab38109
Improve the lighting.
Makosai Sep 26, 2023
c557ae0
Add a Sound Manager plugin.
Makosai Sep 27, 2023
ab6ce39
Improve the plugin for Sound Manager.
Makosai Sep 27, 2023
30696c3
Import the main menu song.
Makosai Sep 27, 2023
84e498f
Add a very early temp logo for the main menu.
Makosai Sep 27, 2023
72e7c0c
Move the menu song so it's organized.
Makosai Sep 27, 2023
3f62c2e
Create audio busses.
Makosai Sep 27, 2023
04aecfe
Improve the main menu ui.
Makosai Sep 27, 2023
7572dda
Add functionality to the Game Manager.
Makosai Sep 27, 2023
b8acfff
Fix an error with an unused tween.
Makosai Sep 27, 2023
d3fe717
Create FUNDING.yml
Makosai Sep 27, 2023
7e1d317
Add screen_space shaders for inventory UI.
Makosai Sep 28, 2023
9d71692
Update the Constants for Inventory vars.
Makosai Sep 28, 2023
7a9cad5
Update the Game Manager to use the new Constants and enums.
Makosai Sep 28, 2023
da1b31d
Update the SoundManager addon to allow more busses.
Makosai Sep 28, 2023
94da21b
Create a custom atlas for Inventory icons.
Makosai Sep 28, 2023
36508da
Update the Main Menu so volume works.
Makosai Sep 28, 2023
2fbc100
Add a new keybind for the Inventory UI.
Makosai Sep 28, 2023
4718490
Start implementing the Inventory system.
Makosai Sep 28, 2023
6091861
Fix a bug with the max fps in the Game Manager.
Makosai Sep 28, 2023
dd1cc3b
Improve the accuracy of the volume sliders.
Makosai Sep 28, 2023
04441cb
Update the game Game Manager to auto update_fps().
Makosai Sep 29, 2023
e5580b7
Set a minimum window size.
Makosai Sep 29, 2023
4e97184
Update the INVENTORY_SELECTOR_POS for the UI.
Makosai Sep 29, 2023
c2f956b
Fix a bug where the inventory UI blocks buttons.
Makosai Sep 29, 2023
ab50816
Update the Inventory UI.
Makosai Sep 29, 2023
a77910c
Use enums for the tab names so it's protected.
Makosai Sep 29, 2023
b1fcab6
Create test items.
Makosai Sep 29, 2023
d33e0d0
Add a temp item to the player's inventory to test.
Makosai Sep 30, 2023
9777b47
Start tracking the color palette.
Makosai Sep 30, 2023
0d99119
Turn on Blender import support.
Makosai Oct 1, 2023
e5bff82
Update COLORS.md
Makosai Oct 1, 2023
654f792
Add animation and change the character model.
Makosai Oct 1, 2023
94fed3e
Create a format for changelogs.
Makosai Oct 1, 2023
39708dd
Create a billboard shader for attackable health.
Makosai Oct 2, 2023
351c3bb
Create a Minimap and a radial fading mask shader.
Makosai Oct 2, 2023
d3ee440
Clean up the minimap_mask shader.
Makosai Oct 2, 2023
cf2eb35
Clean up the player_hud script.
Makosai Oct 2, 2023
11cdade
Add backlighting to attackable health bars.
Makosai Oct 2, 2023
2f82eed
Create minimap icons and hide all other objects EXCEPT the ground.
Makosai Oct 2, 2023
beaaae7
Change the order of the inventory tabs.
Makosai Oct 2, 2023
4689139
Update the inventory constant colors to include alphas.
Makosai Oct 2, 2023
0efec25
Document more colors in the markdown.
Makosai Oct 2, 2023
457b2ae
Finalize the layout of the changelog file.
Makosai Oct 2, 2023
eeca9fb
Fix changelog json layout.
Makosai Oct 3, 2023
39e9495
Set the item texture in the inventory.
Makosai Oct 3, 2023
6f6ee22
Change the minimap camera to render 30 times/sec for efficiency.
Makosai Oct 3, 2023
246b86a
Change the softness of the minimap.
Makosai Oct 3, 2023
fb07c69
Change the tint of the minimap back to blue.
Makosai Oct 3, 2023
a736467
Add a transparency slider to the minimap.
Makosai Oct 3, 2023
851c35c
Reset the velocity of the player.
Makosai Oct 3, 2023
5c6d51a
Prevent the model from being edited (we only need the animation player)
Makosai Oct 3, 2023
2115908
Fix lingering warnings.
Makosai Oct 3, 2023
3049970
Create a temporary background for the main menu.
Makosai Oct 3, 2023
d710297
Apply the fix the for annoyingly godforsaken "Viewport Texture must b…
Makosai Oct 3, 2023
fadde21
Show the game in fullscreen by default now.
Makosai Oct 4, 2023
7bcc303
Create a way to get and read files and folders.
Makosai Oct 4, 2023
268b69e
Create the UI for the changelog.
Makosai Oct 4, 2023
13c7214
Create the changelog script and temp data.
Makosai Oct 4, 2023
d756ab1
Update the colors documentation.
Makosai Oct 4, 2023
0c044b4
Improve the changelog system.
Makosai Oct 4, 2023
f22e219
Improve the clock format for the changelog.
Makosai Oct 4, 2023
3ad3dc6
Set the dates and times for all changelogs.
Makosai Oct 4, 2023
fd78ca0
Started documenting the changes.
Makosai Oct 4, 2023
246d56d
Start including export_presets for automated builds.
Makosai Oct 4, 2023
55a9efd
Create a Github Action for Godot.
Makosai Oct 4, 2023
b267a49
Update the action version used and change the platform.
Makosai Oct 4, 2023
12def6f
Add an actions badge to the readme and also fix the executable name.
Makosai Oct 4, 2023
fdc82b9
Finalize the executable name. Automatically create a release note and…
Makosai Oct 5, 2023
f15e28a
Update godot.yml
Makosai Oct 5, 2023
963482e
Update godot.yml
Makosai Oct 5, 2023
e78fefb
Update godot.yml
Makosai Oct 5, 2023
cee7a2f
Update godot.yml
Makosai Oct 5, 2023
5a81d1e
Create a new tree and leaves shader.
Makosai Oct 5, 2023
0c96cfd
Start doing VFX tests, glowing, and night time!
Makosai Oct 6, 2023
e0b2714
Start creating an explosion attack.
Makosai Oct 7, 2023
f9767ad
Improve the new skill.
Makosai Oct 8, 2023
26a8c3e
Add an attachment node for the player's hand.
Makosai Oct 8, 2023
b751831
Make the animation active on ready.
Makosai Oct 8, 2023
d479fa4
Update the position of the fireball assets.
Makosai Oct 8, 2023
0f4579f
Update ability functionality.
Makosai Oct 9, 2023
3e987fa
Implement a water shader.
Makosai Oct 11, 2023
39793d0
Clean up unused water shaders.
Makosai Oct 11, 2023
97c30e7
Create a water mask shader.
Makosai Oct 11, 2023
ac5bc10
Improve the water shader.
Makosai Oct 12, 2023
88d85b8
Update water_simulation.tres
Makosai Oct 13, 2023
7603493
Set the main scene back to main menu.
Makosai Oct 13, 2023
df2fdfa
Move the main menu script to the root node and change the female_play…
Makosai Oct 13, 2023
cff86f9
Play the Idle character animation in the main menu.
Makosai Oct 13, 2023
5504a1d
Remove the light shader for the water.
Makosai Oct 13, 2023
2adf161
Increase all water resolutions to 1024.
Makosai Oct 14, 2023
159b537
Create water textures (caustics and foam).
Makosai Oct 27, 2023
6f7ad77
Rewrite the shader in GLSL to understand it better.
Makosai Oct 27, 2023
d378554
Create a simulation texture for the water.
Makosai Oct 27, 2023
32f159c
Update water simulation default values.
Makosai Oct 27, 2023
a4b1513
Remove unused shader parameter from the water_helper.
Makosai Oct 27, 2023
6d0c0e1
Improve the water shader's color, reflections, and add foam to object…
Makosai Oct 27, 2023
aeb3674
Remove the unused stylized_water shader.
Makosai Oct 27, 2023
afccc3a
Clean up the project and make the water shader a PackedScene.
Makosai Oct 27, 2023
a1e3aae
Improve the water helper.
Makosai Oct 27, 2023
883ed73
Add the newly created water to the main game scene.
Makosai Oct 27, 2023
d687dbe
Create a darker shade of water.
Makosai Oct 28, 2023
c51fa7e
Clean up main scene.
Makosai Oct 28, 2023
ce912e0
Create enumerators for core game types like elements and soulstones.
Makosai Oct 29, 2023
73cb823
Reorganize the resource location for items.
Makosai Oct 29, 2023
6ca9f0d
Move the ItemData file and improve it with an Stackable version and g…
Makosai Oct 29, 2023
84becab
Create scripts for possible ItemData types and create a Soulstone Slo…
Makosai Oct 29, 2023
df76772
Update inventory_item.tscn
Makosai Oct 29, 2023
f1f96b2
Improve the inventory system and remove slots.
Makosai Oct 29, 2023
699fc49
Fix a bug where super() is called when it doesn't exist.
Makosai Oct 29, 2023
ce7dab9
Enable file logging.
Makosai Oct 29, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Normalize EOL for all files that Git considers text files.
* text=auto eol=lf
60 changes: 60 additions & 0 deletions .github/workflows/godot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: Godot Builder

on:
pull_request: {}
push:
tags:
- 'v*'

jobs:
Godot:
runs-on: ubuntu-latest
strategy:
matrix:
platform: [win64] #, linux, mac]
steps:
- name: Format Tag Name
id: replace_string
uses: frabert/replace-string-action@v2
with:
pattern: '\.'
string: ${{ github.ref_name }}
replace-with: '_'
- uses: actions/checkout@v2
with:
lfs: false
- name: Build
id: build
uses: manleydev/[email protected]
with:
name: "Reia_${{ steps.replace_string.outputs.replaced }}.exe"
preset: ${{ matrix.platform }}
debugMode: "false"
- name: Create Release And Upload Asset
uses: softprops/action-gh-release@v1
if: ${{startsWith(github.ref, 'refs/tags/') }}
with:
files: build/Reia_${{ steps.replace_string.outputs.replaced }}.exe
body: |
# Reia - `${{ github.ref_name }}`

...

### Changes
**Added:**
- ...

**Removed:**
- ...

**Changed:**
- ...

**Fixed:**
- ...

----

...
draft: true
prerelease: true
13 changes: 0 additions & 13 deletions .github/workflows/greetings.yml

This file was deleted.

19 changes: 0 additions & 19 deletions .github/workflows/stale.yml

This file was deleted.

53 changes: 0 additions & 53 deletions .github/workflows/unity.yml

This file was deleted.

81 changes: 14 additions & 67 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,71 +1,18 @@
# This .gitignore file should be placed at the root of your Unity project directory
#
# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
#
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/[Ll]ogs/
/[Uu]ser[Ss]ettings/
# Godot 4+ specific ignores
.godot/

# MemoryCaptures can get excessive in size.
# They also could contain extremely sensitive data
/[Mm]emoryCaptures/
# Godot-specific ignores
.import/
export.cfg
# export_presets.cfg

# Asset meta data should only be ignored when the corresponding asset is also ignored
!/[Aa]ssets/**/*.meta
# Imported translations (automatically generated from CSV files)
*.translation

# Uncomment this line if you wish to ignore the asset store tools plugin
# /[Aa]ssets/AssetStoreTools*
# Mono-specific ignores
.mono/
data_*/
mono_crash.*.json

# Autogenerated Jetbrains Rider plugin
/[Aa]ssets/Plugins/Editor/JetBrains*

# Visual Studio cache directory
.vs/

# Gradle cache directory
.gradle/

# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/
*.csproj
*.unityproj
*.sln
*.suo
*.tmp
*.user
*.userprefs
*.pidb
*.booproj
*.svd
*.pdb
*.mdb
*.opendb
*.VC.db

# Unity3D generated meta files
*.pidb.meta
*.pdb.meta
*.mdb.meta

# Unity3D generated file on crash reports
sysinfo.txt

# Builds
*.apk
*.aab
*.unitypackage

# Crashlytics generated file
crashlytics-build.properties

# Packed Addressables
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*

# Temporary auto-generated Android Assets
/[Aa]ssets/[Ss]treamingAssets/aa.meta
/[Aa]ssets/[Ss]treamingAssets/aa/*
# Build
.builds/
6 changes: 0 additions & 6 deletions .vsconfig

This file was deleted.

8 changes: 0 additions & 8 deletions Assets/Builds.meta

This file was deleted.

8 changes: 0 additions & 8 deletions Assets/Builds/BuildSettings.meta

This file was deleted.

17 changes: 0 additions & 17 deletions Assets/Builds/BuildSettings/MainBuildSettings.buildsettings

This file was deleted.

10 changes: 0 additions & 10 deletions Assets/Builds/BuildSettings/MainBuildSettings.buildsettings.meta

This file was deleted.

15 changes: 0 additions & 15 deletions Assets/Builds/BuildSettings/Win32DebugBuildSettings.buildsettings

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

15 changes: 0 additions & 15 deletions Assets/Builds/BuildSettings/Win64DebugBuildSettings.buildsettings

This file was deleted.

Loading