mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-10 07:07:03 +07:00
Code Issues Packages Projects Releases Wiki Activity
6,438 Commits 4 Branches 160 Tags 2.1 GiB
5a0d079a78
Commit Graph

431 Commits

Author SHA1 Message Date
Anuken
c6fc103bff Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 2020-03-01 12:55:51 -05:00
Anuken
c59a3116ad Better JNI error checking (**needs recompilation**) 2020-03-01 12:34:01 -05:00
Anuken
3ed5282e14 Better sector null checks 2020-03-01 12:15:38 -05:00
Anuken
a2a9cffdee Moved some methods around 2020-03-01 00:09:03 -05:00
Anuken
8b4fcf99a6 Building / Fixed some tests 2020-02-15 14:51:31 -05:00
Anuken
e3621f44da Barely functional IO 2020-02-13 19:26:36 -05:00
Anuken
6fd0205495 Merge 2020-02-11 19:55:02 -05:00
Anuken
b15a40fcbd Cleanup / Fixed desktop IDs resetting 2020-02-10 23:26:22 -05:00
Anuken
8172e69f8c it launches 2020-02-05 22:08:57 -05:00
Anuken
da97aee8e4 it never ends 2020-02-05 13:03:22 -05:00
Anuken
a7b39e56bd Cleanup continues 2020-02-04 18:00:32 -05:00
Anuken
be50997f94 Merge branches '6.0' and 'splinterface-impl' of https://github.com/Anuken/Mindustry into splinterface-impl 
# 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/Vars.java
#	core/src/mindustry/entities/traits/SaveTrait.java
#	core/src/mindustry/maps/generators/MapGenerator.java
#	core/src/mindustry/ui/dialogs/DeployDialog.java
#	core/src/mindustry/world/blocks/Floor.java
#	desktop/src/mindustry/desktop/DesktopLauncher.java
#	gradle.properties
 2020-02-04 12:25:18 -05:00
Anuken
36b9451e01 Read-only component fields / Removed get/set prefix 2020-02-04 12:14:09 -05:00
Anuken
a942ed2cad More cleanup 2020-02-03 20:24:49 -05: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
Anuken
78fb427120 Minor fixes 2020-01-24 13:02:03 -05:00
Anuken
d031efe1f2 Added Steam player limit + reduced votekick cooldown 2020-01-23 17:49:53 -05:00
Anuken
f044f30829 Merge 2020-01-18 11:16:03 -05:00
Anuken
95352e1729 Added server descriptions 2020-01-18 10:05:18 -05:00
Anuken
c3d2351b2d Various icon changes 2020-01-17 13:57:04 -05:00
Anuken
68be77fa1d Added configurable block access validation 2020-01-14 10:32:52 -05:00
Anuken
c637ec15ff Deployment dialog replaced 2020-01-12 20:01:32 -05:00
Anuken
e45df98f26 Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0 
# Conflicts:
#	core/src/mindustry/graphics/Bloom.java
#	gradle.properties
 2020-01-10 15:19:07 -05:00
Anuken
677aa0d0bf Shortening of a few classes 2020-01-10 15:13:34 -05:00
Anuken
c611ce9d58 Removed old Matrix4 class 2020-01-07 11:16:04 -05:00
Anuken
954e26fc14 Method cleanup 2019-12-26 20:08:53 -05:00
Anuken
4858e602ed Fixed compilation 2019-12-26 19:40:54 -05:00
Anuken
de5979f4ee Many various internal changes 2019-12-26 17:46:01 -05:00
Anuken
9016c12d16 Made team a separate class 2019-12-25 19:07:04 -05:00
Anuken
475794640d More cleanup 2019-12-25 11:16:54 -05:00
Anuken
514d4817c8 it is done 2019-12-25 01:39:38 -05:00
Anuken
d47f86cc21 Cleanup 2019-12-16 10:12:39 -05:00
Anuken
0cf39bf5c3 Eliminated 8 characters 2019-12-15 20:01:06 -05:00
Anuken
e043f4bb66 API cleanup 2019-12-14 18:19:02 -05:00
Anuken
675e15ddca Minor refactor of class names 2019-12-11 14:23:53 -05:00
Anuken
2554433f8d Fixed #1184 2019-12-08 21:29:03 -05:00
Anuken
9f29898713 Better console / Better logging 2019-12-08 15:17:14 -05:00
Anuken
268f3cc3c2 Merge branches 'master' and 'rhino-js-suffering' of https://github.com/Anuken/Mindustry 
# Conflicts:
#	core/src/io/anuke/mindustry/content/Blocks.java
#	gradle.properties
 2019-12-08 00:15:42 -05:00
iczero
7dd7ccf698 Add gradle property jvmArgs (#1161) 
Allows specifying additional arguments for the vm, which would
make using tools such as HotSwapAgent and dcevm easier
Example: run -PjvmArgs='["-XXaltjvm=dcevm"]'
 2019-12-04 20:05:01 -05:00
Anuken
5788c27aaa hmmm 2019-12-03 01:01:18 -05:00
Anuken
e66ecb6c90 Removed unnecessary option 2019-12-01 12:50:11 -05:00
Anuken
0e7c403bd8 Tweaks 2019-12-01 12:32:35 -05:00
Anuken
b21c25bccf Added features that don't work 2019-11-30 22:15:30 -05:00
Anuken
ceae04aa5b Desktop-specific scripting 2019-11-30 18:30:39 -05:00
Anuken
7b69310f1b Deployment tweak 2019-11-23 21:27:52 -05:00
Anuken
a1fb3e27ab Fixed launched items not saving 2019-11-22 23:10:50 -05:00
Anuken
2d42704062 Switched to hjson extension 2019-11-22 18:19:18 -05:00
Anuken
968f3ace33 Better mod parsing 2019-11-20 18:09:43 -05:00
Anuken
ec7379cc86 Updated to gradle 6.0 2019-11-15 19:48:26 -05:00
Anuken
0fd6207689 Cleanup 2019-11-14 08:51:12 -05:00