mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-10 23:28:52 +07:00
Code Issues Packages Projects Releases Wiki Activity
14,845 Commits 4 Branches 160 Tags 2.1 GiB
f16894592f
Commit Graph

575 Commits

Author SHA1 Message Date
Anuken
daefe6bc1f Cleanup 2020-06-18 18:47:50 -04:00
Anuken
31708b9af7 Exception parsing cleanup 2020-06-18 18:47:34 -04:00
Anuken
d38abe95f9 Editor bugfixes / Arbitrary map resizing 2020-06-18 14:24:22 -04:00
Anuken
d1de976dc4 arc 2020-06-16 14:15:10 -04:00
Anuken
2e42526e90 Fixed up Discord RPC 2020-06-16 14:13:43 -04:00
Anuken
918c9492df Changing discord RPC system 2020-06-16 13:43:00 -04:00
Anuken
caea5c7df2 Cleanup 2020-06-15 21:52:51 -04:00
Anuken
b5660a50ca Certain team-specific rules 2020-06-15 12:00:32 -04:00
Anuken
1e954dc2be Cleanup 2020-06-11 14:09:06 -04:00
Anuken
6ae8247a02 arc 2020-06-10 15:32:14 -04:00
Anuken
2662228bec Use GL3.0 for all platforms 2020-06-10 15:31:43 -04:00
Anuken
8ea28e1ced Seq. 2020-06-08 17:19:47 -04:00
Anuken
d988b4b5c9 Method refactoring / Cleanup 2020-05-30 12:11:00 -04:00
Anuken
a375dd3fc2 Cleanup 2020-05-26 19:39:50 -04:00
Anuken
14e79b50d2 Removed legacy IO code 2020-05-21 16:50:49 -04:00
Anuken
78f24b8840 Support for wave shields 2020-05-20 17:16:18 -04:00
Anuken
3784251108 Initial support for arbitrary types of content in tech tree 2020-05-18 09:40:38 -04:00
Anuken
d110fe5ea3 Removed usage of Core.settings#save 2020-05-16 10:23:06 -04:00
Anuken
6a0dc4c965 fixed gradle messing everything up again 2020-05-15 17:42:59 -04:00
Anuken
a4987f864f Refactoring / Launch pad tweaks 2020-05-14 22:00:04 -04:00
Anuken
2990013b8e Updated Gradle 2020-05-12 12:49:26 -04:00
Anuken
fe9df51721 Upgraded to 'implementation' / 'api' 2020-05-12 12:31:09 -04:00
Anuken
8b5adca750 Early prototype loading screen 2020-05-05 23:01:12 -04:00
Anuken
ea2adbd63b Editor fixes 2020-05-04 10:57:57 -04:00
Anuken
becc23ca42 Cleaner formatting 2020-05-03 21:18:25 -04:00
Anuken
2504fd536b Autopack sprites when running 2020-04-27 17:35:10 -04:00
Anuken
eeb8d5ef9c Renamed key fields and table methods 2020-04-17 11:26:59 -04:00
Anuken
2af12a632a Added basic multi-unit factories 2020-04-13 16:56:33 -04:00
Anuken
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
Anuken
a241d6f5bb Minor cleanup 2020-04-08 10:54:45 -04:00
Anuken
e17052a452 Bugfixes / Builder changes / Planning layer changes 2020-04-03 13:37:35 -04:00
Anuken
f1fd072400 Game state cleanup 2020-03-31 14:16:38 -04:00
Anuken
f22e1bdeb3 Added planet atmosphere shader 2020-03-29 17:08:25 -04:00
Anuken
7f0134c78f OpenGL error tweaks 2020-03-27 09:27:30 -04:00
Anuken
69323707cc GLEW tweaks 2020-03-27 09:00:28 -04:00
Anuken
d673167477 Added basic ground AI 2020-03-21 10:49:38 -04:00
Anuken
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
Anuken
71f20f928a
Update build.gradle 2020-03-17 20:01:44 -04:00
Anuken
7e781d9ff8 Bugfixes 2020-03-14 12:29:12 -04:00
Anuken
25bbce2e10 Fixed a crash 2020-03-10 15:13:28 -04:00
Anuken
0ff3c1ee78 Cleanup 2020-03-08 21:53:19 -04:00
Anuken
8b3d64a29a Better error detection 2020-03-07 14:36:47 -05:00
Anuken
a02c7989b4 Bugfixes 2020-03-06 16:10:13 -05:00
Anuken
c96427c722 Bugfixes 2020-03-04 09:01:41 -05:00
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
Anuken
4c0607aba8 Bugfixes 2019-11-09 17:19:29 -05:00
Anuken
c71b5d6f87 Copy Steam DLLs into folder 2019-11-07 14:58:51 -05:00
Anuken
1e7c21c1ae Bugfixes 2019-11-06 13:59:35 -05:00
Anuken
6153764c0d Bugfixes for Steam 2019-11-04 22:18:34 -05:00
Anuken
a72d95e6d7 Display steam load error message 2019-11-02 14:16:26 -04:00
Anuken
6d6fe41bc5 Bugfixes 2019-11-01 15:19:42 -04:00
Anuken
06e7b94b60 Steam fixes 2019-10-30 16:29:01 -04:00
Anuken
ee5d229f51 Workshop bugfixes 2019-10-30 01:24:03 -04:00
Anuken
fcbcdfc5d9 Tweaks 2019-10-30 00:27:17 -04:00
Anuken
b86218b75a Cleanup (1) 2019-10-29 15:59:53 -04:00
Anuken
0722ad2f4c Refactoring of functional package 2019-10-29 15:57:25 -04:00
Anuken
d28ae1b304 Bugfixes 2019-10-27 16:05:13 -04:00
Anuken
bd0a6636e6 Minor bugfixes 2019-10-25 14:00:38 -04:00
Anuken
f971061ef4 Bugfixes 2019-10-24 18:52:42 -04:00
Anuken
ab199633f8 Check version when connecting 2019-10-23 21:47:08 -04:00
Anuken
1f5e639fb2 Use short map names 2019-10-22 19:37:03 -04:00
Anuken
d7ebbbf2b6 Better organization 2019-10-21 21:22:35 -04:00
Anuken
4b428c6636 Bugfixes 2019-10-20 14:06:43 -04:00
Anuken
2586c53f0d Complete refactoring of workshop / Schematic+mod support 2019-10-19 18:53:27 -04:00
Anuken
d0dc21a52c Workshop refactoring 2019-10-19 02:00:43 -04:00
Anuken
f7be953bb5 Schematic import 2019-10-19 01:19:32 -04:00
Anuken
08a51d8f1b Schematic export buttons, workshop support progress 2019-10-19 01:03:49 -04:00
Anuken
d7ca2a33c8 Input fixes 2019-10-12 12:52:50 -04:00
Anuken
4e0d1b2746 Better mod crash logs 2019-10-11 16:08:14 -04:00
Anuken
31e4b2752f Various fixes 2019-10-08 21:27:37 -04:00
Anuken
1b93da20f4 Workshop map listing button 2019-10-04 19:43:26 -04:00
Anuken
edb0ece03b More mod content support 2019-10-04 19:14:45 -04:00
Anuken
df3f23731b Workshop mod loading 2019-10-04 15:06:29 -04:00
Anuken
e0ec9a047c Modded consumers 2019-10-02 14:44:18 -04:00
Anuken
251b8deb25 Fixed steam crash with a workaround 2019-10-01 17:35:23 -04:00
Anuken
5eba4a360d Fixed Steam offline crash 2019-09-30 20:21:37 -04:00
Anuken
2019196f65 Sort Steam server lists, ignore version when unimportant 2019-09-28 18:01:55 -04:00
Anuken
000b23d703 Workshop crash fix / Mine balancing 2019-09-28 15:14:29 -04:00
Anuken
438b3d9752 Workshop map updates, removal detection 2019-09-28 13:13:23 -04:00
Anuken
f925ec8cbe Basic kill tracking 2019-09-27 16:04:34 -04:00
Anuken
f3ab8f34ed Steam bugfixes 2019-09-26 19:18:10 -04:00
Anuken
b02a563519 Steam crash fix (?) 2019-09-26 19:06:42 -04:00
Anuken
2658c1f52e Workshop fixes / Message block extension 2019-09-25 15:40:31 -04:00
Anuken
e5cf2161d4 spaghetti eradicated 2019-09-22 01:37:50 -04:00
Anuken
b2bae64215 extreme confusion 2019-09-22 00:01:48 -04:00
Anuken
552dc254da spgashfetiti 2019-09-21 23:41:56 -04:00
Anuken
d062d8081a Bugfixes 2019-09-21 16:44:47 -04:00
Anuken
5d729c1e8d Bugfixes 2019-09-19 23:46:27 -04:00
Anuken
5d0cfc3599 Workshop tweaks 2019-09-17 22:39:58 -04:00
Anuken
2424afa1fb Workshop implementation progress 2019-09-17 21:55:57 -04:00
Anuken
669ce6dfbb launch pad fix 2019-09-16 23:25:09 -04:00
Anuken
f1bf8a0f1a Equality comparison fix 2019-09-15 14:38:00 -04:00
Anuken
874b41cb46 Fixed disconnect not triggering 2019-09-15 14:24:00 -04:00
Anuken
d3876b6376 Fixed lobby joining 2019-09-15 14:01:27 -04:00
Anuken
f72f2bdf5d Fixed servers not discovering 2019-09-15 13:52:56 -04:00
Anuken
af91e17b13 2 2019-09-15 13:13:21 -04:00
Anuken
69bfd8f54d Static steam names 2019-09-15 13:03:29 -04:00
Anuken
369c3b569c Bugfixes, game startup connection 2019-09-15 12:44:30 -04:00
Anuken
8480e656b9 More steam stuff 2019-09-15 10:38:36 -04:00
Anuken
fb29324905 Steam stuff 2019-09-15 09:27:31 -04:00
Anuken
ed88633712 More bugfixes 2019-09-14 21:36:32 -04:00