tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
537 Commits 3 Branches 5 Tags
02e13d018285f507d2b934a697430a084e19090c
Commit Graph

537 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pieter-Jan Briers
02e13d0182 Merge pull request #237 from Moneyl/fix-release-package-build-script 
Fix the release package build script
 2019-05-25 00:10:54 +02:00
moneyl
fe483897a6 Fixes the release package build script 
Removes `copy_godot_scenes` which copies the files from Resources/Scenes into the release package folder. This function breaks builds with the latest commit #220 as it removed the remaining scene (tscn) files from the content repo and deleted the Scenes folder.
 2019-05-24 17:45:41 -04:00
Pieter-Jan Briers
54449038ef Merge pull request #220 from Moneyl/no-tscn 
Remove GUI dependence on tscn files
 2019-05-24 23:23:58 +02:00
moneyl
b9f7c65c05 Use SetAnchorPreset instead of manually setting each anchor 2019-05-24 16:25:44 -04:00
moneyl
338a8e463e Move GUI size init into constructor 
Setting the initial size in `Initialize` has no effect on the windows size so it's set in the constructor instead.
 2019-05-24 16:25:44 -04:00
Pieter-Jan Briers
9c9a9db9a0 Update submodule 2019-05-24 22:00:16 +02:00
Pieter-Jan Briers
51c323963c Merge pull request #236 from Moneyl/add-missing-bbox-aabb 
Adds collision to several power entities
 2019-05-24 21:57:54 +02:00
Pieter-Jan Briers
7e703760c8 Merge pull request #233 from Acruid/19-05-16_ExamineImprovements 
Examine Improvements
 2019-05-24 21:56:40 +02:00
Pieter-Jan Briers
48b6a8c725 Merge pull request #232 from Acruid/19-05-22_PlatformErrorSpam 
Fix Missing Platform Property
 2019-05-24 21:51:32 +02:00
Pieter-Jan Briers
96daace170 Merge pull request #231 from Acruid/19-05-15_VerbVis 
Verb Visibility
 2019-05-24 21:51:06 +02:00
moneyl
196ec030f5 Add aabb values and Collidable component to power objects 2019-05-23 15:46:43 -04:00
moneyl
377bd1890e Update submodule. 2019-05-23 15:43:16 -04:00
Acruid
e40f9b20e3 Added a range check for examining entities. Now you can't examine things across the map. 
Made the examine window a little transparent so that you can see things behind it. This prevents the examine popup from occluding gameplay.
Moved the ExamineEntity bind from Human to Common context so that it will always be available to clients. Ghosts can now examine things.
 2019-05-22 12:59:30 -07:00
Acruid
ce163bdd80 Removes error spam about missing Platform. 
Content.IntegrationTests now defaults to x64 platform.
 2019-05-22 12:19:42 -07:00
Acruid
d52e5ccbfb Verbs can now set themselves as invisible. 2019-05-22 08:53:50 -07:00
moneyl
f489bee686 Merge branch 'master' into no-tscn 2019-05-19 02:14:24 -04:00
Pieter-Jan Briers
8c6f6f3fb0 Merge pull request #227 from Moneyl/construction-null-step-crash-fix 
Fixes server crash due to null construction step
 2019-05-18 23:24:55 +02:00
Pieter-Jan Briers
877dcc996c Merge pull request #226 from Moneyl/empty-hand-crash-fix 
Empty hand crash fix
 2019-05-18 23:23:56 +02:00
moneyl
7e30ffe007 Fixes server crash due to null construction step 
ConstructionComponent.AttackBy tries calling TryProcessStep on the forward step of the construction stage, and if that fails it tries the backwards step. I many construction prototypes the backwards step is null for all stages and so clicking the construction ghost with an invalid step results in a crash due to the step passed to TryProcessStep being null.
 2019-05-18 17:10:19 -04:00
moneyl
916b1521a0 Fixes server crash when clicking empty hand with full hand 2019-05-18 13:26:58 -04:00
moneyl
bc3942127b Fixed construction menu default size being huge 2019-05-17 10:36:29 -04:00
moneyl
4bb02d64fb Remove storage menu dependence on tscn file 2019-05-17 10:35:41 -04:00
moneyl
e40b775f7c Added properties for several ui controls to ApcWindow 
By PJBs suggestion. Cleaner to do this instead of repeatedly calling GetChild. Also changed ApcBoundUserInterface._window from an SS14Window to an ApcWindow to avoid extra type casting.
 2019-05-16 13:24:55 -04:00
