tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,496 Commits 3 Branches 5 Tags
d71b88a747e20f90b07f7e40437e0bbd4435e15c
Commit Graph

25496 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Pieter-Jan Briers
ff0f309f31 Merge branch 'master' of github.com:space-wizards/space-station-14 2019-05-04 23:29:21 +02:00
Pieter-Jan Briers
89b77bbed8 Content-side integration tests. (#214) 
Content-side integration tests.
 2019-05-04 23:29:11 +02:00
Pieter-Jan Briers
ec1a4c6601 Use Unicode ³ for lathes. 2019-05-04 22:35:49 +02:00
Pieter-Jan Briers
71e2e2c768 Update submodule 2019-05-04 22:19:36 +02:00
Pieter-Jan Briers
dc2d3f94cb Fix constructionmenu layout. 2019-05-04 19:18:24 +02:00
Pieter-Jan Briers
ea38075feb Update submodule 2019-05-04 17:51:49 +02:00
Pieter-Jan Briers
e00d4f7b26 Fix macOS app bundles failing to start. 2019-05-03 14:05:21 +02:00
Pieter-Jan Briers
cb7e5d4214 Content-side integration tests. 
Currently only tests that the server starts.
 2019-05-03 13:34:49 +02:00
Pieter-Jan Briers
186138e9b5 Merge pull request #213 from Pireax/master 
Fix locker colliding with items
 2019-05-03 13:32:29 +02:00
Pireax
50780f5cf0 Fix locker colliding with items 2019-04-30 18:23:24 +02:00
Pieter-Jan Briers
f249c19eaf Fix a couple warnings. 2019-04-29 13:12:50 +02:00
Pieter-Jan Briers
77d92675e2 Fix player attachment events. 2019-04-29 12:53:09 +02:00
Pieter-Jan Briers
02e35502a1 Changed some function names on IMapGrid. (#212) 
UnitTesting project is now filtered out of the code coverage.
 2019-04-29 12:52:47 +02:00
Pieter-Jan Briers
dc3369d198 Update submodule 2019-04-29 12:51:24 +02:00
Acruid
25b50ebb27 Changed some function names on IMapGrid. 
UnitTesting project is now filtered out of the code coverage.
 2019-04-28 22:08:27 -07:00
Pieter-Jan Briers
6e5680b3c2 Engineering lockers. (#210) 
* Import Eris engineering locker sprites.

* Allow customizing ClientStorageComponent open/close states better.

* EntityStorage does not blow up if Storage is also defined in prototype.

* Engineering styled lockers.
 2019-04-26 23:44:26 +02:00
Víctor Aguilera Puerto
fe0414eda7 Lathes (#207) 
* Recipe stuff.

* Lathe GUI and stuff

* god dammit

* Lathe menu works, yay.

* EventArgs henk

* Some work

* SS14 -> Robust

* More SS14 -> Robust

* Lathe materials

* Lathe works, Lathe GUI, Queue GUI, etc

too many changes to name them here

* Remove materials button, add ViewVariables and update lathe on connect

* Add Autolathe RSI

* Adds new recipes, fixes a few bugs.

* Remove unused ScrollContainers

* Use same delegate for spawn.

* Removes client-side LatheComponent in favor of BoundUserInterface

* Remove GetMaterial and TryGetMaterial

* Use auto-properties in a few places.

* Adds LatheDatabase, and a bunch of other changes

* Remove useless log.

* Remove lathetype from prototypes.

* Turns Storage, Lathe and Database into autoproperties

* Remove Hacked property from LatheRecipePrototype

* Remove unneeded dependency injection from components

* Refactors LatheDatabaseComponent to use ComponentState

* Refactors MaterialStorageComponent to use ComponentState

* Oopsie

* Another oopsie

* Last oopsie, I hope

* Fix missing Close call.
 2019-04-26 15:51:05 +02:00
Pieter-Jan Briers
092539ae59 Update submodule 2019-04-26 15:50:07 +02:00
DamianX
b16768fd0b Moved dropping items over PlaceableSurfaces from AfterAttack to AttackBy (#209) 
Added ClickLocation variable to AttackByEventArgs
 2019-04-25 23:22:51 +02:00
Pieter-Jan Briers
8655dcaaf6 Fix typo in welder description. 2019-04-22 16:55:27 +02:00
Pieter-Jan Briers
66621de270 Fix being unable to focus chat with hotkey. 2019-04-22 16:52:08 +02:00
Pieter-Jan Briers
a75ec704e6 Fix being unable to fire guns. 2019-04-22 16:51:58 +02:00
Pieter-Jan Briers
5f00394f4f Fix macOS launcher script 2019-04-22 00:33:32 +02:00