cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
39,704 Commits 26 Branches 0 Tags 2.5 GiB
Commit Graph

39704 Commits

Author SHA1 Message Date
clusterfack 5ee56a4cd3 Updates submodule (#22) 
* Updates submodule

Fix connect not entering server (with correct toml config) and compile error, updates submodule
Server still has an issue with toml file pointing towards sandbox instead of content and roundstart object initializations

* Updates more stuff

Needs my most recent PR on ss14 to function

* Submodule updated for real this time
 2018-01-18 20:00:35 +01:00
BobdaBiscuit 37091d1254 Adds a basic lantern item prototype (#15) 2017-11-16 17:21:33 -07:00
Pieter-Jan Briers 68f4fd995e Update submodule, fix HandsGui. 
HandsGui now works with the new system. The port was sloppy though so
somebody might want to come and refactor this so that it doesn't force
its own position and size.
 2017-11-13 19:48:21 +01:00
Pieter-Jan Briers ba152fc61d Make zip files compressed using DEFLATE 2017-11-02 21:34:47 +01:00
Pieter-Jan Briers 074e6d8b62 Fix code to work with engine update 2017-10-29 21:43:42 +01:00
Pieter-Jan Briers 283ed302db Update submodule 2017-10-29 20:24:51 +01:00
Pieter-Jan Briers 4b345c0ea6 Add --arch=64 to MacOS start script. 2017-10-26 17:58:48 +02:00
Pieter-Jan Briers fd4584519e Fix naming on MacOS artifacts. 
They said x86, which is wrong. They're called x64 now.
 2017-10-25 20:11:40 +02:00
Pieter-Jan Briers de19cf652a Enable MacOS builds! 2017-10-25 19:05:55 +02:00
Pieter-Jan Briers 7c840d71e2 Resource pack becomes Jenkins build artifact. 2017-10-25 18:12:53 +02:00
PJB3005 0d0e6b2feb Update submodule. Kinda test Jenkins auto-build. 2017-10-24 17:31:35 +02:00
Pieter-Jan Briers 984617eed8 Update submodule 2017-10-24 00:40:40 +02:00
Pieter-Jan Briers 2d16205091 Jenkins setup. (#13) 
* Adding test Jenkinsfile

* Will it be this simple?

* Maybe if I don't typo?

* Nuget restore needed.

* Work around NuGet bug hopefully.

The first person to run NuGet gets to own the /tmp/NuGetScratch folder, so jenkins breaks because I already ran NuGet personally.

* I'm a genius
 2017-10-24 00:11:08 +02:00
Serkket c41b867c7f A QOL Thing (#11) 2017-10-22 23:57:08 +02:00
Pieter-Jan Briers 7f196fc415 Doors! (#12) 
* Doors WiP

* Kinda seem to work now?

* Finished

* Oh yeah maybe enable that.

* It works except it doesn't

* Undo formatting changes

* BuildChecker too
 2017-10-22 23:48:01 +02:00
Pieter-Jan Briers ec3e7968a6 Update submodule 2017-10-22 23:47:41 +02:00
Pieter-Jan Briers 82fbec02f0 Update submodule 2017-10-22 20:49:55 +02:00
Pieter-Jan Briers 9bd6200625 Update submodule 2017-10-22 19:37:24 +02:00
Pieter-Jan Briers dac4f9cb3f Update submodule 2017-10-22 18:01:08 +02:00
Pieter-Jan Briers 8a11d2c649 Update submodule 2017-10-21 23:00:50 +02:00
Pieter-Jan Briers 2c99c8cb86 Fix release builds 2017-10-21 22:33:39 +02:00
Pieter-Jan Briers b6eb825c5c Fix clothing.yml prototypes. 2017-10-21 19:40:26 +02:00
Pieter-Jan Briers 3601245d6f Make platform control better 2017-10-21 15:32:22 +02:00
Silver de46359742 Update Rejected Coders 
memes
 2017-10-20 13:38:48 -06:00
PJB3005 de4583d14b Fix compile from removal of SFML. 2017-10-20 20:55:59 +02:00
PJB3005 60f975f0dc Update submodule 2017-10-20 20:49:05 +02:00
PJB3005 d38cc0ee82 Some item stuff I had laying around. 2017-10-20 20:46:36 +02:00
PJB3005 36141f3b1a Update submodule 2017-10-09 18:49:00 +02:00
Pieter-Jan Briers 6f89d0672d Urist's damage and health thing. (#10) 
* Add prototype for temperature testing entity.

* Add Damageable, Destructible, Temperature. Add a prototype based on those.

* Works and cleaned up.

* Nerf
 2017-10-07 15:15:29 +02:00
Pieter-Jan Briers 7597cd9172 Interactable component system. (#9) 
* InteractableComponent v1. Broken edition

* It works!
 2017-10-06 21:05:21 +02:00
Silver 8c1fa84c6e Merge pull request #8 from space-wizards/17_09_24-inventories 
Inventories!
 2017-09-30 09:32:45 -06:00
PJB3005 7bc132bc0d Merge branch 'master' into 17_09_24-inventories 2017-09-30 16:57:23 +02:00
PJB3005 ec4c864354 update submodule 2017-09-30 16:57:06 +02:00
PJB3005 26e9c37be1 Functional GUI! 2017-09-30 16:56:19 +02:00
PJB3005 4c4687eb8e Merge branch 'master' into 17_09_24-inventories 2017-09-30 12:22:35 +02:00
PJB3005 b8e01208af Update submodule 2017-09-30 12:22:05 +02:00
PJB3005 c7de994183 Item pickup seems to work, crash due to netcode. 2017-09-30 12:17:45 +02:00
PJB3005 b0b220f085 Hand switching works! 2017-09-29 18:38:27 +02:00
PJB3005 5fd0e31920 Merge branch 'master' into 17_09_24-inventories 2017-09-29 18:30:32 +02:00
PJB3005 bf10d34a8d Update submodule 2017-09-29 18:30:20 +02:00
PJB3005 1b44e84ef3 Merge branch 'master' into 17_09_24-inventories 2017-09-26 23:28:20 +02:00
PJB3005 66ec5864d0 Update submodule 2017-09-26 23:24:02 +02:00
PJB3005 f40cffa746 Fix init ordering issue with hands. 2017-09-26 23:10:10 +02:00
PJB3005 4caa13f1c0 Merge branch 'master' into 17_09_24-inventories 2017-09-26 21:59:21 +02:00
PJB3005 6864a457fe Update submodule 2017-09-26 21:59:06 +02:00
PJB3005 d345316db8 Make NetID use 1000+ range 2017-09-26 21:58:45 +02:00
PJB3005 a2399f8842 Merge branch 'master' into 17_09_24-inventories 2017-09-26 21:29:00 +02:00
PJB3005 92947a507c Update submodule 2017-09-26 21:28:32 +02:00
PJB3005 4f2d059de4 Simple network replication for hands, untested. 2017-09-26 21:27:48 +02:00
PJB3005 a464acf354 Ignore item and inventory client side. 2017-09-26 19:59:31 +02:00