-
Notifications
You must be signed in to change notification settings - Fork 7
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
Gabriel2 #32
Draft
Ewwweee
wants to merge
57
commits into
Terasology:develop
Choose a base branch
from
Cordoncharge83:Gabriel2
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Gabriel2 #32
Changes from all commits
Commits
Show all changes
57 commits
Select commit
Hold shift + click to select a range
17bbc58
Test Commot W
Cordoncharge83 7bd9b5b
Yahiewi med amine
Yahiewi 62f261e
hello
Ihebsmai de6e56b
Create testjiji
Jihene556 82e9f8d
Merge branch 'develop' of https://github.com/Cordoncharge83/WeatherMa…
Ihebsmai c79dd69
Create TestOussama
Oussama1928 45c291a
Delete TestOussama
Oussama1928 e4b9c9f
haya aad
Oussama1928 7066617
currentWeatherMethod to determine rain/hail/snow depending on the tem…
a26364f
added beginning of temp
Ewwweee 513e647
Merge branch 'Gabriel' of https://github.com/Cordoncharge83/WeatherMa…
87d45e7
I add a method that looks like triggerEvents() but with this new met…
8c55d69
some correction on the currentWeather method
159931d
some correction on the currentWeather method
79716eb
last version of currentWeather methode, i hope ;)
aaf8af0
Added temperature variations
Ewwweee 751b965
Merge pull request #2 from Cordoncharge83/Gabriel
Ewwweee 4442083
ras
dd7e08e
Merge branch 'develop' into currentWeatherMethod
Ewwweee f52591b
Merge pull request #3 from Cordoncharge83/currentWeatherMethod
Ewwweee 3869517
pb commit
Ewwweee ee74431
Merge pull request #4 from Cordoncharge83/Gabriel
Ewwweee a25dfbc
correction
6d76292
correction
9df40b6
oussama
Oussama1928 7b45907
oussama
Oussama1928 dcb12ca
correction
ffb475f
Merge branch 'develop' into currentWeatherMethod
Ewwweee 2b03271
Merge pull request #5 from Cordoncharge83/currentWeatherMethod
Ewwweee 834bb9d
Meaa
Ewwweee ac5d5a0
Merge branch 'develop' into Gabriel
Ewwweee e2eccd4
Merge pull request #6 from Cordoncharge83/Gabriel
Ewwweee 0693ba4
Update increaseHumidity
Ihebsmai e188d31
melt, freeze, evaporate
Ewwweee f84e742
Merge branch 'develop' into Gabriel
Ewwweee 179cc0a
Merge pull request #7 from Cordoncharge83/Gabriel
Ewwweee bd26bbb
final add temp and change block according to the temp
Ewwweee c7fb87e
Update increaseHumidity
Ihebsmai 14b0344
some correction on curWeather and a new command chWeather that change…
76838d1
Merge branch 'develop' of https://github.com/Cordoncharge83/WeatherMa…
40cc2e2
Update IncreasedHumidity.2
Ihebsmai 347cba8
it is working
08a3afe
Merge branch 'develop' of https://github.com/Cordoncharge83/WeatherMa…
b7d5c35
minor correction
a1d412d
Update HumidityEvent
Ihebsmai 425e318
final correction
94540f6
Merge branch 'develop' of https://github.com/Cordoncharge83/WeatherMa…
d5dd34a
ee
Ewwweee c0bc2d7
me
Ewwweee 1f18ef2
Merge pull request #8 from Cordoncharge83/Gabriel2
Ewwweee 307ee22
final correction
d95e996
last
1c9b8f0
Final
Ewwweee 082b8b2
me
Ewwweee af096b5
Merge branch 'develop' into Gabriel2
Ewwweee abb63ae
Merge pull request #9 from Cordoncharge83/Gabriel2
Ewwweee 2a5cff6
Final
Ewwweee File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
sah sah sah | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
ijfjverzhjbtrkubt:lhbtr | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This file is also not needed. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
TEjsfsidfjzuifnhnhjdfs | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I do not believe that this file serves any useful purpose either. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
src/main/java/org/terasology/weatherManager/events/HumidityDecreaseEvent.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
// Copyright 2021 The Terasology Foundation | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
package org.terasology.weatherManager.events; | ||
|
||
import org.terasology.gestalt.entitysystem.event.Event; | ||
|
||
/** | ||
* Event which is called when the weather changes to hail (frozen raindrop fall) | ||
*/ | ||
public class HumidityDecreaseEvent implements Event { | ||
} |
12 changes: 12 additions & 0 deletions
12
src/main/java/org/terasology/weatherManager/events/HumidityIncreaseEvent.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
// Copyright 2021 The Terasology Foundation | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
package org.terasology.weatherManager.events; | ||
|
||
import org.terasology.gestalt.entitysystem.event.Event; | ||
|
||
/** | ||
* Event which is called when the weather changes to hail (frozen raindrop fall) | ||
*/ | ||
public class HumidityIncreaseEvent implements Event { | ||
} |
12 changes: 12 additions & 0 deletions
12
src/main/java/org/terasology/weatherManager/events/TemperatureDecreaseEvent.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
// Copyright 2021 The Terasology Foundation | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
package org.terasology.weatherManager.events; | ||
|
||
import org.terasology.gestalt.entitysystem.event.Event; | ||
|
||
/** | ||
* Event which is called when the weather changes to hail (frozen raindrop fall) | ||
*/ | ||
public class TemperatureDecreaseEvent implements Event { | ||
} |
12 changes: 12 additions & 0 deletions
12
src/main/java/org/terasology/weatherManager/events/TemperatureIncreaseEvent.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
// Copyright 2021 The Terasology Foundation | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
package org.terasology.weatherManager.events; | ||
|
||
import org.terasology.gestalt.entitysystem.event.Event; | ||
|
||
/** | ||
* Event which is called when the weather changes to hail (frozen raindrop fall) | ||
*/ | ||
public class TemperatureIncreaseEvent implements Event { | ||
} |
12 changes: 12 additions & 0 deletions
12
src/main/java/org/terasology/weatherManager/events/TemperatureStagnateEvent.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
// Copyright 2021 The Terasology Foundation | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
package org.terasology.weatherManager.events; | ||
|
||
import org.terasology.gestalt.entitysystem.event.Event; | ||
|
||
/** | ||
* Event which is called when the weather changes to hail (frozen raindrop fall) | ||
*/ | ||
public class TemperatureStagnateEvent implements Event { | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file is not needed.