Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
154 commits
Select commit Hold shift + click to select a range
27f8bb9
Update README.md
Pronwan Sep 25, 2025
39d8dbd
Update README.md
Pronwan Sep 25, 2025
8badd12
Rename LICENSE.txt to LICENSE
Pronwan Sep 25, 2025
d2e96f2
Update README.md
Pronwan Sep 25, 2025
ca3671b
Update README.md
Pronwan Sep 25, 2025
5510dd3
Add files via upload
Pronwan Sep 25, 2025
32a7c6e
Update README.md
Pronwan Sep 25, 2025
ac65b08
Update README.md
Pronwan Sep 25, 2025
3e5f900
Update README.md
Pronwan Sep 25, 2025
721a932
Update README.md
Pronwan Sep 25, 2025
1b361cd
Update README.md
Pronwan Sep 25, 2025
4b85871
Update README.md
Pronwan Sep 25, 2025
37f776a
Update README.md
Pronwan Sep 27, 2025
45c4b26
Update README.md
Pronwan Sep 27, 2025
c264435
Add files via upload
Pronwan Sep 27, 2025
b310ba4
Add files via upload
Pronwan Sep 27, 2025
11435aa
Update README.md
Pronwan Sep 27, 2025
49cc587
Update README.md
Pronwan Sep 27, 2025
92181d4
Update README.md
Pronwan Sep 27, 2025
024c45e
Update README.md
Pronwan Sep 27, 2025
46452a1
Version 2.0 is ready! :)
Oct 1, 2025
c65ca4e
Update README.md
Pronwan Oct 1, 2025
00af4f7
Add files via upload
Pronwan Oct 1, 2025
db73586
Update README.md
Pronwan Oct 1, 2025
85e0b2b
Update README.md
Pronwan Oct 1, 2025
1cf5a26
Update README.md
Pronwan Oct 1, 2025
fb61c85
Add files via upload
Pronwan Oct 1, 2025
bb08656
Update README.md
Pronwan Oct 1, 2025
72021c1
Add files via upload
Pronwan Oct 1, 2025
c0a7014
Update README.md
Pronwan Oct 1, 2025
10f156c
Add files via upload
Pronwan Oct 1, 2025
b61b571
Update README.md
Pronwan Oct 1, 2025
bdc7742
Update README.md
Pronwan Oct 1, 2025
b2e9349
Add files via upload
Pronwan Oct 1, 2025
f443518
Update README.md
Pronwan Oct 1, 2025
9b2f836
Update README.md
Pronwan Oct 2, 2025
f33d098
Update README.md
Pronwan Oct 2, 2025
163cc19
Update README.md
Pronwan Oct 2, 2025
bd12389
Update README.md
Pronwan Oct 2, 2025
ea0a7c4
Update README.md
Pronwan Oct 2, 2025
0c46f1f
Update README.md
Pronwan Oct 3, 2025
d743f78
Update README.md
Pronwan Oct 4, 2025
6a00507
Update README.md
Pronwan Oct 4, 2025
d23c28a
Update README.md
Pronwan Oct 4, 2025
1c5ccc9
all source files fo 2.0.3
Oct 5, 2025
b8255cc
aktuelle version 2.0.3
Oct 5, 2025
9786dba
2.0.3
Oct 5, 2025
aa5105d
v 2.0.4 - update button, Edge Pairing, Profile Delete for re-pairing
Oct 6, 2025
566c647
v2.0.4
Oct 6, 2025
080f600
Update README.md
Pronwan Oct 6, 2025
33cb080
Update README.md
Pronwan Oct 6, 2025
d129486
v2.0.4 (update button)
Oct 6, 2025
7dc3c8f
v2.0.5 Global Device Hotkeys
Oct 6, 2025
1103cf7
Update README.md
Pronwan Oct 6, 2025
4b663c3
v2.0.6 - more solid smart switch logs and methods
Oct 7, 2025
055c56e
v2.0.7 minor smart siwtch fixes
Oct 7, 2025
08e35e1
v2.0.
Oct 7, 2025
060dfea
device fixes
Oct 8, 2025
7f5e103
New Version 3.0
Oct 30, 2025
423c4b3
v3.0.0
Pronwan Oct 30, 2025
b1e7166
Add files via upload
Pronwan Oct 30, 2025
5af54db
v3.0.1 (Map + Mini Map Fixes)
Nov 1, 2025
fb8ce71
Add files via upload
Pronwan Nov 5, 2025
cbdb363
Add V3 YouTube link
Pronwan Nov 5, 2025
9e024d1
Fix YouTube link formatting in README.md
Pronwan Nov 5, 2025
ebaf319
Update README.md
Pronwan Nov 7, 2025
7526ffd
3.1.0 - Storage Monitors
Nov 13, 2025
6970d33
Storage Monitors
Pronwan Nov 17, 2025
a4378ae
v3.1.2
Nov 17, 2025
2aa2402
v3.1.2 Storage Monitor Update
Pronwan Nov 17, 2025
3ef2bba
Remove mini map outside grid note from README
Pronwan Nov 18, 2025
dfbb555
Add update notes for version 3.2.1
Pronwan Nov 21, 2025
50f53d4
Version 3.3.0 Oilrig|AutoPromote
Jan 18, 2026
7f9963b
Revise donation link and add update notes for 3.3.0
Pronwan Jan 18, 2026
4897e18
3.1.1 Stability + Deep Sea Patch
Feb 16, 2026
79f35e8
Add update notes for version 3.3.1
Pronwan Feb 16, 2026
7408d81
Update README with new features and stability patch
Pronwan Apr 1, 2026
53825f1
3.4.0 Smart Alarm Overhaul + Device grouping
Apr 21, 2026
c91ddaf
Enhance README with GitHub release notes options
Pronwan Apr 21, 2026
3b08a1a
Revise release notes for version 3.4.0
Pronwan Apr 21, 2026
fe531ee
Remove duplicate features in README.md
Pronwan Apr 21, 2026
2730510
Merge branch 'master' of https://github.com/Pronwan/rustplus-dekstop
Apr 21, 2026
161b798
The Intel & Tracking Update:
JawadYzbk Apr 21, 2026
45064e8
feat(tray): add background tracking and minimize to tray functionality
JawadYzbk Apr 22, 2026
edb6fb0
feat: add visual tracking status indicator and tray updates
JawadYzbk Apr 22, 2026
ec3f775
fix(tracking): prevent polling with no tracked players and update UI …
JawadYzbk Apr 22, 2026
49fc55e
Merge pull request #22 from JawadYzbk/master
Pronwan Apr 22, 2026
8c15c33
3.5.0 Advanced Player Tracking
Apr 22, 2026
b733002
Update README for version 3.5.0 features and fixes
Pronwan Apr 22, 2026
ade6eee
Update README for version 3.5.0 release details
Pronwan Apr 22, 2026
f0ed421
feat: add server info modal, settings modal, and auto-connect
JawadYzbk Apr 22, 2026
cb14c84
feat: add Steam ID persistence and improve UI/UX
JawadYzbk Apr 22, 2026
87f268d
fix(tracking): update BattleMetrics API integration to use session en…
JawadYzbk Apr 22, 2026
34d4d66
feat(tracking): improve player session accuracy with API timestamps
JawadYzbk Apr 22, 2026
0022220
feat(ui): improve device list item styling and empty state
JawadYzbk Apr 23, 2026
660ce7e
chore: unignore and add updated Inno Setup installer script
JawadYzbk Apr 23, 2026
f11a1c3
chore: uncomment Setup.iss in gitignore
JawadYzbk Apr 23, 2026
d508c93
Merge pull request #23 from JawadYzbk/master
Pronwan Apr 24, 2026
485ca33
Manual IP link support fix
Apr 24, 2026
f29752d
Merge branch 'master' of https://github.com/Pronwan/rustplus-dekstop
Apr 24, 2026
ab562b7
Installer Image, SetupScript InnoSetup
Apr 24, 2026
cdce7bc
translated some DE content to EN
Apr 24, 2026
8abfff7
feat(tracking): enhance player tracking with session data and UI impr…
JawadYzbk Apr 24, 2026
a35d735
feat: add custom input dialog and improve error message format
JawadYzbk Apr 24, 2026
9fb4542
Merge branch 'master' of https://github.com/Pronwan/rustplus-desktop
JawadYzbk Apr 24, 2026
b117d38
feat(icons): add progress indicator for icon downloads, changed prima…
JawadYzbk Apr 24, 2026
b7520f0
chore: update version to 3.5.4
JawadYzbk Apr 24, 2026
cf925ff
docs: update patch notes window for version 3.5.4
JawadYzbk Apr 24, 2026
90db653
feat(tracking): improve online players UI with loading indicator and …
JawadYzbk Apr 24, 2026
08ffc2e
feat: add fallback to Edge when Chrome fails for FCM registration
JawadYzbk Apr 25, 2026
ffc9126
Merge pull request #26 from JawadYzbk/master
Pronwan Apr 25, 2026
2e1ede8
installer fix for fresh installs
Apr 27, 2026
1c6bac6
feat(map): add placeholder and improve background color
JawadYzbk Apr 29, 2026
9aa880f
fix: reset map display during hard reset to clear state
JawadYzbk Apr 29, 2026
fdd9723
Subject: Implement Embedded Shop Search and Modularize MainWindow Logic
JawadYzbk Apr 30, 2026
392dd4a
feat: implement smooth marker transitions and dynamic path prediction
JawadYzbk Apr 30, 2026
9e1d80a
Merge pull request #30 from JawadYzbk/master
Pronwan Apr 30, 2026
67f515f
Release v4.0.0 - Major Overhaul: New Map, Interactive Event Dock, Sho…
Apr 30, 2026
23796cb
Document Update 4.0.0 with new features and improvements
Pronwan Apr 30, 2026
c6770a1
Add files via upload
Pronwan Apr 30, 2026
46586a9
Merge branch 'master' of https://github.com/Pronwan/rustplus-dekstop
May 1, 2026
7eb92a6
Crosshair Editor
May 1, 2026
a364824
Setup-File-Update
May 1, 2026
5ae96e9
Add update 4.1.0 for Crosshair Editor feature
Pronwan May 1, 2026
8b62891
Merge branch 'master' of https://github.com/Pronwan/rustplus-dekstop
May 1, 2026
549ecce
map marker rotation fix + new chinook
May 1, 2026
97115a7
mini map marker rotation fix
May 1, 2026
847488d
feat(map): add natural scaling for cargo ship markers
JawadYzbk May 2, 2026
12a2522
feat: bump version to 4.2.0 and improve map rendering quality
JawadYzbk May 2, 2026
2b3afc7
docs: update patch notes for v4.2.0 with refined feature descriptions
JawadYzbk May 2, 2026
2a240be
Smart Alarm Trigger fix
May 2, 2026
43bc64c
Smart Alarm fixes and Popup optimizations
May 2, 2026
7515c17
Merge https://github.com/Pronwan/rustplus-desktop
JawadYzbk May 2, 2026
7e5664a
YT Thumb
Pronwan May 2, 2026
271f07e
Update YouTube thumbnail image in README
Pronwan May 2, 2026
2df1d4a
Merge branch 'Pronwan:master' into master
JawadYzbk May 2, 2026
bdad56b
sync with upstream repo
JawadYzbk May 3, 2026
14dd4e4
Merge branch 'master' of https://github.com/JawadYzbk/rustplus-desktop
JawadYzbk May 3, 2026
3ed5603
+
JawadYzbk May 3, 2026
630832b
++
JawadYzbk May 3, 2026
f2f0312
Merge pull request #32 from JawadYzbk/master
Pronwan May 3, 2026
bb70864
Merge branch 'master' of https://github.com/Pronwan/rustplus-dekstop
May 3, 2026
2ac9483
new granular Chat Notification Settings v4.1.4
May 3, 2026
9181fd4
Ressource for screenshot
May 3, 2026
466687e
installer fix
May 3, 2026
b371606
Installer FIX One File install
May 3, 2026
7dbd36e
v4.2 Cargo overhaul with countdowns etc.
May 4, 2026
a1ea4ce
Add update 4.2 details to README
Pronwan May 4, 2026
38357f7
minor polling fix with BM to avoid surpressed event notifications
May 4, 2026
1535a17
Fixed Player centering on map, stability + map marker addons
May 5, 2026
de8d9b5
v4.3 setup notes etc.
May 5, 2026
02b85d0
Minor fix for Timers in Event docks for Cargo and Deep Sea - not in i…
May 5, 2026
31470f8
4.3.1 version update preparation
May 5, 2026
6a3e60d
feat: Discord webhook integration for in-game events
0xSteph May 5, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,6 @@ installer/Output/*
!LICENSE
!docs/
!RustPlusDesktop/*.png
!RustPlusDesktop/*.jpg
!RustPlusDesktop/*.jpg
RustPlusDesktop/RustPlusDesk_lbvqmzga_wpftmp.csproj
RustPlusDesktop/Setup.iss
Binary file added 3.1.0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added App-Version3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
378 changes: 364 additions & 14 deletions README.md

Large diffs are not rendered by default.

134 changes: 108 additions & 26 deletions RustPlusDesktop/AlarmPopupWindow.xaml
Original file line number Diff line number Diff line change
@@ -1,31 +1,113 @@
<Window x:Class="RustPlusDesk.Views.AlarmWindow"
<Window x:Class="RustPlusDesk.Views.AlarmWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Title="Alarms" Width="520" Height="360"
Title="Alarms" Width="550" Height="400"
WindowStartupLocation="CenterOwner"
Background="Tomato"
ResizeMode="CanResizeWithGrip"
WindowStyle="None" AllowsTransparency="True" Background="Transparent"
MouseDown="Window_MouseDown"
Topmost="True">
<DockPanel Margin="10">
<StackPanel Orientation="Horizontal" DockPanel.Dock="Top" Margin="0 0 0 8">
<TextBlock Text="Incoming Alarm" FontWeight="Bold" FontSize="16"/>
<Button Content="Wipe Alarms" Margin="10,0,0,0" Click="BtnClear_Click"/>
<Button Content="Close" Margin="6,0,0,0" Click="BtnClose_Click" />
</StackPanel>

<ListBox x:Name="List" Background="LightYellow" >
<ListBox.ItemTemplate>
<DataTemplate>
<Border Padding="8" Margin="0,0,0,6" BorderBrush="#DDD" BorderThickness="1" CornerRadius="6">
<StackPanel>
<TextBlock Text="{Binding Timestamp, StringFormat='{}{0:HH:mm:ss}'}" FontWeight="SemiBold"/>
<TextBlock Text="{Binding Server}" />
<TextBlock Text="{Binding DeviceName}" />
<TextBlock Text="{Binding Message}" FontStyle="Italic"/>
</StackPanel>
</Border>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
</DockPanel>
<Window.Resources>
<BitmapImage x:Key="IconSmartAlarm" UriSource="pack://application:,,,/icons/smartalarm.png"/>
<SolidColorBrush x:Key="AppBg" Color="#121417"/>
<SolidColorBrush x:Key="Surface" Color="#1C1F24"/>
<SolidColorBrush x:Key="SurfaceAlt" Color="#23272E"/>
<SolidColorBrush x:Key="Accent" Color="#4FC3F7"/>
<SolidColorBrush x:Key="TextPrimary" Color="#ECEFF1"/>
<SolidColorBrush x:Key="TextSubtle" Color="#B0BEC5"/>
<SolidColorBrush x:Key="RustRed" Color="#CE422B"/>
</Window.Resources>

<Border Background="{StaticResource AppBg}" BorderBrush="#33414850" BorderThickness="1" CornerRadius="12">
<Grid Margin="12">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>

<!-- Header -->
<Grid Grid.Row="0" Margin="0,0,0,12">
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
<Image Source="{StaticResource IconSmartAlarm}" Width="20" Height="20" Margin="0,0,10,0"/>
<TextBlock Text="INCOMING ALARMS" FontWeight="Bold" FontSize="14" Foreground="{StaticResource RustRed}"/>
</StackPanel>

<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
<Button Content="Wipe" Padding="12,4" Margin="0,0,8,0" Click="BtnClear_Click"
Background="#1AFFFFFF" Foreground="White" BorderThickness="0">
<Button.Resources>
<Style TargetType="Border">
<Setter Property="CornerRadius" Value="6"/>
</Style>
</Button.Resources>
</Button>
<Button Width="28" Height="28" Content="✕" FontSize="16" FontWeight="Bold"
Background="Transparent" Foreground="{StaticResource TextSubtle}" BorderThickness="0"
Click="BtnClose_Click" Cursor="Hand"/>
</StackPanel>
</Grid>

<!-- Alarm List -->
<ListBox x:Name="List" Grid.Row="1" Background="Transparent" BorderThickness="0"
ScrollViewer.HorizontalScrollBarVisibility="Disabled">
<ListBox.ItemContainerStyle>
<Style TargetType="ListBoxItem">
<Setter Property="Background" Value="Transparent"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ListBoxItem">
<ContentPresenter />
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ListBox.ItemContainerStyle>
<ListBox.ItemTemplate>
<DataTemplate>
<Border Background="{StaticResource Surface}" Margin="0,0,0,8" CornerRadius="8"
BorderBrush="#22FFFFFF" BorderThickness="1">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="4"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>

<!-- Red Accent Bar -->
<Border Background="{StaticResource RustRed}" CornerRadius="8,0,0,8"/>

<Border Grid.Column="1" Padding="12">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>

<!-- Icon -->
<Image Source="{StaticResource IconSmartAlarm}" Width="32" Height="32" VerticalAlignment="Top" Opacity="0.8" Margin="0,4,12,0"/>

<StackPanel Grid.Column="1">
<!-- Row 1: Time & Server -->
<Grid Margin="0,0,0,2">
<TextBlock Text="{Binding Timestamp, StringFormat='{}{0:HH:mm:ss}'}"
Foreground="{StaticResource TextSubtle}" FontSize="11" FontWeight="SemiBold"/>
<TextBlock Text="{Binding Server}" HorizontalAlignment="Right"
Foreground="{StaticResource Accent}" FontSize="11" FontWeight="Bold"/>
</Grid>

<!-- Row 2: Device Name / ID -->
<TextBlock Text="{Binding DeviceName}" Foreground="{StaticResource TextPrimary}"
FontWeight="Bold" FontSize="13" Margin="0,2"/>

<!-- Row 3: Message -->
<TextBlock Text="{Binding Message}" Foreground="White" FontSize="14"
TextWrapping="Wrap" Margin="0,4,0,0" Opacity="0.9"/>
</StackPanel>
</Grid>
</Border>
</Grid>
</Border>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
</Grid>
</Border>
</Window>
31 changes: 28 additions & 3 deletions RustPlusDesktop/AlarmPopupWindow.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Collections.ObjectModel;
using System.Collections.ObjectModel;
using System.Windows;
using RustPlusDesk.Models;

Expand All @@ -16,8 +16,33 @@ public AlarmWindow()

public void Add(AlarmNotification n)
{
_items.Add(n);
if (_items.Count > 0) List.ScrollIntoView(_items[^1]);
_items.Insert(0, n);
// Optional: Scroll zum neuesten Element am Anfang
List.ScrollIntoView(_items[0]);
}

public void UpdateOrAdd(AlarmNotification n)
{
for (int i = _items.Count - 1; i >= 0; i--)
{
// Wir aktualisieren nur Einträge, die noch die Standard-Nachricht haben
if (_items[i].Message == "Alarm activated!" && _items[i].Server == n.Server)
{
// Match, wenn IDs identisch ODER wenn einer von beiden keine ID hat (Fuzzy-Match für FCM ohne ID)
if (_items[i].EntityId == n.EntityId || _items[i].EntityId == null || n.EntityId == null)
{
_items[i] = n;
return;
}
}
}
Add(n);
}

private void Window_MouseDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
{
if (e.ChangedButton == System.Windows.Input.MouseButton.Left)
DragMove();
}

private void BtnClear_Click(object sender, RoutedEventArgs e) => _items.Clear();
Expand Down
Binary file added RustPlusDesktop/App-Version2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading