Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,150 Commits 4 Branches 180 Tags
c45dd744041fdef43b01c3e635f91ccbd4c158b9
Commit Graph
6150 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken acb3438cc8 More entity processor features 2020-02-02 11:51:58 -05:00
DeltaNedasandGitHub a9f07f3603 formatting 2020-02-02 15:49:10 +00:00
Patrick 'Quezler' MounierandGitHub 4c369dd17c Hide drop zone warning if you're part of the wave team (#1492) 2020-02-02 10:41:09 -05:00
DeltaNedas c458c77322 cleanup 2020-02-02 13:40:53 +00:00
DeltaNedas b93692ad41 yes 2020-02-02 13:40:38 +00:00
DeltaNedas d84217300c fixed error message 2020-02-02 12:58:00 +00:00
DeltaNedas 49ab7ceb77 main.js required now 2020-02-02 12:44:37 +00: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
DeltaNedas 4c45716149 first part of what cat wants 2020-02-02 02:49:47 +00: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
fuzzbuckandGitHub 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
DeltaNedasandGitHub 51bc5c3b74 local changes 2020-02-01 18:28:25 +00:00
DeltaNedasandGitHub a45a14025d oops 2020-02-01 18:26:38 +00:00
Anuken eabebcefc7 Disabled data folder button due to terrible file manager support 2020-01-31 23:09:21 -05:00
DeltaNedasandGitHub e1a215ae0b wrapper works now 2020-02-01 01:18:18 +00:00
Anuken 63d84bead3 Cleanup 2020-01-31 20:10:21 -05:00
DeltaNedasandGitHub d872656bc5 it works sorta! 2020-01-31 23:51:33 +00:00
Anuken 51b4824c92 Fixed #1484 2020-01-31 11:07:25 -05:00
Petr Gašparík b4e9e6be32 Czech: added Time played + small format corr. 2020-01-31 13:16:27 +01:00
Petr Gašparík 737e3145ec Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-01-31 13:13:51 +01: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
Petr Gašparík bfa24cca4c Merge branch 'v103.3' of https://github.com/PetrGasparik/Mindustry; branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-01-30 16:06:46 +01:00
DeltaNedasandGitHub 9da505119b it compiles but cant find module 
help
 2020-01-30 00:53:05 +00:00
DeltaNedasandGitHub 677debd475 testing script loading stuff 
is not allowed in console, only from `LoadedMod`s.
 2020-01-30 00:38:51 +00:00
DeltaNedasandGitHub 864c73f791 make it semi work maybe 
still completely insecure
 2020-01-30 00:21:50 +00:00
DeltaNedasandGitHub 9ed7719464 compile dammit 2020-01-30 00:04:42 +00:00
DeltaNedasandGitHub 187e1f5848 create new branch 2020-01-29 23:52:58 +00:00
Vam-JamandGitHub 36782a2454 [Fix] lastMessage doesnt change if prevented by antispam (#1471) 
Fixes issue #1470
 2020-01-29 11:32:41 -05:00
Prosta4okuaandGitHub 6a48a1e0a3 Update bundle_uk_UA.properties 2020-01-29 01:12:12 +02:00
Prosta4okuaandGitHub d0faecbea5 Update bundle_uk_UA.properties 2020-01-29 01:07:24 +02:00
Vamist b5ccd36315 [Added] Players command 
Allows servers to view current active players in more detail without having to use status
 2020-01-28 20:16:06 +00: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
AnukenandGitHub d99cad8793 Update SERVERLIST.md 2020-01-28 13:28:34 -05:00
kf-gamesandAnuken 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
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
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
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
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