Commit Graph

9869 Commits

Author SHA1 Message Date
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
Pieter-Jan Briers
eacfa34c99 Fix parallax generation.
It broke when IoC got made thread local,
since it is done in the thread pool.
2019-05-08 22:01:14 +02:00
moneyl
296288e99d Merge pull request #1 from space-wizards/master
Match fork with origin
2019-05-08 10:54:50 -04:00
Pieter-Jan Briers
0ccefebc52 Entering text into lobby chat box does not release focus. 2019-05-08 16:49:59 +02:00
Pieter-Jan Briers
29304a7714 Handle existing players on restartround correctly. 2019-05-08 16:42:36 +02:00
Pieter-Jan Briers
d15998ed16 Make sure SpeciesUI defaults to having a correct icon. 2019-05-08 15:32:30 +02:00
Pieter-Jan Briers
90620db5f8 Adds shoddy death match system.
It barely even works but oh well.
2019-05-08 09:55:36 +02:00
Pieter-Jan Briers
a014b40972 Update submodule 2019-05-08 09:55:00 +02:00
Pieter-Jan Briers
41b5c4dba2 Hide spam from storage component. 2019-05-06 19:31:04 +02:00
Pieter-Jan Briers
1fa63179d1 Fix character UI being broken.
Also transition everything away from tscn files.
2019-05-05 23:14:40 +02:00
Pieter-Jan Briers
e35d5390db Storage system refactor & map init.
* Demonstrated map init working with guns, toolboxes, tool lockers.
* Refactored EntityStorage and ServerStorage to have a common interface.
* EntityStorage no longer uses ServerStorage PURELY for visuals.
  Use an appearance visualizer instead.
2019-05-05 18:52:06 +02:00
Pieter-Jan Briers
030f1f2a57 Commit new map file. 2019-05-05 15:45:16 +02:00
Pieter-Jan Briers
61eb340945 Update submodule 2019-05-05 15:45:05 +02:00
Pieter-Jan Briers
b7d30f0870 Remove manual container ejection checking code.
This fixes map load when something is in a storage component.
2019-05-05 13:09:21 +02:00
Pieter-Jan Briers
23d8b92f94 Implement updates to containers for ContainerSlot. 2019-05-05 13:08:56 +02:00
Pieter-Jan Briers
5a5e201c7c Update submodule. 2019-05-05 13:08:38 +02:00
Pieter-Jan Briers
1d3f61de3c Update submodule, remove Godot references. 2019-05-05 02:03:40 +02:00
Pieter-Jan Briers
c8cdde5d40 Remove Godot support. (#215)
Remove Godot support.
2019-05-05 02:01:19 +02:00
Pieter-Jan Briers
deaae06787 Remove Godot support. 2019-05-05 01:54:28 +02:00