Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
9c8f0c8
Voting features
erja76 Feb 26, 2026
770a97e
Restore CharacterID validation to fix loader crash
erja76 Feb 27, 2026
9f0a6f0
Restore ServerManager from main to fix loader crash
erja76 Feb 27, 2026
7915003
Restore ApplicationController from main to fix VersionNumber
erja76 Feb 28, 2026
5b2f303
epatoivoa vol 2
erja76 Feb 28, 2026
75da749
back up b4 merge main
erja76 Mar 7, 2026
3cfd9ba
back up b4 merge main
erja76 Mar 7, 2026
9a284cc
WIP: voting screen updates
erja76 Mar 9, 2026
e685f47
Removed the extra Overlay from Votes_list
BillTheBeast Mar 10, 2026
01467b3
Merge branch 'main' into erja-branch1
BillTheBeast Apr 15, 2026
c972a5f
Made base for new voting screen
TheOxari909 Apr 16, 2026
e9b1692
Basis of multi tab voting for store/admin/past
TheOxari909 Apr 16, 2026
85af1c7
Tab navigation working
TheOxari909 Apr 21, 2026
962e1c2
Fixed the content in each vote tab
TheOxari909 Apr 21, 2026
94e1931
Made sure width of content fits the votes screen
TheOxari909 Apr 21, 2026
3a7f8b7
WIP: Scrollbar is annoying, will return
TheOxari909 Apr 22, 2026
6207145
Correct positioning left side on text and vote items, scale wrong
TheOxari909 Apr 22, 2026
392751f
Sketching the B_Vote
TheOxari909 Apr 23, 2026
fd7e282
Fixed the width of currently running votes
TheOxari909 Apr 23, 2026
c4ccb25
Added player head to vote boxes
TheOxari909 Apr 24, 2026
315ffa4
Inbetween commit where things work, but are not finished
TheOxari909 Apr 27, 2026
f283dd4
Cleaned children
TheOxari909 Apr 27, 2026
32d6535
Reverted MenuUi scene changes
TheOxari909 Apr 28, 2026
db92311
Scrolling fixed, content size is still wrong
TheOxari909 Apr 28, 2026
def080e
Adjusted Votes list look
TheOxari909 Apr 30, 2026
5a6e8b3
Whitespaces and formatter
TheOxari909 May 1, 2026
358a092
Fixed the scroll content size
TheOxari909 May 1, 2026
7d33de5
B_Vote layout now has price and furniture data properly displayed
TheOxari909 May 4, 2026
a9a47e6
Basics of no polls screen working
TheOxari909 May 4, 2026
93c473c
Added time left text to B_Vote
TheOxari909 May 5, 2026
31bdc70
Add poll popup skeleton
TheOxari909 May 5, 2026
11f8a52
Pollpopup adjustments to work on votes_list
TheOxari909 May 6, 2026
52e8fb1
Made the pollpopu aspect size correct, and made it prettier
TheOxari909 May 6, 2026
827a0e6
Merge branch 'main' into erja-branch1
TheOxari909 May 7, 2026
d5a3009
Votes_list in erja-branch1 fits with changes made in main
TheOxari909 May 7, 2026
e34a091
Fixed fonts
TheOxari909 May 7, 2026
215323e
Added time left display to popup
TheOxari909 May 8, 2026
2273d3c
Toggle for showing vote graph if player has voted already
TheOxari909 May 8, 2026
8bde0c0
AddVote logic added
TheOxari909 May 8, 2026
71f42e6
Added number of votes to show properly
TheOxari909 May 8, 2026
11b61ee
Logic bug and some safety checks
TheOxari909 May 10, 2026
26694c3
Fixed past poll section
TheOxari909 May 11, 2026
8c09b3d
Past votes scroll movement fix
TheOxari909 May 11, 2026
2efc56a
A simple object to show if a poll is unvoted
TheOxari909 May 12, 2026
62bbdc0
Shows percentages correctly in button mode and bar mode
TheOxari909 May 12, 2026
1ad4400
Renamed variable, and changed hasNotVoted to hasVoted
TheOxari909 May 12, 2026
dee6137
Refactored own functions for Furniture and Clan data
TheOxari909 May 14, 2026
e3adce5
The scaling of poll percentage and desc overflow fixed
TheOxari909 May 15, 2026
6371d31
Fixed the poll only showing 50/50 and now multiple polls visible
TheOxari909 May 15, 2026
b033d91
Hid the fake placeholder entries and fixed item naming
TheOxari909 May 18, 2026
c108319
Commented a couple lines that might cause errors
TheOxari909 May 18, 2026
6ecc284
Merge branch 'main' into erja-branch1
TheOxari909 May 19, 2026
924f8a4
Adjusted sprite text width
TheOxari909 May 19, 2026
ee92a6c
Corrected colors, changed sprites, and added coin icon on popup
TheOxari909 May 20, 2026
4bcfb32
More explicit default value handling
TheOxari909 May 20, 2026
701d79a
When popup active, and timer ends, show end time
TheOxari909 May 21, 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

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/MenuUi/Prefabs/Clan/ClanLanguagePopup.prefab

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions Assets/MenuUi/Prefabs/Panels/UIPanelSwipe.prefab

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 9 additions & 4 deletions Assets/MenuUi/Prefabs/Voting/A_vote.prefab

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading