Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,034 Commits 4 Branches 180 Tags
2e2c8ceab4df1c02e69e5d24c904719db312b324
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken 2e2c8ceab4 Bugfixes 2020-04-25 00:04:14 -04:00
Anuken 09e08a474b Plastanium conveyor + bugfixes 2020-04-24 20:17:24 -04:00
Anuken 21946cafd1 Merge branch 'crater' of https://github.com/Quezler/Mindustry into Quezler-crater 2020-04-24 15:46:32 -04:00
Anuken 32a182cd01 Unit parsing cleanup 2020-04-24 15:45:57 -04:00
Anuken 6041e238a6 Bugfixes 2020-04-24 12:01:08 -04:00
Anuken 5d4ca753a7 Light cleanup 2020-04-24 11:08:02 -04:00
Anuken 1b2e10d355 Cleanup, re-implementations 2020-04-24 11:01:17 -04:00
Anuken 018fe5dea2 Added lights for laser turret projectiles 2020-04-24 09:50:40 -04:00
Anuken eeb88df5f6 Bugfixes 2020-04-23 17:45:12 -04:00
Anuken cafd076f9c Fixed water animation conflict 2020-04-23 15:08:32 -04:00
Anuken 87ed405916 Bugfixes 2020-04-23 14:50:30 -04:00
Anuken 7091cad704 Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 2020-04-23 14:05:09 -04:00
Anuken b68b3a1837 Layer tweaks 2020-04-23 14:04:31 -04:00
Anuken 2aa05f989b Merged in sprite sorting 2020-04-23 14:00:55 -04:00
Anuken cec5c24d69 progress 2020-04-23 13:58:06 -04:00
Anuken c738dcb42e progress 2020-04-23 12:52:16 -04:00
Anuken 1bf5b19889 progress 2020-04-23 12:35:49 -04:00
Anuken c6e4bf1fa4 progress 2020-04-23 11:06:58 -04:00
Anuken 71e8c088a6 progress 2020-04-23 11:01:14 -04:00
Anuken 989ee895e8 Functional sorting 2020-04-23 10:25:46 -04:00
Anuken 2538273402 progress 2020-04-23 00:41:18 -04:00
Anuken 18b68fefed how did this compile 2020-04-23 00:16:41 -04:00
Anuken 362846bd68 progress 2020-04-23 00:03:03 -04:00
Anuken 6cf422eebf progress 2020-04-22 17:23:30 -04:00
Anuken fc4f8619f8 progress (purge) 2020-04-22 16:17:43 -04:00
Anuken c5f93139bd progress 2020-04-22 16:06:26 -04:00
Anuken 9beb23b0e4 progress 2020-04-22 15:19:39 -04:00
Anuken d154361e75 Merge branch '6.0' of https://github.com/Anuken/Mindustry into sprite-sorting 2020-04-22 14:34:34 -04:00
Anuken 67d87f023b Cleanup 2020-04-22 14:22:33 -04:00
Anuken da7c393096 progress 2020-04-22 12:47:29 -04:00
Anuken b3f936acb8 Fixed tests not compiling 2020-04-22 11:18:19 -04:00
Anuken 2ca62831e3 Revert "Cleaned up tests" (wrong branch) 2020-04-22 11:17:47 -04:00
Anuken cb601b729e Merge remote-tracking branch 'origin/master' 2020-04-22 10:48:54 -04:00
Anuken cc4e9c5ba1 Cleaned up tests 2020-04-22 10:48:50 -04:00
Anuken a592144291 Catching of schematic preview errors / Fixes #1886 2020-04-22 09:49:04 -04:00
Anuken 58e9e0c0de Merged #1882 with some tweaks 2020-04-21 11:02:44 -04:00
Anuken eeb8d5ef9c Renamed key fields and table methods 2020-04-17 11:26:59 -04:00
AnukenandGitHub c5c63c24d5 Update bug_report.md 2020-04-16 17:00:07 -04:00
Anuken 280f3dd428 Added experimental package 2020-04-16 16:31:43 -04:00
Anuken 2f3a842f2e isValid() workaround 2020-04-16 14:26:09 -04:00
Anuken 2693f9c176 Implemented some PR features 2020-04-16 13:46:45 -04:00
Anuken c6bbdfdc9b Fixed compilation 2020-04-16 11:35:35 -04:00
Anuken 713dbccf74 Bugfixes 2020-04-16 11:30:42 -04:00
Anuken a8f4df8030 Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 
# Conflicts:
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
 2020-04-16 10:14:13 -04:00
