Skip to content
This repository has been archived by the owner on Jun 17, 2024. It is now read-only.

Rolling gameplay functions #19

Merged
merged 104 commits into from
Feb 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
08fe12e
Update Khana.cs
VargaDot Nov 30, 2023
40f7e78
Update Game.gd
VargaDot Nov 30, 2023
f9d3388
Update Game.gd
VargaDot Nov 30, 2023
2f36c03
Update Game.gd
VargaDot Nov 30, 2023
3d83bc4
Display UI and move player
VargaDot Nov 30, 2023
233cc0c
Update Game.gd
VargaDot Nov 30, 2023
21977ce
Update Khana.cs
VargaDot Nov 30, 2023
f8a9010
Doubles Check & Prison
VargaDot Nov 30, 2023
4a08592
Update Khana.cs
VargaDot Nov 30, 2023
96c1220
AgentCount
VargaDot Nov 30, 2023
244356a
Update Game.gd
VargaDot Nov 30, 2023
54eb844
Update EstateCourt.gd
VargaDot Nov 30, 2023
7a003a4
Update Game.gd
VargaDot Nov 30, 2023
c77e525
Update Game.gd
VargaDot Nov 30, 2023
da29186
Update Game.gd
VargaDot Nov 30, 2023
a0132ed
Update Game.gd
VargaDot Nov 30, 2023
5d35212
Update Game.gd
VargaDot Nov 30, 2023
c8d8013
Update Game.gd
VargaDot Nov 30, 2023
fa27bb6
Delete Game.cs
VargaDot Nov 30, 2023
8ee5269
Update Card.gd
VargaDot Nov 30, 2023
67f2909
Chnaged all int parameters to strings
VargaDot Nov 30, 2023
a3783d2
Changed dirs
VargaDot Nov 30, 2023
38d691c
Update Properties.JSON
VargaDot Nov 30, 2023
debd643
Card.gd should fill up its contents
VargaDot Nov 30, 2023
bd47f6c
Update Card.gd
VargaDot Nov 30, 2023
b156586
Update Khana.cs
VargaDot Dec 1, 2023
7d0513b
Update Khana.cs
VargaDot Dec 1, 2023
6e03657
Update Khana.cs
VargaDot Dec 1, 2023
e92c76c
hardcoded cash amount
VargaDot Dec 1, 2023
2640c4e
Delete Globals.cs
VargaDot Dec 1, 2023
0a77157
purchase props with card
VargaDot Dec 4, 2023
1a2235a
Update Khana.cs
VargaDot Dec 4, 2023
d9432d2
Update GameUI.gd
VargaDot Dec 4, 2023
c49c785
Update Dice.gd
VargaDot Dec 4, 2023
24e5dba
Update MainMenu.tscn
VargaDot Dec 4, 2023
555bc64
Update MainMenu.tscn
VargaDot Dec 5, 2023
8208a8e
Update Prison
VargaDot Dec 5, 2023
e10185d
Create auction
VargaDot Dec 5, 2023
173062a
closePressed method removed
VargaDot Dec 5, 2023
0427dae
Update MainMenu.gd
VargaDot Dec 5, 2023
b9e84a2
open & close credits
VargaDot Dec 5, 2023
08d5c9d
Pause menu updated
VargaDot Dec 5, 2023
ebaeea7
x:bool = false --> x.visible
VargaDot Dec 6, 2023
8042af6
Update MainMenu.gd
VargaDot Dec 6, 2023
763e587
Update Pause.gd
VargaDot Dec 6, 2023
f559c46
Update Game.gd
VargaDot Dec 6, 2023
ed4eb92
connected auction button to node
VargaDot Dec 6, 2023
db8bf70
bid & fold buttons connected
VargaDot Dec 6, 2023
4b21038
Win & Lose conditions
VargaDot Dec 6, 2023
09f8ba0
Update Khana.cs
VargaDot Dec 6, 2023
6a7bfab
Update Auction.gd
VargaDot Dec 6, 2023
c6355cf
Update Khana.cs
VargaDot Dec 6, 2023
412f57d
Update Khana.cs
VargaDot Dec 6, 2023
8eba564
Update Game.gd
VargaDot Dec 6, 2023
116731f
Update Khana.cs
VargaDot Dec 6, 2023
2938ba1
Update Game.gd
VargaDot Dec 6, 2023
69d0c35
Update Game.gd
VargaDot Dec 6, 2023
80e1f26
Update Game.gd
VargaDot Dec 6, 2023
6858807
Update Game.gd
VargaDot Dec 6, 2023
73a01a1
Update Khana.cs
VargaDot Dec 6, 2023
cf55b6c
Update Game.gd
VargaDot Dec 6, 2023
ed8f7e5
Update Game.gd
VargaDot Dec 6, 2023
374adae
Update Game.gd
VargaDot Dec 6, 2023
676feb0
Update Game.gd
VargaDot Dec 6, 2023
cf8890b
Update Game.gd
VargaDot Dec 6, 2023
8f709f7
Large GameUI Rewrite
VargaDot Dec 7, 2023
082fc34
bidding options
VargaDot Dec 7, 2023
81d8d93
Update to Godot 4.2.1
VargaDot Dec 12, 2023
d7dfdf8
GameUI node eliminated
VargaDot Dec 17, 2023
0b863b6
Update Game.gd
VargaDot Dec 17, 2023
d3833aa
Next turn button
VargaDot Dec 17, 2023
b1dbc36
Update Game.gd
VargaDot Dec 17, 2023
ca715b2
Update Game.gd
VargaDot Dec 17, 2023
fb7ea76
Update Pause.gd
VargaDot Dec 19, 2023
22a209e
Update MusicPlayer.cs
VargaDot Dec 23, 2023
ba18034
Game now awaits for player input
VargaDot Dec 28, 2023
dc0ac2f
Update Game.gd
VargaDot Dec 28, 2023
4716774
Update Game.gd
VargaDot Dec 28, 2023
2017e6c
Placeholder conditions for prison status
VargaDot Dec 28, 2023
bf691bd
Update Game.gd
VargaDot Dec 28, 2023
c4ef65a
Update Game.gd
VargaDot Dec 28, 2023
a77cb44
Update Game.gd
VargaDot Dec 28, 2023
2705a11
first revision
VargaDot Jan 19, 2024
de07626
second revision
VargaDot Jan 25, 2024
e9ab52e
third revision
VargaDot Jan 25, 2024
e15fb03
fourth revision
VargaDot Jan 25, 2024
c1bd188
fixed dependencies
VargaDot Jan 25, 2024
7d626fe
Merge pull request #33 from VargaDot/file-reorganisation
VargaDot Jan 25, 2024
e902e5c
Removed old composer
VargaDot Jan 19, 2024
84f1cfb
Uploaded new composer
VargaDot Jan 19, 2024
47a4e02
Updated C# solution
VargaDot Jan 19, 2024
85e20cb
Implemented new composer
VargaDot Jan 19, 2024
8ce016b
changed directories
VargaDot Jan 19, 2024
1d25a74
Updated NewComposer Library
VargaDot Jan 22, 2024
e04d51b
connected main with mainmenu
VargaDot Jan 23, 2024
7973890
Updated composer version
VargaDot Feb 1, 2024
f0d423e
rebased branch
VargaDot Feb 1, 2024
eb7c4d0
Delete MainMenu.tscn
VargaDot Feb 1, 2024
542f413
yay it works
VargaDot Feb 1, 2024
a0c1777
removed old csproj
VargaDot Feb 1, 2024
a62465d
Merge pull request #34 from VargaDot/remove-old-csproj
VargaDot Feb 1, 2024
9decf53
Loading screen
VargaDot Feb 5, 2024
57853c8
Pause menu
VargaDot Feb 5, 2024
bf1684f
Merge pull request #31 from VargaDot/add-new-composer
VargaDot Feb 5, 2024
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# Godot 4+ specific ignores
.godot/
*.csproj.old.*
25 changes: 0 additions & 25 deletions Data/EstateCourt.gd

