mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-13 00:05:23 +07:00
Code Issues Packages Projects Releases Wiki Activity
18,260 Commits 4 Branches 160 Tags 2.1 GiB
c189d15983
Commit Graph

596 Commits

Author SHA1 Message Date
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
Anuken
cd456f80a4 Bugfixes 2019-09-14 20:57:10 -04:00
Anuken
6d61515e28 Compile fix 2019-09-14 20:30:26 -04:00
Anuken
38af936e3f Bugfix 2019-09-14 19:14:22 -04:00
Anuken
d59f5ddc59 Achievement work, cleanup 2019-09-14 19:01:27 -04:00
Anuken
6c07c5006a Added client implementation for 50 achievemenets 2019-09-13 22:02:13 -04:00
Anuken
d9c7665aca Events 2019-09-11 12:37:58 -04:00
Anuken
565b79d1b2 Events, triggers 2019-09-10 22:50:00 -04:00
Anuken
f30dc7dcd9 Cleanup 2019-09-10 21:20:28 -04:00
Anuken
e4cdf515c9 More workshop implementation 2019-09-10 20:53:31 -04:00
Anuken
ad3463cbc4 Merge remote-tracking branch 'origin/master' 2019-09-10 15:05:06 -04:00
Anuken
db733bced6 Stats 2019-09-10 15:05:02 -04:00
Anuken
7aa71a7201 Steam workshop publishing 2019-09-10 14:25:34 -04:00
Anuken
c4c0f45228 cleaning up what remains 2019-09-08 22:55:36 -04:00
Anuken
d981bb95b9 it is gone 2019-09-08 22:32:47 -04:00
Anuken
c9f0a59339 time for a crusade against dialogs 2019-09-08 15:08:55 -04:00
Anuken
2cc627e7d0 Merged net module 2019-09-07 16:55:09 -04:00
Anuken
8653e7bbb1 Cleanup 2019-09-07 16:03:20 -04:00
Anuken
4fb7430fb7 More cleanup, removed connection IDs 2019-09-07 15:23:13 -04:00
Anuken
e90c8c4d3e Extensive network refactor 2019-09-07 14:11:50 -04:00
Anuken
05ab62f038 merge 2019-09-06 22:51:35 -04:00
Anuken
b5f1e566b2 New Android file chooser implementation 2019-09-06 21:21:30 -04:00
Anuken
9b6fb2f382 cleanup 2019-09-06 15:20:30 -04:00
Anuken
24bb2428e7 Bugfixes 2019-09-06 14:05:13 -04:00
Anuken
aaedeea870 console 2019-08-31 20:08:48 -04:00
Anuken
7f2c7685b4 Lobby prefs 2019-08-30 19:49:36 -04:00
Anuken
7e80a60e65 More cleanup 2019-08-30 17:44:28 -04:00
Anuken
44544020ec Platform cleanup 2019-08-30 17:35:26 -04:00
Anuken
3b9d3fd233 Platform cleanup 2019-08-30 17:32:49 -04:00
Anuken
4e2d2ee378 Steam cleanup 2019-08-30 17:25:37 -04:00
Anuken
7aafa8b150 Merge 2019-08-30 16:39:40 -04:00
Anuken
1e80bdf19f Functional loading 2019-08-27 09:27:09 -04:00
Anuken
76cd7ba8d1 non-functional loading screen 2019-08-26 22:53:11 -04:00
Anuken
5c6f2171f4 Fixed black tile issue 2019-08-25 11:16:38 -04:00
Anuken
fd973038bb mnet was a mistake 2019-08-24 18:29:21 -04:00
Anuken
7b27903de2 Fixed some static library issues 2019-08-24 10:00:04 -04:00
Anuken
7b41d65fa6 Fixed issues with multithreaded serializer access 2019-08-23 16:13:46 -04:00
Anuken
de031b1ddb Merge branches 'master' and 'mnet' of https://github.com/Anuken/Mindustry 2019-08-23 14:29:53 -04:00
Anuken
d1e07ec0a2 Fixed OpenAL not loading correctly 2019-08-23 17:17:45 -06:00
Anuken
9ddfd650dd . 2019-08-23 14:16:25 -04:00
Anuken
cf9cda4936 Merge branch 'master' of https://github.com/Anuken/Mindustry into steam 2019-08-23 14:05:46 -04:00
Anuken
1880c32f90 Experimental MNet-2 backend 2019-08-22 22:49:22 -04:00
Anuken
4e43d2a96b . 2019-08-22 21:09:33 -04:00
Anuken
d68c8fe72c Merge remote-tracking branch 'origin/steam' into steam 
# Conflicts:
#	desktop/src/io/anuke/mindustry/desktop/steam/SteamNetImpl.java
 2019-08-22 21:08:58 -04:00