moneyl
ddcdeca4ea Removed construction menu dependence on tscn file 
One minor issue remains with this that I can't resolve. The construction window starts off much larger than the tscn dependent version on master. It can be shrunk manually and it'll look the same, but it'd be nice to keep it as it was. Tried manually changing the window size and changing the size flags but couldn't get it to work as I wanted.
 2019-05-16 13:24:55 -04:00
Pieter-Jan Briers
d81254e389 Interaction rework. (#225) 
Interaction rework.
 2019-05-16 16:47:45 +02:00
Pieter-Jan Briers
b64643ecd6 Adds tutorial, remap some buttons to be more in line with SS13. 2019-05-16 16:25:06 +02:00
Pieter-Jan Briers
c197278c6f Interaction rework. 
IActivate is now more used. IAttackHand falls back to IActivate.
 2019-05-16 15:51:32 +02:00
Pieter-Jan Briers
1a5c4ad83c Give badmins access to round commands. 2019-05-16 14:41:26 +02:00
Pieter-Jan Briers
818ee83440 Remove IDisplayManager dependency from SS14Window, content changes. 2019-05-16 14:28:34 +02:00
Pieter-Jan Briers
91de6f80b1 Fix player list being blank when re-joining lobby. 2019-05-16 14:18:33 +02:00
Pieter-Jan Briers
792b219b04 Prevent server crashing without gamepreset override. 2019-05-16 14:09:11 +02:00
moneyl
2b0ca2dd8b Moved APC controls creation into the ApcWindow constructor 2019-05-15 12:31:54 -04:00
Pieter-Jan Briers
a903ffb105 Allow admins to change round preset. 2019-05-15 15:49:02 +02:00
moneyl
bec187d997 Slight chatbox changes to fit existing code style and naming 2019-05-14 23:52:00 -04:00
moneyl
2917a87ce7 Removed APC gui dependence on tscn file 2019-05-14 23:49:53 -04:00
moneyl
3fa2e0c976 Removed chatbox dependence on tscn file 
This turned out to be much simpler than how I was initially making it. The important thing to note is that without setting the margin and anchor values for the chatbox itself (not it's children) it won't show up on the screen.
 2019-05-14 17:43:06 -04:00
moneyl
51eae9d30c Merge pull request #3 from space-wizards/master 
Pull more changes from upstream
 2019-05-14 16:52:00 -04:00
Pieter-Jan Briers
e68a5c8402 Move Escape Menu to Content. 2019-05-14 15:19:41 +02:00
Pieter-Jan Briers
304b4d8542 Update submodule 2019-05-14 12:56:09 +02:00
Pieter-Jan Briers
cbca48ebbb Add online player list to lobby UI. 2019-05-14 12:54:47 +02:00
Pieter-Jan Briers
a78a07d0c4 UI styling improvements. 
Especially for the lobby.

CSS really paying off here.
 2019-05-14 09:57:51 +02:00
Pieter-Jan Briers
ad3b3c9f4f Add explicit placeholders to the lobby. 2019-05-14 08:38:49 +02:00
Pieter-Jan Briers
96fbde3413 Adds a UI element to act as placeholder. 2019-05-14 01:19:25 +02:00
Pieter-Jan Briers
88c29abe5e Transition lobby from tscn to C#, localization support for lobby. 2019-05-14 00:23:58 +02:00
Pieter-Jan Briers
331cfaa1c5 Update submodule. 2019-05-14 00:23:02 +02:00
Pieter-Jan Briers
9a1f37d476 Update submodule, switch to .NET Framework 4.7.2 2019-05-11 16:10:09 +02:00
Pieter-Jan Briers
57bcb2a16d Make content UI scaling aware. 2019-05-11 16:05:41 +02:00
Pieter-Jan Briers
fa8fbc49f5 Update submodule. 2019-05-11 16:05:28 +02:00
Pieter-Jan Briers
c0edf2aeed Clean up NanoStyle: 
1. Run code formatting.
2. Condense some rules down.
 2019-05-08 23:19:17 +02:00
moneyl
e0e5f6355c Merge pull request #2 from space-wizards/master 
pull from head
 2019-05-08 16:18:02 -04:00