This file was deleted.

File renamed without changes
6 changes: 3 additions & 3 deletions art/Icon.png.import → Icon.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://c2ljeni31qqgw"
path="res://.godot/imported/Icon.png-c699994613489f3a3f9ce66069ac9833.ctex"
path="res://.godot/imported/Icon.png-33e63688031d53466d4d656c73cf10ca.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://art/Icon.png"
dest_files=["res://.godot/imported/Icon.png-c699994613489f3a3f9ce66069ac9833.ctex"]
source_file="res://Icon.png"
dest_files=["res://.godot/imported/Icon.png-33e63688031d53466d4d656c73cf10ca.ctex"]

[params]

Expand Down
4 changes: 3 additions & 1 deletion Monopoly.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<Project Sdk="Godot.NET.Sdk/4.2.0">
<Project Sdk="Godot.NET.Sdk/4.2.1">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework Condition=" '$(GodotTargetPlatform)' == 'android' ">net7.0</TargetFramework>
<TargetFramework Condition=" '$(GodotTargetPlatform)' == 'ios' ">net8.0</TargetFramework>
<EnableDynamicLoading>true</EnableDynamicLoading>
</PropertyGroup>
</Project>
6 changes: 0 additions & 6 deletions Monopoly.csproj.old

This file was deleted.

