Commit Graph

457 Commits

Author SHA1 Message Date
6a0dc4c965 fixed gradle messing everything up again 2020-05-15 17:42:59 -04:00
a4987f864f Refactoring / Launch pad tweaks 2020-05-14 22:00:04 -04:00
2990013b8e Updated Gradle 2020-05-12 12:49:26 -04:00
fe9df51721 Upgraded to 'implementation' / 'api' 2020-05-12 12:31:09 -04:00
8b5adca750 Early prototype loading screen 2020-05-05 23:01:12 -04:00
ea2adbd63b Editor fixes 2020-05-04 10:57:57 -04:00
becc23ca42 Cleaner formatting 2020-05-03 21:18:25 -04:00
2504fd536b Autopack sprites when running 2020-04-27 17:35:10 -04:00
eeb8d5ef9c Renamed key fields and table methods 2020-04-17 11:26:59 -04:00
2af12a632a Added basic multi-unit factories 2020-04-13 16:56:33 -04:00
b1f32d241b Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0
# Conflicts:
#	core/assets/bundles/bundle_uk_UA.properties
#	core/src/mindustry/core/NetClient.java
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
#	core/src/mindustry/world/blocks/power/ImpactReactor.java
#	gradle.properties
2020-04-11 10:37:52 -04:00
a241d6f5bb Minor cleanup 2020-04-08 10:54:45 -04:00
e17052a452 Bugfixes / Builder changes / Planning layer changes 2020-04-03 13:37:35 -04:00
f1fd072400 Game state cleanup 2020-03-31 14:16:38 -04:00
f22e1bdeb3 Added planet atmosphere shader 2020-03-29 17:08:25 -04:00
7f0134c78f OpenGL error tweaks 2020-03-27 09:27:30 -04:00
69323707cc GLEW tweaks 2020-03-27 09:00:28 -04:00
d673167477 Added basic ground AI 2020-03-21 10:49:38 -04:00
436c76fd2f Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0
# Conflicts:
#	core/src/mindustry/world/blocks/BuildBlock.java
2020-03-17 20:03:12 -04:00
71f20f928a Update build.gradle 2020-03-17 20:01:44 -04:00
7e781d9ff8 Bugfixes 2020-03-14 12:29:12 -04:00
25bbce2e10 Fixed a crash 2020-03-10 15:13:28 -04:00
0ff3c1ee78 Cleanup 2020-03-08 21:53:19 -04:00
8b3d64a29a Better error detection 2020-03-07 14:36:47 -05:00
a02c7989b4 Bugfixes 2020-03-06 16:10:13 -05:00
c96427c722 Bugfixes 2020-03-04 09:01:41 -05:00
c6fc103bff Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 2020-03-01 12:55:51 -05:00
c59a3116ad Better JNI error checking (**needs recompilation**) 2020-03-01 12:34:01 -05:00
3ed5282e14 Better sector null checks 2020-03-01 12:15:38 -05:00
a2a9cffdee Moved some methods around 2020-03-01 00:09:03 -05:00
8b4fcf99a6 Building / Fixed some tests 2020-02-15 14:51:31 -05:00
e3621f44da Barely functional IO 2020-02-13 19:26:36 -05:00
6fd0205495 Merge 2020-02-11 19:55:02 -05:00
b15a40fcbd Cleanup / Fixed desktop IDs resetting 2020-02-10 23:26:22 -05:00
8172e69f8c it launches 2020-02-05 22:08:57 -05:00
da97aee8e4 it never ends 2020-02-05 13:03:22 -05:00
a7b39e56bd Cleanup continues 2020-02-04 18:00:32 -05:00
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
36b9451e01 Read-only component fields / Removed get/set prefix 2020-02-04 12:14:09 -05:00
a942ed2cad More cleanup 2020-02-03 20:24:49 -05:00
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
78fb427120 Minor fixes 2020-01-24 13:02:03 -05:00
d031efe1f2 Added Steam player limit + reduced votekick cooldown 2020-01-23 17:49:53 -05:00
f044f30829 Merge 2020-01-18 11:16:03 -05:00
95352e1729 Added server descriptions 2020-01-18 10:05:18 -05:00
c3d2351b2d Various icon changes 2020-01-17 13:57:04 -05:00
68be77fa1d Added configurable block access validation 2020-01-14 10:32:52 -05:00
c637ec15ff Deployment dialog replaced 2020-01-12 20:01:32 -05:00
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
677aa0d0bf Shortening of a few classes 2020-01-10 15:13:34 -05:00