Anuken
c9d0619289 . 2019-08-22 21:08:44 -04:00
Anuken
8ea33946c4 proper discovery 2019-08-22 21:08:01 -04:00
Anuken
bef7394004 Merge remote-tracking branch 'origin/steam' into steam 
# Conflicts:
#	desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
 2019-08-22 20:50:43 -04:00
Anuken
4042bf042e . 2019-08-22 20:50:16 -04:00
Anuken
643b698c30 discovery 2019-08-22 20:49:27 -04:00
Anuken
aba3e3985a . 2019-08-22 19:53:44 -04:00
Anuken
91f679f762 disconnection 2019-08-22 19:49:29 -04:00
Anuken
3eeed507cc Merge remote-tracking branch 'origin/steam' into steam 2019-08-22 17:38:04 -04:00
Anuken
988e1d6e30 . 2019-08-22 17:38:00 -04:00
Anuken
04b4aabcf6 . 2019-08-22 17:37:16 -04:00
Anuken
d97fe47206 . 2019-08-22 17:16:13 -04:00
Anuken
0d8748a6ce autoclip 2019-08-22 17:02:41 -04:00
Anuken
b360a39fcf debug 2019-08-22 16:59:39 -04:00
Anuken
70b071fa26 fixes 2019-08-22 16:51:26 -04:00
Anuken
64badb2cb7 Cleanup 2019-08-22 16:44:32 -04:00
Anuken
3da6634242 things 2019-08-22 16:19:29 -04:00
Anuken
4b8d072854 testing 2019-08-22 16:13:39 -04:00
Anuken
32abd991e7 steam debugging 2019-08-22 09:27:59 -04:00
Anuken
3294f800be Steam things 2019-08-21 21:20:44 -04:00
Anuken
a7a49a823b Merge 2019-08-21 20:10:54 -04:00
Anuken
4089ee424c Removed pointless platform-specific dists 2019-08-21 15:50:58 -04:00
Anuken
9bf010e222 Removed lwjgl3 desktop module, sdl promoted to main module 2019-08-21 15:41:38 -04:00
Anuken
4bb6a25055 Added deployment scripts 2019-08-21 14:46:36 -04:00
Anuken
66ff7b1592 Fixed minimization 2019-08-20 20:47:28 -04:00
Anuken
46230ad307 nothing 2019-08-20 18:31:56 -04:00
Anuken
17b17979ab Release preparations 2019-08-16 11:00:15 -04:00
Anuken
a1269c05c5 Updated discord presence 2019-08-12 13:50:09 -04:00
Anuken
d0ff0307f5 New icon 2019-08-12 13:29:02 -04:00
Anuken
c4aa0b2863 New discord app ID / New testing sounds 2019-08-12 12:32:13 -04:00
Anuken
88d1b31aff SDL module 1 2019-07-25 10:14:01 -04:00
Anuken
32ad577f6d Added IKVM-specific dist command 2019-07-25 10:09:21 -04:00
Anuken
c80be4940f Fixed unit tests / Fixed some major tile loading flaws 2019-07-23 23:29:48 -04:00
Anuken
14d0927fb6 Basic deploy background 2019-07-12 01:03:01 -04:00
Anuken
0837c476a1 T 2019-07-03 20:24:11 -04:00
Anuken
ab716e96e2 Bugfixes 2019-06-24 16:54:50 -04:00
Anuken
940965f03d .mmap file importing / Better exception parsing 2019-05-31 10:24:51 -04:00