Commit Graph

6212 Commits

Author SHA1 Message Date
Anuken
acb3438cc8 More entity processor features 2020-02-02 11:51:58 -05:00
Patrick 'Quezler' Mounier
4c369dd17c Hide drop zone warning if you're part of the wave team (#1492) 2020-02-02 10:41:09 -05:00
Anuken
7ddfcbfabd Utility method copying 2020-02-02 00:39:29 -05:00
Anuken
da2aee7d31 Entity components based on code generation - experiment 2020-02-01 23:54:41 -05:00
Anuken
9f20ff151c Shortened annotation processors 2020-02-01 17:27:24 -05:00
Anuken
5f7fc3441c Merge remote-tracking branch 'origin/master' 2020-02-01 17:17:08 -05:00
Anuken
62179233ef Bugfixes 2020-02-01 17:17:03 -05:00
fuzzbuck
376e3d6ef1 Add mindustry.io to servers.json (#1467)
- huge community (~1.5k members)
- anti-grief measures (discord bot <-> in-game moderation)
- huge map pool (50+)
- stable, powerful server based in europe
2020-02-01 17:14:06 -05:00
Anuken
eabebcefc7 Disabled data folder button due to terrible file manager support 2020-01-31 23:09:21 -05:00
Anuken
63d84bead3 Cleanup 2020-01-31 20:10:21 -05:00
Anuken
51b4824c92 Fixed #1484 2020-01-31 11:07:25 -05:00
Anuken
2721aa550d Implemented #1444 2020-01-30 22:56:17 -05:00
Anuken
f92b91c17b Switched to arc bloom 2020-01-30 17:50:35 -05:00
Anuken
221b28c153 Merge remote-tracking branch 'origin/master' 2020-01-30 17:43:48 -05:00
Anuken
7c2541afa2 Fixed bloom black screen on iOS/Android 2020-01-30 17:43:36 -05:00
Vam-Jam
36782a2454 [Fix] lastMessage doesnt change if prevented by antispam (#1471)
Fixes issue #1470
2020-01-29 11:32:41 -05:00
Patrick 'Quezler' Mounier
55932d03c9 Do ¬ bump empty conveyors 2020-01-29 10:33:39 +01:00
Patrick 'Quezler' Mounier
93faf128b7 Bump up the chain to update in unison 2020-01-29 10:12:18 +01:00
Patrick 'Quezler' Mounier
56b2cc2745 Fix unloading on a corner 2020-01-29 09:05:00 +01:00
Patrick 'Quezler' Mounier
d2869b976d Fix comment in 〃 2020-01-29 09:04:46 +01:00
Patrick 'Quezler' Mounier
432b555f1b Optimize with sleeps
Ehmm i meant recharge cycles, beep boop.
2020-01-29 09:02:53 +01:00
Patrick 'Quezler' Mounier
db1a2ddc64 Move start & end logic into entity snek bits 2020-01-29 08:03:53 +01:00
Patrick 'Quezler' Mounier
88282a8c0b Prevent turns from being considered the end 2020-01-29 07:48:14 +01:00
Patrick 'Quezler' Mounier
4674e5ad68 Merge branch 'master' into crater 2020-01-28 20:06:16 +01:00
Anuken
97cfc33abb Merge remote-tracking branch 'origin/master' 2020-01-28 13:44:13 -05:00
Anuken
867a642859 Fixed #1460 2020-01-28 13:44:06 -05:00
Anuken
d99cad8793 Update SERVERLIST.md 2020-01-28 13:28:34 -05:00
kf-games
2a11f65e10 Add server MINDUSTRY.RU (#1463)
Add server MINDUSTRY.RU
Server 24/7 Online
380+ Maps
Have a motd
There are moderators
Server in uninterrupted operation since October 2019
2020-01-28 13:05:55 -05:00
Patrick 'Quezler' Mounier
babe00245a Comment on crater-deploy.sh 2020-01-28 14:52:09 +01:00
Patrick 'Quezler' Mounier
ff578c8540 Repurpose branch to be played
When anuke shows more interest in this branch the changes that stem from this can be reversed and squashed, but people want to play it, and keeping 2 crater related branches in sync is frankly a pain 😗
2020-01-28 14:31:32 +01:00
Patrick 'Quezler' Mounier
445126ea65 Rename Track to CraterConveyor
though it does not extend the conveyor class.
2020-01-28 11:41:20 +01:00
Patrick 'Quezler' Mounier
2683c74800 Avoid assigning new object? 2020-01-28 11:10:23 +01:00
Patrick 'Quezler' Mounier
61197fe974 Remove duplicate code between first & take 2020-01-28 11:08:40 +01:00
Patrick 'Quezler' Mounier
89d143af8f Undo part of 〃 2020-01-28 11:00:08 +01:00
Patrick 'Quezler' Mounier
0f92f77b55 Draw crater unto plastanium conveyor icon
And remove whitespaces from the emoji one.
2020-01-28 10:57:51 +01:00
Patrick 'Quezler' Mounier
683211cb1f Untangle conveyor entanglement
Made track a standalone block due to the influx of conveyor code changes, and if it were ever to return it would make sense to also include the conduits in one form or another, like a 🐍 class/trait/abstract/method/etc
2020-01-28 10:41:30 +01:00
Patrick 'Quezler' Mounier
af83d08fb1 FIx inconsistencies in the diff 2020-01-28 07:59:11 +01:00
Patrick 'Quezler' Mounier
28765ef909 Merge branch 'master' into crater 2020-01-28 07:45:03 +01:00
Anuken
89e1c5afc0 Conveyor tweaks 2020-01-28 00:21:05 -05:00
Anuken
a2933e030a More severe votekick 2020-01-27 15:43:17 -05:00
Patrick 'Quezler' Mounier
8edcebd3a6 Undo moving other bundle keys into their place
Should be a different commit/pull
2020-01-27 19:42:27 +01:00
Patrick 'Quezler' Mounier
6eb6870bb6 Register crater emoji via ui folder
#1458
2020-01-27 19:33:36 +01:00
Patrick 'Quezler' Mounier
038fc72d7b Merge branch 'master' into crater 2020-01-27 19:17:22 +01:00
Anuken
d21c47a582 Merge remote-tracking branch 'origin/master' 2020-01-27 13:15:15 -05:00
Anuken
5ad0193a86 Fixed reduced conveyor edge throughput 2020-01-27 13:15:12 -05:00
MWestfall
881eca636d Update servers.json (#1457) 2020-01-27 12:55:18 -05:00
Patrick 'Quezler' Mounier
2e3f7d8db2 Merge branch 'master' into crater 2020-01-27 18:40:51 +01:00
Patrick 'Quezler' Mounier
883a2a9b59 Bruteforce crater emoji 2020-01-27 18:40:40 +01:00
Daniel Jennings
d849a3a87f Adding Steam Rich Presence support. (#1453)
* Steam Rich Presence support. I opted to put this code inside of
DesktopLauncher.java instead of SNet.java because it heavily overlaps
with the work the DiscordRPC code was already doing.

Testing wasn't easy because I had to figure out how the Steam version
actually runs normally, but it was straightforward once I figured out
what version information to slam into the JAR and fixed 'desktop:steamtest' to work locally with my paths.

Because of how Steam currently expects SetRichPresence to be used, I had
to upload to the Steam partner site a trivial Rich Presence loc token
called 'steam_status_raw' that just gets entirely substituted for the
'steam_status' RP token string. I didn't expect that I'd need to do
anything for localization support (and instead just let it use English
for everyone like Discord) but apparently Steam isn't happy if you
directly set 'steam_display' to a raw string (but I'm going to look at
that when I'm back at work because I don't know that we need that
requirement.)

* Whoops, left this in there from debugging the Steam connection.

* Fixing coding style, and also triggering another CI build
2020-01-27 12:17:52 -05:00
Patrick 'Quezler' Mounier
9a289c83e6 Fuse with conveyor optimization
# Conflicts:
#	core/src/mindustry/world/blocks/distribution/ItemConveyor.java
2020-01-27 18:06:48 +01:00