Skip to content

Commit

Permalink
few fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
dankmeme01 committed Feb 7, 2024
1 parent 83b5790 commit 036036f
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 6 deletions.
7 changes: 4 additions & 3 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
## v1.0.1
## v1.0.2

* Use github actions for releases (no more crashes on old CPUs)
* Add a proper warning for people with unsynced system clocks
* Use github actions for releases (hopefully no more crashes on old CPUs)
* Add a volume slider for voice chat
* Fixed a crash in the editor
2 changes: 1 addition & 1 deletion mod.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"geode": "2.0.0-beta.15",
"version": "v1.0.1",
"version": "v1.0.2",
"gd": {
"win": "2.204",
"android": "2.205",
Expand Down
6 changes: 6 additions & 0 deletions src/hooks/player_object.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ void ComplexPlayerObject::incrementJumps() {


void HookedPlayerObject::playSpiderDashEffect(cocos2d::CCPoint from, cocos2d::CCPoint to) {
// if we are in the editor, do nothing
if (PlayLayer::get() == nullptr) {
PlayerObject::playSpiderDashEffect(from, to);
return;
}

auto* gpl = static_cast<GlobedPlayLayer*>(PlayLayer::get());
if (this == gpl->m_player1) {
gpl->m_fields->spiderTp1 = SpiderTeleportData { .from = from, .to = to };
Expand Down
7 changes: 5 additions & 2 deletions src/ui/menu/settings/settings_layer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,12 @@ CCArray* GlobedSettingsLayer::createSettingsCells() {

MAKE_HEADER("Communication");
#if GLOBED_VOICE_SUPPORT
MAKE_SETTING(communication, voiceEnabled, "Voice chat", "Enables in-game voice chat.");
MAKE_SETTING(communication, voiceEnabled, "Voice chat", "Enables in-game voice chat. To talk, hold V when in a level. (keybind can be changed in game settings)");
MAKE_SETTING(communication, voiceProximity, "Voice proximity", "In platformer mode, the loudness of other players will be determined by how close they are to you.");
MAKE_SETTING(communication, voiceVolume, "Voice volume", "Controls how loud other players are.");
MAKE_SETTING_LIM(communication, voiceVolume, "Voice volume", "Controls how loud other players are.", {
.floatMin = 0.f,
.floatMax = 1.f,
});
MAKE_SETTING(communication, onlyFriends, "Only friends", "When enabled, you won't hear players that are not on your friend list in-game.");
MAKE_SETTING(communication, lowerAudioLatency, "Lower audio latency", "Decreases the audio buffer size by 2 times, reducing the latency but potentially causing audio issues.");
MAKE_SETTING_TYPE(communication, audioDevice, Type::AudioDevice, "Audio device", "The input device used for recording your voice.");
Expand Down

0 comments on commit 036036f

Please sign in to comment.