Commit Graph

219 Commits

Author SHA1 Message Date
PersonGuyGit
fbbb7131d7 Starting to add changes into the Merged Demo project 2022-09-18 12:25:50 -06:00
MacDugRPG
b15d2976e8 Creates Merged Master
Creates the Merged Master game code as discussed in meeting for us all to branch and work off of.
2022-09-18 13:40:23 -04:00
MacDugRPG
c511015207 Continued module-adding updates:
Incorporates Andrew's die roller as a singleton, and tests with JSON module code.
2022-09-15 09:26:59 -04:00
MacDugRPG
2f51e2228a Continued module updates:
The following changes are included in this update:
	-TestingFiles subdirectory replaced with the _userFiles subdirectory. As discussed in meeting, this is to house what's been previously moved to OS-dependent user directory.
	-user paths are removed for a the res://_userFiles location throughout.
	-options are now being both dynamically loaded and linking from the JSON.
	-The test JSON adds several (silly) options to test having more than 3 and larger test outputs.
	-Attempted to incorporate Luke's updates from today in this update.
	-NOTE: cleanup/refactor is definitely needed, but got this working today. The CommandProcessor, for example can likely be removed in the next update
2022-09-11 16:34:30 -04:00
PersonGuyGit
cfc503582b Added margin and spacing to Line Edits plus Var Name changes 2022-09-11 12:24:32 -06:00
PersonGuyGit
b66828124c Adding Line Edits for Add Character function 2022-09-11 11:56:36 -06:00
PersonGuyGit
701b4d1142 Added some changes. 2022-09-11 11:03:08 -06:00
MacDugRPG
949a0dba9b Adds mergedDemo_2022_0904A; retooling game for drawing from source module file
Begins retooling the mergedDemo to generate locations and options (and eventually dialog and all) from a module data source. Working with JSON now just to get started, will switch this to DB once it's up and working. Currently generates 'node' arrays and intro text; stopped working on adding dynamic options from these nodes and connecting them.
2022-09-07 19:29:36 -04:00
PersonGuyGit
7b00653248 Connected Database to Toolset Dialog Editor. 2022-09-04 12:44:57 -06:00
MacDugRPG
935da98638 Import Player and Settings Updates
Additional updates as follows: mods to dark and light themes for text edits, modification to import for CSV parsing and saving to the player singleton text file, adds an alert popup for import in cases where no character has been loaded (won't allow start game), replaces the select character within game to use this import character option, also adds testing files directory overall to Github
2022-08-29 18:00:57 -04:00
MacDugRPG
baa4ee34d4 Settings implementation updates
Finishes merging of current settings to load all from file, update for display, save to singleton. Also adds currently hard-coded (in the GlobalSaveInstance) file name based on themes choice for use in all control nodes.

Applies that theme load to all current control nodes.
2022-08-28 15:30:38 -04:00
PersonGuyGit
2c48b0a433 Added C,R, & D for our SQLite Database solution. Looking into options for Godot Toolset editors 2022-08-28 12:30:11 -06:00
MacDugRPG
a241a73b2f Merged Demo: adding settings
Settings implementation is in progress. Currently loads and displays from expected user://PlayerPreferences.cfg at application start, but just the inputName and riskFactor.
2022-08-21 16:24:19 -04:00
Andrew Tang
c9b4e38def Merge branch 'Andrew' 2022-08-22 02:59:23 +08:00
Andrew Tang
ac73e184d3 Adjustments to Multiplayer Test
Added a join scene but was unable to get the client-server interaction working properly. Hopefully some of the code can be used as a starting point once we begin working on Dario's UI.
2022-08-22 02:56:29 +08:00
PersonGuyGit
11ff47a5cc Added some things related to Database management. 2022-08-21 12:56:03 -06:00
MacDugRPG
fcbd8c1917 Creates MergedDemo
8/14/22 (1513 EST): creates MergedDemo, so far combining Import Character into New Game.

Includes a modification of themes, change of script name from grabFocus.gd --> ImportCharacter.gd and mods for writing the char sheet out with semicolon (;) line ends and colon (:) dividers from keys and values for now.
2022-08-14 15:16:01 -04:00
Andrew Tang
c0243c67f2 Updating multiplayer test to have more customization 2022-08-15 03:09:55 +08:00
PersonGuyGit
d9c28b08f9 Worked with Doug, to find the root cause of the errors with Alignment, in the settings menu GUI, 2022-08-14 11:58:56 -06:00
PersonGuyGit
b7a711de88 Started making the Dialogic themes more inline with those created by Doug. 2022-08-07 12:57:14 -06:00
PersonGuyGit
c4490bfd21 Created a template Godot project for toolset devlopment. 2022-08-07 12:15:26 -06:00
Andrew Tang
348823f34f Squashed commit of the following:
commit db69386b6d
Author: Andrew Tang <tandrew@gmail.com>
Date:   Mon Aug 1 02:48:32 2022 +0800

    Test Lobby Working

    Server creation works and others are able to join by entering the creator's IP. Shows a list of player names (currently only shows player #)

commit 3fbf2640da
Author: Andrew Tang <tandrew@gmail.com>
Date:   Mon Jul 25 02:29:27 2022 +0800

    Test Multiplayer

commit 59b74b946a
Author: Andrew Tang <tandrew@gmail.com>
Date:   Mon Jul 11 01:16:34 2022 +0800

    Complete DiceRoller Singleton Version

    Created script: "DiceRoller.gd" to be the only dice script attached to a node and will act as a singleton. A single DieManager object is created in this script. The DieManager's values can be changed and methods can be called through the DiceRoller Script

commit 3a402d4331
Author: Andrew Tang <90939405+TangoDevelopments@users.noreply.github.com>
Date:   Sun Jul 3 13:05:28 2022 -0400

    Delete .DS_Store

commit c00b24c60a
Author: Andrew Tang <90939405+TangoDevelopments@users.noreply.github.com>
Date:   Sun Jul 3 13:05:16 2022 -0400

    Delete .DS_Store

commit 4f788de0c7
Author: Andrew Tang <90939405+TangoDevelopments@users.noreply.github.com>
Date:   Sun Jul 3 13:05:05 2022 -0400

    Delete .DS_Store

commit c20fd85567
Author: Andrew Tang <tandrew@gmail.com>
Date:   Mon Jul 4 00:13:15 2022 +0800

    Added D10 and easier die selection
2022-08-08 02:00:04 +08:00
PersonGuyGit
3bbeb5ddd6 Started a UML diagram for the Dialog Editor, and created a toolset UML folder. 2022-08-07 11:51:02 -06:00
Andrew Tang
db69386b6d Test Lobby Working
Server creation works and others are able to join by entering the creator's IP. Shows a list of player names (currently only shows player #)
2022-08-01 02:48:32 +08:00
PersonGuyGit
1f98102ffe Added a note about where to find dialogic editors 2022-07-31 12:25:20 -06:00
PersonGuyGit
09ea2fb9c9 Installed SSH to ease my pushes, and created a documntation folder 2022-07-31 12:16:03 -06:00
PersonGuyGit
09f1961112 Made a toolset folder, and added the Dialogic plugin. 2022-07-31 11:30:54 -06:00
PersonGuyGit
ecf2d792cb Cleaned up the repo, added some changes to my documentation (not pushed yet), and started a popup error system. 2022-07-24 12:47:32 -06:00
Andrew Tang
3fbf2640da Test Multiplayer 2022-07-25 02:29:27 +08:00
PersonGuyGit
ab2d1a8840 Added some changes. 2022-07-10 13:08:41 -06:00
Andrew Tang
3a4ca5fdcd Squashed commit of the following:
commit 59b74b946a
Author: Andrew Tang <tandrew@gmail.com>
Date:   Mon Jul 11 01:16:34 2022 +0800

    Complete DiceRoller Singleton Version

    Created script: "DiceRoller.gd" to be the only dice script attached to a node and will act as a singleton. A single DieManager object is created in this script. The DieManager's values can be changed and methods can be called through the DiceRoller Script

commit 3a402d4331
Author: Andrew Tang <90939405+TangoDevelopments@users.noreply.github.com>
Date:   Sun Jul 3 13:05:28 2022 -0400

    Delete .DS_Store

commit c00b24c60a
Author: Andrew Tang <90939405+TangoDevelopments@users.noreply.github.com>
Date:   Sun Jul 3 13:05:16 2022 -0400

    Delete .DS_Store

commit 4f788de0c7
Author: Andrew Tang <90939405+TangoDevelopments@users.noreply.github.com>
Date:   Sun Jul 3 13:05:05 2022 -0400

    Delete .DS_Store

commit c20fd85567
Author: Andrew Tang <tandrew@gmail.com>
Date:   Mon Jul 4 00:13:15 2022 +0800

    Added D10 and easier die selection
2022-07-11 01:39:53 +08:00
Andrew Tang
59b74b946a Complete DiceRoller Singleton Version
Created script: "DiceRoller.gd" to be the only dice script attached to a node and will act as a singleton. A single DieManager object is created in this script. The DieManager's values can be changed and methods can be called through the DiceRoller Script
2022-07-11 01:16:34 +08:00
PersonGuyGit
38dcd62190 Pushed new changes and added a node for error handling 2022-07-03 12:33:38 -06:00
PersonGuyGit
9296dcacf6 Pushed new changes and added a node for error handling 2022-07-03 12:29:29 -06:00
Andrew Tang
3a402d4331
Delete .DS_Store 2022-07-03 13:05:28 -04:00
Andrew Tang
c00b24c60a
Delete .DS_Store 2022-07-03 13:05:16 -04:00
Andrew Tang
c20fd85567 Added D10 and easier die selection 2022-07-04 00:13:15 +08:00
Andrew Tang
e338cf1c47 Initial version of diceroller
Built a simple UI to test out the dice roller. Can handle multiple die and supports D4, D6, D8, D10, D12, and D20 (Let me know if there shouldn't be a restriction on the valid types of die).
2022-06-27 01:40:01 +08:00
PersonGuyGit
2cb9448f73 Pushed new changes 2022-06-19 12:57:43 -06:00
PersonGuyGit
a6889b6733 test today push 2022-06-05 11:42:28 -06:00
MacDugRPG
52b3564519 History Array Pager Display
This update displays the history from singleton history array.
2022-05-22 15:19:44 -04:00
darioGerussi
098854ec4a Completed initial UI version of multiplayer menu sections 2022-05-22 14:01:24 -05:00
MacDugRPG
8836f4686e History Display and Pager from More Options
Adds back saving to the history array, and the history page accessible from Game-->More Options. Includes history paging, which iterates through history.

Does not yet display the current history page.
2022-05-15 15:11:27 -04:00
darioGerussi
7464b851e0 Merge branch 'master' of https://github.com/RPG-Research/bcirpg 2022-05-15 13:56:28 -05:00
darioGerussi
4d33458b20 Updated settings pages 2022-05-15 13:56:24 -05:00
bakhtaward
ab0c2a962d Import Character Screen 2022-05-15 14:29:03 -04:00
MacDugRPG
e1fc845256 Persistent Game Scene
Keeps the game scene persistent while using the 'More Options' menu path. Resume game will now return to the existing scene (game at current place it was left behind). Also removes the old history process which is defunct -- history will now be saved to global/singleton history array, and when history loaded, instantiate a new history scene which reads/pages this array (and saves out later).
2022-05-08 15:13:24 -04:00
MacDugRPG
38c9a422b6 New Game Updates:
Creates a player character singleton (currently just a string), that's updated on load or create character, and displayed in the character pane during the game.
2022-05-01 14:48:03 -04:00
MacDugRPG
2db3306682 Theme updates:
Minor updates to change the readonly TextEdit colors for dark and light themes.
2022-05-01 14:42:26 -04:00
MacDugRPG
585950365f Themes updates:
The following updated on this commit:
1. styleboxflat .tres for white and black removed border. As mentioned in the chat, we probably want a different one of these for each (with and without borders)
2. set the baseline font for the TextEdit
3. selected increased font size for the label default
2022-05-01 14:21:46 -04:00
MacDugRPG
6b1d5b8b63 More Options; Char Sheet and Chat
Update adds More Options submenu, character sheet and chat. Note that loaded character not yet displaying on character sheet.
2022-04-24 15:13:24 -04:00
darioGerussi
d6a130fc4a update 2022-04-24 14:01:45 -05:00
MacDugRPG
5abbc73d37 Adds extension to game UI 2022-04-24 13:30:12 -04:00
MacDugRPG
de4498ccce Working Themes Added
Adds asset folder with the two themes, the fonts and styleboxflats for each.

We discussed keeping this themes location updated and adding it to all projects when we begin work.
2022-04-10 15:36:46 -04:00
MacDugRPG
60b8f7821b Character Selection Added
Adds character selection to the new game -- with create and load options with file dialog working. Right now this loads and saves text files -- does not update a persistent character object/singleton for example.

Note: this also requires a characterFiles folder in the user:// directory. Example character added to the _toArchive folder for now.
2022-04-10 15:22:25 -04:00
darioGerussi
17d90b130f Merge branch 'master' of https://github.com/RPG-Research/bcirpg 2022-04-10 14:00:53 -05:00
darioGerussi
013fa24dd1 Updates to Multiplayer file 2022-04-10 14:00:50 -05:00
To Live Is To Die
8fd1d3a524 Changes to settings menu, added singleton 2022-04-10 12:27:10 -06:00
darioGerussi
8897e5222a Create Themes folder with a README file 2022-04-10 13:16:30 -05:00
darioGerussi
dd87036a4a Multiplayer updates 2022-04-10 13:11:30 -05:00
darioGerussi
312d0d03fd Merge branch 'master' of https://github.com/RPG-Research/bcirpg 2022-04-03 14:12:15 -05:00
darioGerussi
7c2e66e434 Updated multiplayer "Join Game" screen 2022-04-03 14:12:13 -05:00
To Live Is To Die
33ce915df2 Made a working cfg file 2022-04-03 12:57:24 -06:00
To Live Is To Die
06e885f4cb Created a cfg file for the settings menu 2022-04-03 12:10:31 -06:00
darioGerussi
6046667b2f Created 3 new submenu folders
Created folders for Settings, LoadGame, and AddCharacter submenus
2022-03-29 21:34:57 -05:00
darioGerussi
6122b135c6 Started working on multiplayer submenus 2022-03-27 14:17:34 -05:00
To Live Is To Die
12d68d1231 Changes to settings menu 2022-03-27 12:05:25 -06:00
darioGerussi
128e8b79dc Reorganized folder layout
Reorganized the folders for a simpler and clearer layout.
2022-03-27 12:47:31 -05:00
To Live Is To Die
7b10e07456 PhaseII folder added 2022-03-20 11:43:14 -06:00