Anuken 256f805754 Payload fixes 2020-04-16 09:55:57 -04:00
Anuken ea0358d570 Merge remote-tracking branch 'origin/6.0' into 6.0 2020-04-16 09:44:36 -04:00
Anuken 42f227195c Better payload framework 2020-04-16 09:44:31 -04:00
Anuken 8a01b87c99 Cleanup 2020-04-15 23:12:18 -04:00
Anuken 79c8548171 Better conveyor animations 2020-04-15 19:05:18 -04:00
Anuken a234949b8c Visual tweaks 2020-04-15 13:03:37 -04:00
Anuken 0eaf9bc9c6 Various prototypes 2020-04-15 12:44:53 -04:00
Anuken 51226d6c88 Arc compat 2020-04-14 20:29:59 -04:00
Anuken c717084cb9 Cleanup 2020-04-13 18:07:00 -04:00
Anuken 2af12a632a Added basic multi-unit factories 2020-04-13 16:56:33 -04:00
Anuken d860977144 Disabled asset copying on non-iOS platforms 2020-04-12 17:53:19 -04:00
Anuken a240c00ebf Set cleanup 2020-04-12 17:42:09 -04:00
Anuken 603d8b16d0 Various tweaks 2020-04-12 10:26:18 -04:00
Anuken f163601262 Better unit control effects 2020-04-11 11:34:51 -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 3bb2b646db Networked unit control / Mimic AI prototype 2020-04-11 10:03:47 -04:00
Anuken 7dca6b2a30 Other tweaks 2020-04-10 19:17:40 -04:00
Anuken 758ace353e Laser turret behavior changes 2020-04-10 19:15:14 -04:00
Anuken 67a084a5e7 Cleanup 2020-04-10 13:49:36 -04:00
Anuken 2395bc9308 Bugfixes / Testing reaper sprite 2020-04-10 12:55:58 -04:00
Anuken 00f3353976 ... 2020-04-10 11:51:35 -04:00
Anuken aedd047c6f Slightly improved mod dialog 2020-04-10 11:49:22 -04:00
Anuken b4739e6036 Simpler sun shader 2020-04-09 21:15:42 -04:00
Anuken dedb63e9b6 tweaks 2020-04-09 21:03:16 -04:00
Anuken 803538d5be Better detail 2020-04-09 20:55:59 -04:00
Anuken 1efbd9dcf2 Faster shaders (?) 2020-04-09 20:50:11 -04:00
Anuken 2a74bb742b Added landing sound 2020-04-08 22:06:43 -04:00
Anuken a241d6f5bb Minor cleanup 2020-04-08 10:54:45 -04:00
Anuken 7b25b09c18 Bugfixes 2020-04-07 14:08:42 -04:00
Anuken 5fbe925429 Revert "Moved launch button" 
This reverts commit 83bc3e4e
 2020-04-07 11:29:23 -04:00
Anuken 83bc3e4e8d Moved launch button 2020-04-05 14:26:15 -04:00
Anuken a7b80f025c Bugfixes 2020-04-04 15:08:08 -04:00
Anuken 85e4270536 New water textures 2020-04-04 00:31:29 -04:00
Anuken 54a2bf1ba8 Smoother/faster water shader 2020-04-03 22:42:46 -04:00
Anuken 191d7fe1ef Cleanup 2020-04-03 19:40:45 -04:00
Anuken e17052a452 Bugfixes / Builder changes / Planning layer changes 2020-04-03 13:37:35 -04:00
Anuken d611dd107a Bugfixes 2020-04-02 22:45:13 -04:00
Anuken d0b2f63553 Tweaks 2020-04-02 14:56:53 -04:00
Anuken a26cd46a7e Reflective planet water 2020-04-02 12:32:55 -04:00
Anuken 1dcaa44e9b Merge remote-tracking branch 'origin/master' 2020-04-01 14:44:31 -04:00
Anuken c1b225a3b0 Fixed issue in #1804 2020-04-01 14:44:17 -04:00
Anuken 19239a6890 More cleanup 2020-03-31 19:39:14 -04:00
Anuken 77447c59f6 Cleanup 2020-03-31 15:01:22 -04:00
Anuken f1fd072400 Game state cleanup 2020-03-31 14:16:38 -04:00
AnukenandGitHub b06d517084 Fixed #1793 2020-03-31 12:02:27 -04:00
Anuken 9081f3ff03 Fixed antialiasing 2020-03-30 12:00:08 -04:00
Anuken 084c90ba9f Improved atmosphere shader performance 2020-03-30 11:35:22 -04:00
Anuken 115e3a737b Cleanup 2020-03-29 23:06:58 -04:00
Anuken fc65812263 Added cubemap stars 2020-03-29 19:39:29 -04:00
Anuken 7ba7e14282 Atmosphere tweaks 2020-03-29 18:34:00 -04:00
Anuken f22e1bdeb3 Added planet atmosphere shader 2020-03-29 17:08:25 -04:00
AnukenandGitHub 60a2a53973 Update bug_report.md 2020-03-29 13:29:45 -04:00
Anuken 65bf97bc03 Removed need for local.properties file 2020-03-28 17:03:52 -04:00
Anuken 73f7681f59 Slight fade-in improvements 2020-03-28 08:54:29 -04:00
AnukenandGitHub 48715d0311 Merge pull request #1769 from NickZhYT/patch-8 
Update bundle_ru.properties
 2020-03-28 08:52:46 -04:00
AnukenandGitHub cd99a0e1a7 Merge pull request #1770 from GioIacca9/patch-7 
Update bundle_it.properties
 2020-03-28 08:52:17 -04:00