The Wait Is Over. (#49)

Browse Source

* Move submodule to Godot

* Update submodule AGAIN.

* Update project files.

* Remove WearableAnimatedSprite from prototypes.

* Remove content repo resource copier.

* Update submodule.

* Fix resource handling.

* Content.Client compiles by commenting out hands GUI.

* Update submodule.

* Fix prototype textures and update submodule.

* Update Submodule.

* Update submodule SOME MORE!

* Random WiP shit I guess

* Make omnisharp not choke on buildchecker.

* Update submodule.

* Highly WiP broken HandsGui code.

* Ok maybe let's not insult omnisharp.

* Fix annoying Omnisharp warning.

* Update submodule.

* Update submodule.

* Hey I forgot to push this but it didn't conflict!

* Fix hands GUI on godot.

* Update submodule.

* Obligatory submodule update.

* Work on exports.

* Work on exports.

* Update submodule.

* Update submodule.

* Fix dumb case mismatch between content and engine

* work pls.

* This maybe.

* Now!

* Update submodule.

* update submodule.

* Some WiP work on exporting aaah.

* OK READY FOR THE BUILDS SERVER.

* Probably should've made those commits in a different order.

* DO THE THING

* update submodule.

* Updates for effects system.

* Update submodule.

* Make file/line numbers show up on Windows Godot.

* Set submodule to master.

...

This commit is contained in:

Pieter-Jan Briers

2018-04-07 15:31:38 +02:00

committed by GitHub

parent 128728bfcb

commit 6704245a41

46 changed files with 579 additions and 668 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

Resources/Textures/Objects/crowbar.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 200 B

BIN

Resources/Textures/Objects/eightdirwire.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 389 B

BIN

Resources/Textures/Objects/generator.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 452 B

BIN

Resources/Textures/Objects/multitool.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 197 B

BIN

Resources/Textures/Objects/provider.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 195 B

BIN

Resources/Textures/Objects/screwdriver.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 177 B

BIN

Resources/Textures/Objects/storage.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 869 B

BIN

Resources/Textures/Objects/welder.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 330 B

BIN

Resources/Textures/Objects/wirecutter.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 216 B

BIN

Resources/Textures/Objects/wiredmachine.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 742 B

BIN

Resources/Textures/Objects/wirelessmachine.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 324 B

BIN

Resources/Textures/Objects/wrench.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 230 B