Commit Graph

8253 Commits

Author SHA1 Message Date
Krzysztof Skrzętnicki
2aeb2dc7e0
remove 'craft' variable, no longer needed 2018-01-02 18:16:57 +01:00
Krzysztof Skrzętnicki
417db7b60c
Implement queues for inbound resources
There are now input queues per resource (currently flat 20 per resource type) along with indicator of how full the queue is.
2018-01-02 18:14:38 +01:00
Anuken
7f8598f2bc Re-added sand, better teleporter/sorter UI 2018-01-02 12:14:14 -05:00
Anuken
abcd7464ad
Merge pull request #43 from BeefEX/feature_rich_presence
Discord rich presence
2018-01-02 11:31:56 -05:00
Anuken
2496bfb012
Merge branch 'master' into feature_rich_presence 2018-01-02 11:31:48 -05:00
Jan Polák
4a706a8a29
Merge branch 'master' into feature_rich_presence 2018-01-02 17:26:28 +01:00
BeefEX
86802b98c2 Fix debug mode enabled 2018-01-02 17:21:46 +01:00
BeefEX
12fad819b5 Discord integration, basic rich presence 2018-01-02 17:21:03 +01:00
Anuken
d5d03dd759 Added a basic crash reporter 2018-01-01 22:50:56 -05:00
Anuken
8a38160124 Implemented LAN discovery 2018-01-01 22:13:20 -05:00
Anuken
24248df4af Started working on discovery, implemented GWT saving 2018-01-01 21:33:51 -05:00
Anuken
1b55d00254 Commented out extra items 2018-01-01 18:13:34 -05:00
Anuken
af9407f61f Updated uCore 2018-01-01 18:02:35 -05:00
Anuken
c8e41c08ea Fixed Kryo crash 2018-01-01 18:01:24 -05:00
Anuken
20eea3b385 Switched to different Kryonet fork; full Android support 2018-01-01 16:09:17 -05:00
Anuken
c7dbdd1773 Modularized Kryonet handler 2018-01-01 13:32:18 -05:00
Anuken
4bf78587db Fixed absolutely nothing 2017-12-31 22:29:11 -05:00
Anuken
f13dc0c49d Basic android support 2017-12-31 22:18:39 -05:00
Anuken
62ae6dc159 More multiplayer setup, possible android support 2017-12-31 22:06:18 -05:00
Anuken
701c7f6e78 Implemented full multiplayer; block syncing still unfinished 2017-12-31 19:56:40 -05:00
Anuken
b6845d5d10 Updated uCore 2017-12-31 14:24:08 -05:00
Anuken
36e357819b Basic multiplayer placing/breaking/movement (broken) 2017-12-31 14:23:13 -05:00
Anuken
eecd0f6d02 Implemented sending of players to client (incomplete) 2017-12-30 23:06:43 -05:00
Anuken
7b1c8d5769 Implemented server sending world data to client 2017-12-30 22:02:23 -05:00
Anuken
673d6ac8e8
Merge pull request #40 from Anuken/multiplayer
Multiplayer
2017-12-30 19:46:36 -05:00
Anuken
66938b770d
Merge branch 'master' into multiplayer 2017-12-30 19:46:24 -05:00
Anuken
85ade1b346
Merge branch 'master' into multiplayer 2017-12-30 19:44:31 -05:00
Anuken
6db329900e Fixed save delete causing a crash 2017-12-30 19:37:09 -05:00
Anuken
25488d00e6 Slowly descending into a branchy mess 2017-12-30 19:36:23 -05:00
Anuken
4a2b2dee72 Added NetClient/NetServer classes 2017-12-30 19:20:20 -05:00
Anuken
e7a88811c0 Fixed saves not being overwritten 2017-12-30 19:00:55 -05:00
Anuken
0c4397fd08 Set autosavedefault to 1.5 minutes 2017-12-30 18:57:22 -05:00
Anuken
ac581180b7 Merge remote-tracking branch 'origin/master' 2017-12-30 18:55:06 -05:00
Anuken
efd53b6180 Made game autosave when quitting 2017-12-30 18:54:25 -05:00
Anuken
79e18f7f4d Implemented basic client/server connection and title font 2017-12-30 18:40:02 -05:00
Anuken
8602856001
Merge pull request #39 from Tener/patch-1 2017-12-30 17:13:14 -05:00
Krzysztof Skrzętnicki
d9d247f9f7
Omnidrill will report unproductive base surface
In contrast with one-resource drill, the omnidrill is not reporting it has been placed on unproductive base surface (i.e. water, grass, sand, lava etc.). This change fixes this issue.
2017-12-30 22:03:01 +01:00
Anuken
af64e4f021 Fixed enemies not considering conveyors as bridges 2017-12-30 13:40:21 -05:00
Anuken
c14e233723 Basic server hosting done 2017-12-30 13:39:37 -05:00
Anuken
e24179cd4c Added full Kryonet server/client implementation 2017-12-30 12:28:17 -05:00
Anuken
14093c8915 Added french bundle 2017-12-30 11:45:13 -05:00
Anuken
f6e9710b33 Added basic Kryonet support 2017-12-30 11:43:47 -05:00
Anuken
94f968bdc2 Merge branch 'master' of https://github.com/Anuken/Mindustry 2017-12-30 11:00:34 -05:00
Anuken
f0c60b9f15
Merge pull request #38 from Anuken/4.0 2017-12-30 10:59:34 -05:00
Anuken
40e4722147 Updated uCore, removed debug save message 2017-12-30 10:51:56 -05:00
Anuken
d628600657 Added some new block types, fixed some save dialog issues 2017-12-30 10:51:56 -05:00
Anuken
1cb2609be8 Updated uCore, removed debug save message 2017-12-30 10:44:08 -05:00
Anuken
7e2502dbe4 Added some new block types, fixed some save dialog issues 2017-12-29 23:05:52 -05:00
Anuken
54662ee83f Added some new resources 2017-12-29 19:59:58 -05:00
Anuken
e39f9c624d Changed strange list access for items and liquids 2017-12-29 19:35:34 -05:00