14 changes: 7 additions & 7 deletions Monopoly.sln
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monopoly", "Monopoly.csproj", "{0FE5F7AB-129E-45FE-BF7C-95C40FE34564}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monopoly", "Monopoly.csproj", "{8795BF7D-E49D-407A-A6AE-84D66FEF2A0F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -9,11 +9,11 @@ Global
ExportRelease|Any CPU = ExportRelease|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0FE5F7AB-129E-45FE-BF7C-95C40FE34564}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0FE5F7AB-129E-45FE-BF7C-95C40FE34564}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0FE5F7AB-129E-45FE-BF7C-95C40FE34564}.ExportDebug|Any CPU.ActiveCfg = ExportDebug|Any CPU
{0FE5F7AB-129E-45FE-BF7C-95C40FE34564}.ExportDebug|Any CPU.Build.0 = ExportDebug|Any CPU
{0FE5F7AB-129E-45FE-BF7C-95C40FE34564}.ExportRelease|Any CPU.ActiveCfg = ExportRelease|Any CPU
{0FE5F7AB-129E-45FE-BF7C-95C40FE34564}.ExportRelease|Any CPU.Build.0 = ExportRelease|Any CPU
{8795BF7D-E49D-407A-A6AE-84D66FEF2A0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8795BF7D-E49D-407A-A6AE-84D66FEF2A0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8795BF7D-E49D-407A-A6AE-84D66FEF2A0F}.ExportDebug|Any CPU.ActiveCfg = ExportDebug|Any CPU
{8795BF7D-E49D-407A-A6AE-84D66FEF2A0F}.ExportDebug|Any CPU.Build.0 = ExportDebug|Any CPU
{8795BF7D-E49D-407A-A6AE-84D66FEF2A0F}.ExportRelease|Any CPU.ActiveCfg = ExportRelease|Any CPU
{8795BF7D-E49D-407A-A6AE-84D66FEF2A0F}.ExportRelease|Any CPU.Build.0 = ExportRelease|Any CPU
EndGlobalSection
EndGlobal
23 changes: 0 additions & 23 deletions Scenes/Game.tscn

This file was deleted.

32 changes: 0 additions & 32 deletions Scenes/UI/GameUI.tscn

This file was deleted.

12 changes: 0 additions & 12 deletions Scenes/UI/Prison.tscn

This file was deleted.

19 changes: 0 additions & 19 deletions art/music/Speakeasy.ogg.import

This file was deleted.

19 changes: 0 additions & 19 deletions art/music/jazz1.ogg.import

This file was deleted.

19 changes: 0 additions & 19 deletions art/music/jazz2.ogg.import

This file was deleted.

19 changes: 0 additions & 19 deletions art/music/jazz3.ogg.import

This file was deleted.

19 changes: 0 additions & 19 deletions art/music/jazz4.ogg.import

This file was deleted.

19 changes: 0 additions & 19 deletions art/music/jazz5.ogg.import

This file was deleted.

Binary file removed art/sprite/UI/SingleplayerButton.png
Binary file not shown.
34 changes: 0 additions & 34 deletions art/sprite/UI/SingleplayerButton.png.import

This file was deleted.

Binary file removed art/sprite/loadscreens/pope.mp4
Binary file not shown.
3 changes: 0 additions & 3 deletions art/theme/Error.tres

This file was deleted.

Loading