Skip to content

Commit

Permalink
Behaviour tab (#2617)
Browse files Browse the repository at this point in the history
* changed all occurances of behaviour to british english

* enabled behaviour tab

* added sliders

* added setter methods

* improved margins

* set slider ranges

* implemented behavioural sliders

* changed to int

* updated localization files

* reverted visibility

* added tooltips

* removed spaces in po files

* removed unused methods

* added english text

* updated english text

* reapply behaviour when going to the editor

* changed to float

* Added newlines

Co-authored-by: adQuid <[email protected]>

* changed properties to dictionary

* broken save upgrader

* fixed save upgrader

* better save upgrader

* fixed ci problems

* made BehaviourDictionary

* moved BehaviouralValue to general

* added bom

* no new instance of dictionary

* added antonyms to scales

* reverted locales to master

* updated localization

* added tooltip texts

* renamed enum type

* only generate keys once

* updated case

* extracted behaviour mutation to own method

* made xml comment for behaviour value

* updated exception

* updated exception

* refactored SetBehaviouralValue

* made microbe gui invisible

* made editing panel visible

* improved save upgrader

* made keys a static variable

* updated save upgrader

* fixed save upgrader

* refactored BehaviouralKeys

* removed spaces

* used direct cast

* Reset locales to master

* updated localization

* Fix MicrobeEditor.tscn

perhaps I accidentally broke this.

Co-authored-by: adQuid <[email protected]>
Co-authored-by: Henri Hyyryläinen <[email protected]>
  • Loading branch information
3 people authored Oct 23, 2021
1 parent 38e5613 commit ca63965
Show file tree
Hide file tree
Showing 58 changed files with 12,500 additions and 9,473 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ https://community.revolutionarygamesstudio.com/
A clear and concise description of what the bug is.

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

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

Expand Down
6 changes: 3 additions & 3 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Our Standards

Examples of behavior that contributes to a positive environment for our
Examples of behaviour that contributes to a positive environment for our
community include:

* Demonstrating empathy and kindness toward other people
Expand All @@ -13,7 +13,7 @@ community include:
* Focusing on what is best not just for us as individuals, but for the
overall community

Examples of unacceptable behavior include:
Examples of unacceptable behaviour include:

* The use of sexualized language or imagery, and sexual attention or
advances of any kind
Expand All @@ -25,7 +25,7 @@ Examples of unacceptable behavior include:

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
Instances of abusive, harassing, or otherwise unacceptable behaviour may be
reported to the community leaders responsible for enforcement at
[email protected].
All complaints will be reviewed and investigated promptly and fairly.
Expand Down
4 changes: 2 additions & 2 deletions Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
// NOTE: the version info is read by a regex in a script so don't add complicated things to this file
// NOTE: When changing the version number you need to also change "export_presets.cfg"

[assembly: AssemblyVersion("0.5.5.0")]
[assembly: AssemblyVersion("0.5.6.0")]

[assembly: AssemblyInformationalVersion("")]
[assembly: AssemblyInformationalVersion("-alpha")]

// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
Expand Down
2 changes: 2 additions & 0 deletions Thrive.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@
<Compile Include="src\engine\SettingValue.cs" />
<Compile Include="src\engine\StartupActions.cs" />
<Compile Include="src\general\AliveMarker.cs" />
<Compile Include="src\general\BehaviouralValueType.cs" />
<Compile Include="src\general\BehaviourDictionary.cs" />
<Compile Include="src\general\ColorUtils.cs" />
<Compile Include="src\general\Gallery.cs" />
<Compile Include="src\general\EnumHelper.cs" />
Expand Down
12 changes: 6 additions & 6 deletions export_presets.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ codesign/digest_algorithm=1
codesign/description=""
codesign/custom_options=PoolStringArray( )
application/icon="res://assets/misc/icon.ico"
application/file_version="0.5.5.0"
application/product_version="0.5.5.0"
application/file_version="0.5.6.0"
application/product_version="0.5.6.0"
application/company_name="Revolutionary Games Studio"
application/product_name="Thrive"
application/file_description="Thrive Game"
Expand Down Expand Up @@ -97,8 +97,8 @@ codesign/digest_algorithm=1
codesign/description=""
codesign/custom_options=PoolStringArray( )
application/icon="res://assets/misc/icon.ico"
application/file_version="0.5.5.0"
application/product_version="0.5.5.0"
application/file_version="0.5.6.0"
application/product_version="0.5.6.0"
application/company_name="Revolutionary Games Studio"
application/product_name="Thrive"
application/file_description="Thrive Game"
Expand Down Expand Up @@ -127,8 +127,8 @@ application/info="Thrive is an open source game about evolution"
application/icon="res://assets/misc/icon.png"
application/identifier="com.revolutionarygamesstudio.thrive"
application/signature=""
application/short_version="0.5.5.0"
application/version="0.5.5.0"
application/short_version="0.5.6.0"
application/version="0.5.6.0"
application/copyright="Copyright (C) 2013-2021 Revolutionary Games"
display/high_res=false
privacy/camera_usage_description=""
Expand Down
Loading

0 comments on commit ca63965

Please sign in to comment.