Commit Graph

82 Commits

Author SHA1 Message Date
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
PJB3005
c85436118a Basic example prototype that manages not to crash. 2017-09-25 21:00:53 +02:00
PJB3005
fc1c29d14f Merge branch 'master' into 17_09_24-inventories 2017-09-25 20:55:24 +02:00
PJB3005
17ea432604 Update submodule 2017-09-25 20:54:16 +02:00
PJB3005
3e0bcddd4d Done I hope. Needs testing and type checker updates.
waiting on https://github.com/space-wizards/space-station-14/pull/422
2017-09-25 20:52:39 +02:00
PJB3005
73ae408e20 More inventory work. APIs implemented.
Still need to do prototype loading and test cases.
2017-09-24 23:19:47 +02:00
Pieter-Jan Briers
66483bdd72 Can* API functions by Yota's request. 2017-09-24 22:24:54 +02:00
PJB3005
f6e265bccb Inventories WiP 2017-09-24 21:09:26 +02:00
PJB3005
60ff292f14 Fix content assemblies not being loaded.
They were put in the wrong directory.
2017-09-24 16:41:15 +02:00
Pieter-Jan Briers
b2806dcb75 Update submodule 2017-09-23 22:12:28 +02:00
Pieter-Jan Briers
55b9e367b3 x64 build platform. 2017-09-23 00:35:08 +02:00
Pieter-Jan Briers
2d91344a5b Update submodule to 6e535df92627ba4f07685baa4ef6c6abb39e372f 2017-09-23 00:05:54 +02:00
clusterfack
eee05e1451 Adds basic wire object (#6)
* Adds basic wire object

* Tests out the entity parenting system
2017-09-14 23:46:34 -05:00
clusterfack
6d28ce7641 Update submodule (#7) 2017-09-14 23:45:49 -05:00
PJB3005
4e48f2d581 Update submodule again. 2017-08-23 11:09:01 +02:00
PJB3005
6d4e532ebe Update submodule. 2017-08-23 08:01:20 +02:00
PJB3005
73c02f74f2 Disco ball small edition
Example of inheritance in action.
2017-08-22 23:54:48 +02:00
PJB3005
7add727db0 Disco Ball prototype 2017-08-22 23:48:51 +02:00
PJB3005
44cdd5ed55 Update submodule 2017-08-22 23:19:36 +02:00
PJB3005
7fda197391 Remove SFML from shared and server. 2017-08-21 23:51:13 +02:00
PJB3005
8ca10e4f0b Update submodule. 2017-08-21 23:41:05 +02:00
PJB3005
8a43a7022d Remove x64 platform target. 2017-08-19 11:27:51 +02:00
PJB3005
e46e4a7993 Fix SFML references. 2017-08-19 11:24:49 +02:00