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

Auto evo exploration species flagging #3737

Closed
wants to merge 5,632 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5632 commits
Select commit Hold shift + click to select a range
e35ceca
Update translation files
weblate Aug 18, 2022
8708aa1
Translated using Weblate (Portuguese (Brazil))
Capivaresco Aug 18, 2022
811e3e0
Translated using Weblate (Ukrainian)
Teashrock Aug 18, 2022
2a666bf
Translated using Weblate (Indonesian)
Athriq Aug 18, 2022
22485d5
Merge remote-tracking branch 'weblate/master'
hhyyrylainen Aug 18, 2022
f231a69
Ran localization fix
hhyyrylainen Aug 18, 2022
ac03f01
Implemented a bare-boned skeleton for GUI menu of filter selection
Maxonovien Aug 18, 2022
1703019
various code cleaning
Maxonovien Aug 18, 2022
ce1fd3e
added proper filter implementation
Maxonovien Aug 18, 2022
43d1f64
Hide `DraggableScrollContainer`'s scroll bars by default (#3731)
Athriq Aug 19, 2022
7b7c0e8
Added options to window
Maxonovien Aug 19, 2022
61cc663
slight cleanup
Maxonovien Aug 19, 2022
927cbe1
Added button text update
Maxonovien Aug 19, 2022
99452ba
Implemented proper exception for filter category + made Argument valu…
Maxonovien Aug 19, 2022
fed5265
Made multiple choice arguments working (also works due to default val…
Maxonovien Aug 19, 2022
0a1da20
cleaning
Maxonovien Aug 19, 2022
366e241
moved filter to its own class in general/
Maxonovien Aug 19, 2022
4b50e87
Added slider for numbers (no effect)
Maxonovien Aug 20, 2022
ef63d76
added displayed value update on slider value change
Maxonovien Aug 20, 2022
4ad7fad
Updated filter with slider!
Maxonovien Aug 20, 2022
3848293
factorization
Maxonovien Aug 20, 2022
9615fdd
Merge branch 'master' into auto_evo_exploration_search_bar
Maxonovien Aug 20, 2022
fd3161c
swap to custom confirmation dialog
Maxonovien Aug 20, 2022
fe98916
Used CustomConfirmationDialog
Maxonovien Aug 20, 2022
55ddd12
Merge branch 'auto_evo_exploration_search_bar' of https://github.com/…
Maxonovien Aug 20, 2022
8012ee3
Cleaning
Maxonovien Aug 20, 2022
974dec2
Added labels to the filter window
Maxonovien Aug 20, 2022
3d23c81
Used correct default value for filters
Maxonovien Aug 20, 2022
4501da8
Extended filter window min size for argument display
Maxonovien Aug 20, 2022
2f83d6d
Fixed dialog
84634E1A607A Aug 21, 2022
0084d44
Show patch name overlay over key prompts tutorial (#3739)
Athriq Aug 21, 2022
73e517d
Exploring tool behaviour dictionary value locales (#3738)
84634E1A607A Aug 21, 2022
98ae406
Merge branch 'auto_evo_exploration_search_bar' of https://github.com/…
Maxonovien Aug 21, 2022
a17ad43
Removed outdated todo
Maxonovien Aug 21, 2022
e87b875
swapped to scene for multiple choice buttons
Maxonovien Aug 21, 2022
2faae07
swapped to scene for slider scene
Maxonovien Aug 22, 2022
7125dc8
Fixed double connect + cleaning
Maxonovien Aug 22, 2022
4f6e1c7
cleaning
Maxonovien Aug 22, 2022
264ba85
Renamed MultipleChoiceFilterArgumentButton to FilterArgumentPopupMenu
Maxonovien Aug 22, 2022
65f2f4c
Removed useless functions
Maxonovien Aug 22, 2022
cf33a06
Reverted to use of foreach as index is no longer needed
Maxonovien Aug 22, 2022
27e1084
removed unused functions
Maxonovien Aug 22, 2022
6ce88a8
Used scene for filter lines
Maxonovien Aug 22, 2022
7a76723
Removed unused code
Maxonovien Aug 22, 2022
9736b63
Used queuefree instead of free
Maxonovien Aug 22, 2022
73aec1b
set up snapshot of filters
Maxonovien Aug 22, 2022
870f798
added basic (and unstable) snapshot restoration for arguments
Maxonovien Aug 22, 2022
4dd0698
New multicellular tracks (#3736)
Oliveriver Aug 23, 2022
4504c6b
cleaning
Maxonovien Aug 23, 2022
d152df6
Patch map in exploring tool (#3728)
84634E1A607A Aug 23, 2022
4105f24
Added cancelled changes on exit + Moved some in-code instanciated ele…
Maxonovien Aug 23, 2022
7b218d0
Merge branch 'master' into auto_evo_exploration_search_bar
Maxonovien Aug 24, 2022
31bef34
Restored filter window after merge
Maxonovien Aug 24, 2022
c1799e8
Nicer syntax for exception
Maxonovien Aug 24, 2022
a8d1e94
Did some cleaning
Maxonovien Aug 24, 2022
da92200
Fixed bug with selecting category multiple times
Maxonovien Aug 24, 2022
2953657
Cleaned debug
Maxonovien Aug 24, 2022
2f03c67
Further cleaning
Maxonovien Aug 24, 2022
8454d68
Made filter a generic class
Maxonovien Aug 24, 2022
ee2e349
Fixed bug when snapshooting default value
Maxonovien Aug 24, 2022
cc7ab6b
Added infrastructure for multiple filters
Maxonovien Aug 24, 2022
bda09bd
Added button to add new filters
Maxonovien Aug 24, 2022
7bec52a
Added multiple filter addition (no snapshot for new filters)
Maxonovien Aug 24, 2022
32c1ed0
Translated using Weblate (Italian)
Aug 25, 2022
c1467a0
Translated using Weblate (French)
Aug 25, 2022
1b82dad
Translated using Weblate (German)
Vyethriel Aug 25, 2022
7c53e9a
Translated using Weblate (Turkish)
punctdan Aug 25, 2022
634a271
Translated using Weblate (Polish)
Addalllad Aug 25, 2022
2ca130d
Translated using Weblate (Indonesian)
Athriq Aug 25, 2022
a62767c
Translated using Weblate (Bulgarian)
RacerBG Aug 25, 2022
071299c
Update translation files
weblate Aug 25, 2022
b82688b
Translated using Weblate (Hebrew)
doomlightning Aug 25, 2022
a9ed0da
Translated using Weblate (Portuguese (Brazil))
Capivaresco Aug 25, 2022
b0ee087
Translated using Weblate (Ukrainian)
Aug 25, 2022
bdcde96
Translated using Weblate (Ukrainian)
Aug 25, 2022
a09a562
Translated using Weblate (Hungarian)
Undibundi Aug 25, 2022
cfa0793
Merge pull request #3733 from revolutionary-translation-bot/weblate-t…
hhyyrylainen Aug 25, 2022
57f3233
Fixed translation line changes by weblate again
hhyyrylainen Aug 25, 2022
1a18f13
cleaning a bit
Maxonovien Aug 25, 2022
39417ff
Added comment for exception throwing
Maxonovien Aug 25, 2022
a176cbb
Fixed typo
Maxonovien Aug 25, 2022
2db75d2
Added snapshot restoration for filter addition/removal
Maxonovien Aug 29, 2022
173bb7c
Cleaning
Maxonovien Aug 29, 2022
c3f82ab
Set lawk only option to default to true (#3752)
camilomcatasus Aug 31, 2022
465f25d
Update translation files
weblate Aug 31, 2022
3387fd3
Translated using Weblate (Italian)
Aug 31, 2022
6e9c3d6
Translated using Weblate (Bulgarian)
RacerBG Aug 31, 2022
d779dd4
Translated using Weblate (Ukrainian)
Aug 31, 2022
4a0033a
Translated using Weblate (English)
Addalllad Aug 31, 2022
2df6aae
Translated using Weblate (English)
hhyyrylainen Aug 31, 2022
9ea6f2e
Translated using Weblate (Turkish)
punctdan Aug 31, 2022
df2c922
Translated using Weblate (Hebrew)
doomlightning Aug 31, 2022
0b6aac5
Mod loader now gives an explicit error if a pck file doesn't exist (#…
hhyyrylainen Aug 31, 2022
8e777ec
Simple SceneTree dumper to help illustrating SceneTree problems (#3749)
84634E1A607A Aug 31, 2022
b249dac
Merge remote-tracking branch 'weblate/master'
hhyyrylainen Aug 31, 2022
c3a1f71
Replace the MP in editor part costs with a circle-less MP icon (#3740)
Athriq Aug 31, 2022
0f71e79
Add new Multicellular concept art (#3753)
Oliveriver Aug 31, 2022
1db7b24
Updated compounds button icon and added environment button icons
hhyyrylainen Sep 3, 2022
90e5076
Initial Balancing Pass for Timed Reproduction (#3722)
Deus-Codes Sep 10, 2022
f406310
Converted ruby scripts to C# scripts (#3764)
hhyyrylainen Sep 10, 2022
6416451
Moved the Thrive export folder name computation to the common project
hhyyrylainen Sep 10, 2022
011a573
Properly updated submodules, missed from previous commit
hhyyrylainen Sep 10, 2022
0f33d83
Update translation files
weblate Sep 10, 2022
73d18b2
Translated using Weblate (Turkish)
punctdan Sep 10, 2022
5fd3fc4
Translated using Weblate (Italian)
Sep 10, 2022
f812d8f
Translated using Weblate (Hebrew)
doomlightning Sep 10, 2022
5a4d9d0
Translated using Weblate (Ukrainian)
Sep 10, 2022
b3a82a9
Translated using Weblate (Slovak)
Torchasvk Sep 10, 2022
de07f60
Translated using Weblate (Spanish)
SebastianQB Sep 10, 2022
866fd5a
Merge pull request #3746 from revolutionary-translation-bot/weblate-t…
hhyyrylainen Sep 10, 2022
2659254
Fixed line breaks in few translation files
hhyyrylainen Sep 10, 2022
b00bba3
Added compile check workaround for Windows (#3767)
hhyyrylainen Sep 11, 2022
f71f724
Properly restore the "orphaned" tooltips (#3747)
84634E1A607A Sep 11, 2022
0b1f5e1
Added cache for `DataPoint` (#3748)
84634E1A607A Sep 11, 2022
d5f15c1
Add save filename parsing safeguards against invalid numbers (#3768)
blouflashdb Sep 12, 2022
8572b4e
Show exact build commit in the game, and show more info in devbuilds …
hhyyrylainen Sep 12, 2022
de37fba
Fixed tutorial starting in auto-evo exploring tool (#3718) (#3777)
TheHungryBandito Sep 13, 2022
ef9f556
Added environment button and selective environment panel hiding (#3762)
camilomcatasus Sep 14, 2022
5161531
Moved Godot template install path method to common module (#3774)
hhyyrylainen Sep 14, 2022
84cfc85
Progress on macroscopic stage prototype (#3772)
hhyyrylainen Sep 15, 2022
d65afce
Added patch move button visibility property (#3744) (#3780)
TheHungryBandito Sep 15, 2022
bd9d5c6
Improved the working with translations documentation a bit (#3781)
hhyyrylainen Sep 15, 2022
5839bbd
Attempt at entity weighting
Oliveriver Aug 17, 2022
4fe223b
Implemented settings post load validation for entity limit
hhyyrylainen Sep 12, 2022
0c4f15a
Fixed a bug with entity despawning not continuing to count all entiti…
hhyyrylainen Sep 15, 2022
b4c0820
Merge pull request #3754 from Revolutionary-Games/entity_weighting
hhyyrylainen Sep 15, 2022
42c8328
Rework predation in auto evo (#3306)
Maxonovien Sep 15, 2022
5395f7f
Fixed the outdated path to requirements.txt used in checks (#3783)
hhyyrylainen Sep 15, 2022
826e3aa
Add mucilage (slime) (#3590)
Oliveriver Sep 15, 2022
9ed33de
Added suggestions site button (#3714) (#3782)
TheHungryBandito Sep 15, 2022
6827021
Translated using Weblate (Croatian)
ivanbratovic Sep 15, 2022
9ffc185
Translated using Weblate (French)
Sep 15, 2022
82a8ae4
Translated using Weblate (French)
Maxonovien Sep 15, 2022
94b00cd
Translated using Weblate (Turkish)
punctdan Sep 15, 2022
171c929
Translated using Weblate (Ukrainian)
Sep 15, 2022
d701310
Update translation files
weblate Sep 15, 2022
2ac6b1b
Translated using Weblate (Bulgarian)
RacerBG Sep 15, 2022
b08f949
Merge pull request #3778 from revolutionary-translation-bot/weblate-t…
hhyyrylainen Sep 15, 2022
04a760c
Ran localization fix
hhyyrylainen Sep 15, 2022
f225c81
Hooked up Croatian in the game and fixed a few text problems (#3785)
hhyyrylainen Sep 15, 2022
a923bc2
Update translation files
weblate Sep 15, 2022
a3317c4
Merge pull request #3784 from revolutionary-translation-bot/weblate-t…
hhyyrylainen Sep 15, 2022
d5c1ac5
Fixed hr.po line changes
hhyyrylainen Sep 15, 2022
6dd19ab
Fixed the hotbar overlapping on the bottom left buttons (#3788)
hhyyrylainen Sep 16, 2022
5231fab
Fixed Steam package including the wrong license files (#3789)
hhyyrylainen Sep 16, 2022
4b9caf9
New Ambient Tracks (#3786)
nickthenick Sep 17, 2022
ef7103e
Fixed slime sound playing without jets and related input issue (#3793)
Oliveriver Sep 17, 2022
186b552
Changes for 0.5.10.rc1 (#3790)
hhyyrylainen Sep 17, 2022
67b014e
Updated common submodule
hhyyrylainen Sep 17, 2022
242c3aa
Implemented mucilage icon (#3795)
buckly90 Sep 19, 2022
8bbfec8
Added the missing mucilage HUD things to multicellular to stop it cra…
hhyyrylainen Sep 19, 2022
e14ef36
Adjusted entity limits (#3801)
Oliveriver Sep 20, 2022
04f26e6
Fix sessile organisms moving towards the player when they spawn (#3796)
Oliveriver Sep 20, 2022
6bc395c
Allow other cells in colonies to use slime jets (#3803)
Oliveriver Sep 20, 2022
2e417ab
Switch order for timed reproduction (base cost before organelles) and…
Oliveriver Sep 20, 2022
c339b3a
Doubled the speed of early multicellular timed reproduction (#3806)
hhyyrylainen Sep 20, 2022
24aa5a3
Made the max spawned setting use a different JSON name (#3805)
hhyyrylainen Sep 21, 2022
0b47e28
New slime jet icons (#3804)
Oliveriver Sep 22, 2022
db97403
Balancepass 0.5.10 (#3807)
buckly90 Sep 22, 2022
ce790a2
Translated using Weblate (Czech)
selawin Sep 22, 2022
5ef7050
Translated using Weblate (Turkish)
punctdan Sep 22, 2022
4145921
Translated using Weblate (Polish)
Addalllad Sep 22, 2022
7f6b46d
Translated using Weblate (Portuguese (Brazil))
Capivaresco Sep 22, 2022
941fd3b
Translated using Weblate (Catalan)
aleixcoma Sep 22, 2022
ec07b1c
Translated using Weblate (Bulgarian)
RacerBG Sep 22, 2022
99f4d5b
Translated using Weblate (Russian)
simsanutiy Sep 22, 2022
510d100
Translated using Weblate (Hebrew)
doomlightning Sep 22, 2022
ffe0565
Translated using Weblate (Arabic)
Ghurir Sep 22, 2022
bea68a2
Translated using Weblate (Ukrainian)
Sep 22, 2022
7e877e0
Translated using Weblate (Croatian)
ivanbratovic Sep 22, 2022
3da5e53
Merge pull request #3809 from revolutionary-translation-bot/weblate-t…
hhyyrylainen Sep 22, 2022
95f4090
Fixed the mixup between the hold for cursor input and advice label text
hhyyrylainen Sep 22, 2022
0734039
Translated using Weblate (Turkish)
punctdan Sep 23, 2022
cf780d4
Translated using Weblate (Polish)
Addalllad Sep 23, 2022
d7eeb47
Translated using Weblate (Portuguese (Brazil))
Capivaresco Sep 23, 2022
d9643b6
Translated using Weblate (Catalan)
aleixcoma Sep 23, 2022
2308df4
Translated using Weblate (Bulgarian)
RacerBG Sep 23, 2022
7119c4a
Translated using Weblate (Russian)
simsanutiy Sep 23, 2022
2acff27
Translated using Weblate (Chinese (Simplified))
84634E1A607A Sep 23, 2022
31fd905
Translated using Weblate (Hebrew)
doomlightning Sep 23, 2022
e14d5ab
Merge pull request #3814 from revolutionary-translation-bot/weblate-t…
hhyyrylainen Sep 23, 2022
ca967a1
Final changes for release 0.5.10 (#3811)
hhyyrylainen Sep 24, 2022
2bfd8e7
Fixed build status link in README.md
hhyyrylainen Sep 24, 2022
63263f1
Added safe mode to guard against mods that crash on startup (and warn…
hhyyrylainen Sep 29, 2022
92a5311
Translated using Weblate (English)
hhyyrylainen Sep 29, 2022
bc5235e
Translated using Weblate (Italian)
Sep 29, 2022
e331129
Translated using Weblate (Turkish)
punctdan Sep 29, 2022
6388a37
Translated using Weblate (Bulgarian)
RacerBG Sep 29, 2022
a7c7e2c
Translated using Weblate (Ukrainian)
Sep 29, 2022
b194836
Update translation files
weblate Sep 29, 2022
0d34d82
Merge pull request #3817 from revolutionary-translation-bot/weblate-t…
hhyyrylainen Sep 29, 2022
e2c7873
Fixed line breaks in tr.po
hhyyrylainen Sep 29, 2022
096d7ae
Made the save unavailable in prototype warning appear in editor (#3822)
hhyyrylainen Sep 29, 2022
9258343
Changed localization update to write trimmed files without BOM (#3823)
hhyyrylainen Sep 30, 2022
fb65159
Give additional glucose that can be gained when digesting engulfed ce…
Athriq Oct 3, 2022
659f5cd
Removed a leftover ruby script that never really worked
hhyyrylainen Oct 3, 2022
fa581d9
Switched CustomRichTextLabel to only listen to input rebinding when n…
hhyyrylainen Oct 5, 2022
abbebbf
Translated using Weblate (German)
Demonter03 Oct 6, 2022
3b432bd
Translated using Weblate (Ukrainian)
Oct 6, 2022
bb66b59
Translated using Weblate (Swedish)
Marqsande Oct 6, 2022
476ff65
Translated using Weblate (Bulgarian)
RacerBG Oct 6, 2022
951da7f
Merge pull request #3824 from revolutionary-translation-bot/weblate-t…
hhyyrylainen Oct 6, 2022
432399c
Convert save screenshot without using temporary file (#3828)
Dartexxy Oct 12, 2022
44b838e
Translated using Weblate (German)
CrazyChaoz Oct 14, 2022
7757fd6
Translated using Weblate (Turkish)
punctdan Oct 14, 2022
f72cedf
Translated using Weblate (Spanish)
Oct 14, 2022
9aa4629
Translated using Weblate (Spanish)
Taenar98 Oct 14, 2022
fed065c
Translated using Weblate (Polish)
Addalllad Oct 14, 2022
7668384
Translated using Weblate (Bulgarian)
RacerBG Oct 14, 2022
6076f6b
Translated using Weblate (Portuguese (Portugal))
SylvaGX Oct 14, 2022
757d98f
Translated using Weblate (Chinese (Simplified))
gunohaozheum Oct 14, 2022
59ca012
Translated using Weblate (Romanian)
Oct 14, 2022
129935d
Merge pull request #3834 from revolutionary-translation-bot/weblate-t…
hhyyrylainen Oct 14, 2022
7d467da
Merge branch 'master' into auto_evo_exploration_search_bar
Maxonovien Oct 16, 2022
42109e0
used reflection to access behaviour keys
Maxonovien Oct 17, 2022
05f5a87
Added ComparisonFilterArgument for simpler filter building
Maxonovien Oct 23, 2022
94585b6
Replaced GetComparison function by direct Compare
Maxonovien Oct 23, 2022
3c1c241
Logic overhaul
Maxonovien Dec 13, 2022
98006f3
fixed empty node path
Maxonovien Dec 13, 2022
9bf4b8c
Updated text in filter argument
Maxonovien Dec 14, 2022
79803c6
updated text in category
Maxonovien Dec 14, 2022
ec5a1ff
updated text in property
Maxonovien Dec 14, 2022
800a077
Clean opening of the window
Maxonovien Dec 14, 2022
78505fd
cleaning
Maxonovien Dec 17, 2022
7fd7865
further cleaning
Maxonovien Dec 17, 2022
d6dbe03
fixed bug with cast
Maxonovien Dec 17, 2022
dec90b9
Fixed display of behaviour values
Maxonovien Dec 17, 2022
5da392a
Fixed update of property
Maxonovien Dec 17, 2022
449981e
Fixed filter update and conversion to function
Maxonovien Dec 17, 2022
2c7d2cb
implemented snapshoting
Maxonovien Dec 17, 2022
0e54c6c
cleaning
Maxonovien Dec 17, 2022
fa3e450
Fixed bug on cancelling search without ever applying
Maxonovien Dec 17, 2022
f54ed37
Cleaning
Maxonovien Dec 17, 2022
822a0cf
cleaning
Maxonovien Dec 26, 2022
9eee117
Fixed creash on no filter
Maxonovien Dec 26, 2022
a250ac7
Start with no filter on
Maxonovien Dec 26, 2022
c8c3f8e
cleaning
Maxonovien Dec 26, 2022
ebc1044
Moved value query to its own file
Maxonovien Dec 26, 2022
98f0d61
Fixed parameter type + cleaning
Maxonovien Dec 26, 2022
7924009
cleaning
Maxonovien Dec 26, 2022
a655edd
Added a number selection process (whole numbers only) in UI
Maxonovien Jan 8, 2023
f8e3b8b
Linked spinbox value to filter output
Maxonovien Jan 8, 2023
ee5e335
Added stats category with speed
Maxonovien Jan 16, 2023
9e0a5c4
Prevented non-sensical comparison (currently triggered by comparison …
Maxonovien Jan 16, 2023
f0cd49b
Fixed filterLines list not updating when removing lines
Maxonovien Feb 18, 2023
48cf1b7
Added some doc
Maxonovien Feb 18, 2023
330c34e
Further doc
Maxonovien Feb 18, 2023
f903cd7
Updated left query ui possible values when changing right query UI ca…
Maxonovien Feb 18, 2023
4df4368
added necessary signal and emission
Maxonovien Feb 18, 2023
1af3fec
cleaning
Maxonovien Feb 18, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
37 changes: 37 additions & 0 deletions .appveyor.yml
@@ -0,0 +1,37 @@
version: 1.0.{build}-{branch}

environment:
BOOST_ROOT: C:/Libraries/boost_1_69_0
PATH: C:\Ruby25-x64\bin;$(PATH);C:\cygwin64\bin
VULKAN_SDK: C:/VulkanSDK/1.1.114.0
GIT_LFS_SKIP_SMUDGE: 1

image:
- Visual Studio 2017

platform: x64

cache:
- ThirdParty
- assets
- VulkanSDK.exe
- .git/lfs/objects

install:
- gem install os colorize rubyzip json sha3
- if not exist VulkanSDK.exe curl -L --silent --show-error --output VulkanSDK.exe https://vulkan.lunarg.com/sdk/download/1.1.114.0/windows/VulkanSDK-1.1.114.0-Installer.exe?Human=true
- VulkanSDK.exe /S

build_script:
- git lfs pull
# - ruby SetupThrive.rb --precompiled

# test_script:
# - cd build\bin
# - .\ThriveTest ~[xrequired]

# This takes too much space to work
# artifacts:
# - path: build/bin
# name: bin folder
# type: zip
112 changes: 112 additions & 0 deletions .circleci/config.yml
@@ -0,0 +1,112 @@
version: 2.1
jobs:
jetbrains:
working_directory: ~/Thrive
docker:
- image: hhyyrylainen/godot-ci:v9
environment:
GIT_LFS_SKIP_SMUDGE: 1
CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<<pipeline.git.revision>>
steps:
- checkout
- restore_cache:
keys:
- v7-lfs-{{ .Branch }}
- v7-lfs-master
- run:
name: Pull Git LFS files, retry up to 5 times
command: |
for i in {1..5}; do git reset --hard HEAD && git clean -fd && git lfs pull && exit 0; done; exit 1
- save_cache:
key: v7-lfs-{{ .Branch }}
paths:
- .git/lfs
- run:
name: Detect changed files (since last commit and against master)
command: |
git fetch origin master
git diff-tree --no-commit-id --name-only -r HEAD..origin/master > files_to_check.txt
git diff-tree --no-commit-id --name-only -r `echo ${CIRCLE_COMPARE_URL} | cut -d/ -f 7` >> files_to_check.txt || true
- restore_cache:
keys:
- v8-import-{{ .Branch }}
- v8-import-master
- run: mkdir -p builds
# Don't care if this fails, it's enough that the C# build works
- run:
name: Just make C# project valid; don't care if asset import fails
command: |
godot --export "Linux/X11" "builds/a.x86_64" || true
- save_cache:
key: v8-import-{{ .Branch }}
paths:
- .import
- restore_cache:
keys:
- v3-nuget-{{ .Branch }}
- run: dotnet restore Thrive.sln
- save_cache:
key: v3-nuget-{{ .Branch }}
paths:
- ~/.nuget/packages
# Makes sure that there aren't any changes at this point to not make the CI trip up on them
- run:
name: Make sure no changes to git tracked files at this point
command: git reset --hard HEAD
# Inspect code (this only takes like 40 seconds for all files)
- run: ./check_formatting.rb -c inspectcode
- run: ./check_formatting.rb -c duplicatecode
# Cleanup, this takes a *long* time when checking a lot of files
- run: ./check_formatting.rb -c cleanupcode
- run:
when: always
command: |
git diff > cleanup_diff.patch
if grep -q '[^[:space:]]' < cleanup_diff.patch; then
echo "Code cleanup found things to be fixed:"
cat cleanup_diff.patch
exit 1
else
echo "No changes made"
rm -f cleanup_diff.patch
fi
- store_artifacts:
path: files_to_check.txt
- store_artifacts:
path: inspect_results.xml
- store_artifacts:
path: duplicate_results.xml
- store_artifacts:
path: cleanup_diff.patch
format_script:
working_directory: ~/Thrive
docker:
- image: hhyyrylainen/thrive-lint:v9
environment:
GIT_LFS_SKIP_SMUDGE: 1
steps:
- checkout
- run: ./check_formatting.rb -c files,localization
- run:
when: always
command: |
git diff > format_diff.patch
if grep -q '[^[:space:]]' < format_diff.patch; then
echo "Formatter found things to be fixed:"
cat format_diff.patch
exit 1
else
echo "No changes made"
rm -f format_diff.patch
fi
- store_artifacts:
path: format_diff.patch

workflows:
version: 2
format:
# Unfortunately godot is setup so that a build can't happen without having all the assets processed
# so the format script can't check C# files
jobs:
- format_script
- jetbrains
75 changes: 75 additions & 0 deletions .clang-format
@@ -0,0 +1,75 @@
---
Language: Cpp
AccessModifierOffset: '-4'
AlignAfterOpenBracket: DontAlign
AlignConsecutiveAssignments: 'false'
AlignConsecutiveDeclarations: 'false'
AlignEscapedNewlinesLeft: Left
AlignTrailingComments: 'false'
AllowAllParametersOfDeclarationOnNextLine: 'false'
AllowShortBlocksOnASingleLine: 'false'
AllowShortCaseLabelsOnASingleLine: 'true'
AllowShortFunctionsOnASingleLine: Empty
AllowShortIfStatementsOnASingleLine: 'false'
AllowShortLoopsOnASingleLine: 'false'
AlwaysBreakAfterReturnType: All
AlwaysBreakBeforeMultilineStrings: 'false'
AlwaysBreakTemplateDeclarations: 'false'
BinPackArguments: 'true'
BinPackParameters: 'false'
BreakBeforeBinaryOperators: None
# BreakBeforeBraces: Attach
BreakBeforeBraces: Custom
BraceWrapping:
AfterClass: false
AfterControlStatement: false
AfterEnum: false
AfterFunction: true
AfterNamespace: false
AfterStruct: false
AfterUnion: false
# AfterExternBlock: false
BeforeCatch: false
BeforeElse: false
IndentBraces: false
SplitEmptyFunction: true
SplitEmptyRecord: false
SplitEmptyNamespace: true
BreakBeforeInheritanceComma: 'false'
BreakBeforeTernaryOperators: 'false'
BreakConstructorInitializers: AfterColon
# Works fine even without this
# CommentPragmas: '^! \\'
CompactNamespaces: 'true'
ConstructorInitializerAllOnOneLineOrOnePerLine: 'false'
Cpp11BracedListStyle: 'true'
DerivePointerAlignment: 'false'
IndentCaseLabels: 'false'
IndentWidth: '4'
IndentWrappedFunctionNames: 'true'
KeepEmptyLinesAtTheStartOfBlocks: 'true'
MaxEmptyLinesToKeep: '3'
NamespaceIndentation: None
PointerAlignment: Left
ReflowComments: 'true'
SortIncludes: 'true'
SortUsingDeclarations: 'true'
SpaceAfterCStyleCast: 'false'
SpaceAfterTemplateKeyword: 'false'
SpaceBeforeAssignmentOperators: 'true'
SpaceBeforeParens: Never
# This is also a new setting not yet available
# SpaceBeforeRangeBasedForLoopColon: 'true'
SpaceInEmptyParentheses: 'false'
SpacesBeforeTrailingComments: '1'
SpacesInAngles: 'false'
SpacesInCStyleCastParentheses: 'false'
SpacesInParentheses: 'false'
SpacesInContainerLiterals: 'false'
SpacesInParentheses: 'false'
SpacesInSquareBrackets: 'false'
Standard: Cpp11
TabWidth: '4'
UseTab: Never

...
12 changes: 12 additions & 0 deletions .config/dotnet-tools.json
@@ -0,0 +1,12 @@
{
"version": 1,
"isRoot": true,
"tools": {
"jetbrains.resharper.globaltools": {
"version": "2022.2.1",
"commands": [
"jb"
]
}
}
}
39 changes: 39 additions & 0 deletions .gitattributes
@@ -0,0 +1,39 @@
* text=auto
*.po text linguist-generated=true
en.po text linguist-generated=false
*.pot text
*.rb text
*.sln text
*.csproj text
*.json text
*.md text
*.txt text
*.cs text
*.yml text
*.tscn text
*.tres text
*.shader text
*.xml text
*.*.import text
*.asset filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.mkv filter=lfs diff=lfs merge=lfs -text
*.ogg filter=lfs diff=lfs merge=lfs -text
*.ico filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.jpg filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.dae filter=lfs diff=lfs merge=lfs -text
*.blend filter=lfs diff=lfs merge=lfs -text
*.gltf filter=lfs diff=lfs merge=lfs -text
*.glb filter=lfs diff=lfs merge=lfs -text
*.bin filter=lfs diff=lfs merge=lfs -text
*.fbx filter=lfs diff=lfs merge=lfs -text
*.material filter=lfs diff=lfs merge=lfs -text
*.webm filter=lfs diff=lfs merge=lfs -text
*.mesh filter=lfs diff=lfs merge=lfs -text
*.anim filter=lfs diff=lfs merge=lfs -text
*.otf filter=lfs diff=lfs merge=lfs -text
*.shape filter=lfs diff=lfs merge=lfs -text
*.jpeg filter=lfs diff=lfs merge=lfs -text
*.ogv filter=lfs diff=lfs merge=lfs -text
2 changes: 2 additions & 0 deletions .github/FUNDING.yml
@@ -0,0 +1,2 @@
patreon: thrivegame
custom: https://revolutionarygamesstudio.com/donate/
54 changes: 54 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,54 @@
---
name: Bug report
about: Report technical issues (bugs)
title: ''
labels: ''
assignees: ''

---

**Important**
Please only submit technical bug reports here. This is not a place to make feature requests
or suggestions. For that please visit our suggestions site:
https://suggestions.revolutionarygamesstudio.com/

Or our community forums for longer discussions
https://community.revolutionarygamesstudio.com/

**Describe the bug**

A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behaviour:
1. Go to '...'
2. Click on new game / something else '....'
3. Play and do '....'
4. See error

**Expected behaviour**
A clear and concise description of what you expected to happen, instead of what actually
happened.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**System info (please complete the following information):**
- OS: [e.g. Windows 10]
- Graphics card (you can find this in the game logs) [e.g. OpenGL ES 3.0 Renderer:
GeForce GTX 1080 Ti/PCIe/SSE2]
- Thrive version [e.g. 0.4.0.2]

**Logs**

Please use a text hosting service (for example https://pastebin.com/) to submit your logs.
You can copy the launcher output or the contents of the following files: `log.txt` and mono
log file. You can find these log files by reading the game log to see their location.
For example:
```
Mono: Logfile is: /home/hhyyrylainen/.local/share/godot/mono/mono_logs/2020_07_21 23.10.26 (265121).txt
Game logs are written to: /home/hhyyrylainen/.local/share/Thrive/logs latest log is 'log.txt'
```

**Additional context**
Add any other context about the problem here.
12 changes: 12 additions & 0 deletions .github/dependabot.yml
@@ -0,0 +1,12 @@
version: 2
updates:
- package-ecosystem: "nuget"
directory: "/"
schedule:
interval: "daily"
labels:
- "review"
- "dependencies"
open-pull-requests-limit: 3
reviewers:
- "Revolutionary-Games/programming"
29 changes: 29 additions & 0 deletions .github/pull_request_template.md
@@ -0,0 +1,29 @@
**Brief Description of What This PR Does**

This PR does some stuff...

**Related Issues**

<!-- List all issues this PR closes here with the closes syntax:
https://docs.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword
If this is not related to an issue, it should be described in more detail why this PR is needed here instead.
-->

**Progress Checklist**

Note: before starting this checklist the PR should be marked as non-draft.

- [ ] PR author has checked that this PR works as intended and doesn't
break existing features:
https://wiki.revolutionarygamesstudio.com/wiki/Testing_Checklist
(this is important as to not waste the time of Thrive team
members reviewing this PR)
- [ ] Initial code review passed (this and further items should not be checked by the PR author)
- [ ] Functionality is confirmed working by another person (see above checklist link)
- [ ] Final code review is passed and code conforms to the
[styleguide](https://github.com/Revolutionary-Games/Thrive/blob/master/doc/style_guide.md).

Before merging all CI jobs should finish on this PR without errors, if
there are automatically detected style issues they should be fixed by
the PR author. Merging must follow our
[styleguide](https://github.com/Revolutionary-Games/Thrive/blob/master/doc/style_guide.md#git).