Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,128 Commits 4 Branches 180 Tags
v138
Commit Graph
15128 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
MWestfallandAnuken 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 JenningsandAnuken 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
AnukenandGitHub 5ebc04ab29 Update SERVERLIST.md 2020-01-27 11:59:17 -05:00
Anuken 379f860a6b Merge remote-tracking branch 'origin/master' 2020-01-27 11:01:57 -05:00
Anuken 65211a6021 Fixed #1447 2020-01-27 11:01:48 -05:00
AnukenandGitHub 9395fa99be Create SERVERLIST.md 2020-01-27 10:50:08 -05:00
Anuken b7e1adb8b1 Fixed 103 network compatibility 2020-01-27 10:19:18 -05:00
Petr Gašparík 315260f7f5 Czech translation - fix typos 2020-01-27 14:14:43 +01:00
VanguardandGitHub d1c2666fdd 1 changed line (new approach) 
techtree
 2020-01-27 16:11:23 +03:00
Petr Gašparík 69069e2ef3 Czech translation - mod display 2020-01-27 11:32:31 +01:00
Petr Gašparík de143a8e16 Czech translation for 103.x changelog 2020-01-27 11:30:23 +01:00
Anuken b9e8694e68 Added synced server label + effect methods 2020-01-27 00:25:32 -05:00
Anuken cd1ed97e52 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-01-27 00:11:24 -05:00
Anuken a61234d21e Minor tweaks 2020-01-26 21:50:55 -05:00
키에르andAnuken 9499b9dfaf Add custom text on screen (#1448) 2020-01-26 17:56:11 -05:00
Anuken 9baaacc8ac Crash fix 2020-01-26 16:55:24 -05:00
Anuken db3d4b170f Merge branches 'conveyor-refactor' and 'master' of https://github.com/Anuken/Mindustry 2020-01-26 16:12:35 -05:00
Anuken 621233a5b3 More optimization 2020-01-26 16:12:11 -05:00
Anuken 9a3245c23e Clamp 2020-01-26 15:13:55 -05:00
Anuken 6fe2697185 2x faster conveyor optimization 2020-01-26 15:04:00 -05:00
Anuken d7ea0bc21e why 2020-01-26 13:16:42 -05:00
Anuken adbfb15932 Cleanup 2020-01-26 13:13:01 -05:00
Anuken fda6ea4b45 Fixed #1452 2020-01-26 11:40:28 -05:00
Anuken 93cada6a16 Conveyor benchmark test 2020-01-26 11:40:09 -05:00
Anuken 0d5dd146ef Fixed #1451 2020-01-26 10:58:14 -05:00
NickibosssandAnuken 1207fb1440 Update bundle_it.properties (#1431) 2020-01-25 17:51:43 -05:00
Petr GašparíkandAnuken 8584fae07a Czech translation - update (#1432) 2020-01-25 17:51:32 -05:00
Ali-C-IlaandAnuken 0a661766be Update bundle_zh_TW.properties (#1438) 2020-01-25 17:51:24 -05:00
Prosta4okuaandAnuken fb6cb4829f Update bundle_uk_UA.properties (#1434) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2020-01-25 17:51:17 -05:00
Anuken e14a36a97e Fixed #1445 2020-01-25 17:50:59 -05:00
Anuken ca69aafd11 Fixed #1440 2020-01-25 10:44:46 -05:00
VanguardandGitHub df3a62b87c Merge branch 'master' into master 2020-01-25 15:03:05 +03:00
VanguardandGitHub 65e2a32722 1 changed line 
techtree
 2020-01-25 14:57:51 +03:00
Anuken 923d576a5f Fixed #1436 / Fixed crawlers not exploding 2020-01-24 23:21:23 -05:00
Anuken 081edde1f2 Fixed double client commands 2020-01-24 22:48:05 -05:00
VanguardandGitHub 0103a2b7c6 1 new line 
mod.display
 2020-01-25 04:05:03 +03:00
Anuken 1ab81fa4ab Bugfixes 2020-01-24 19:14:49 -05:00
Prosta4okuaandGitHub 095cb68725 Update bundle_ru.properties 2020-01-25 02:12:21 +02:00
Anuken 69711151a5 Bugfixes 2020-01-24 18:48:26 -05:00
Anuken aefc4ed83c Better annotation processing 2020-01-24 18:31:54 -05:00
Anuken 83f44abb5a Suppress d/c messages when necessary 2020-01-24 14:27:23 -05:00
Patrick 'Quezler' Mounier 6e970cb84d Fix tech tree entry 2020-01-24 20:26:49 +01:00
Patrick 'Quezler' Mounier 58a79d8631 Update to v103 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/content/Blocks.java
#	core/src/mindustry/content/TechTree.java
#	core/src/mindustry/world/blocks/distribution/ItemConveyor.java
 2020-01-24 20:25:03 +01:00
Anuken f2bc3e78d7 Fixed #1429 2020-01-24 14:00:06 -05:00
Anuken 2fe6a3525b Added null check for attribute 2020-01-24 13:37:23 -05:00