Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,443 Commits 4 Branches 180 Tags
6989a81e03e90aa607b8f1f7d063cb4bafe415bf
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken 6989a81e03 Fixed #6984 2022-06-08 09:30:30 -04:00
Anuken eb6c0ebfb5 Merge remote-tracking branch 'origin/master' 2022-06-08 09:27:25 -04:00
Anuken 28150d8f51 Fixed #6985 2022-06-08 09:27:20 -04:00
Anuken 4a6600b94d Merge remote-tracking branch 'origin/master' 2022-06-08 09:11:04 -04:00
Anuken cbfb621179 Better implementation of #6959 2022-06-08 09:11:00 -04:00
Anuken 0793ba45b5 Merge remote-tracking branch 'origin/master' 2022-06-08 09:05:31 -04:00
Anuken b2353eba58 Misc 2022-06-08 09:05:25 -04:00
Anuken 8c33eb32dd Merge remote-tracking branch 'origin/master' 2022-06-08 08:33:06 -04:00
Anuken e627008fbc Slightly different implementation of #6910 2022-06-08 08:33:01 -04:00
Anuken 1c0eff0871 Made IndexedRenderer shader static 2022-06-08 07:52:51 -04:00
Anuken 49d859f6bb Android build fixes 2022-06-06 11:31:38 -04:00
Anuken 0177902010 Turrets should consume 1 ammo/shot by default 2022-06-05 10:12:52 -04:00
Anuken 56cc88f582 Fully fixed weapon part bug 2022-06-03 21:42:26 -04:00
Anuken 152a5b5c94 Minor bugfixes 2022-06-03 21:06:14 -04:00
Anuken 29e086f23b Removed some unnecessary uniform setting 2022-05-30 12:05:10 -04:00
Anuken 55a219fc03 Misc minor fixes 2022-05-28 07:48:43 -04:00
Anuken 0e4903910b Block placement method changes (will break some mods) 2022-05-26 11:19:36 -04:00
Anuken e2bd6571b1 Chat message sound + minor JSOn fix 2022-05-25 23:15:09 -04:00
Anuken 6d9029fb23 some JSON fixes 2022-05-22 22:27:53 -04:00
Anuken 2236771b22 Misc cleanup + some JSON stuff 2022-05-22 22:16:03 -04:00
Anuken e62c2f9d8e UnitType type -> class 2022-05-22 09:00:32 -04:00
Anuken b8dac1e408 JSON UnitType type: support 2022-05-21 12:40:16 -04:00
Anuken b010e9d720 recoil as part progress 2022-05-20 19:46:18 -04:00
Anuken 39f32af500 might as well uncomment this hidden unit 2022-05-20 10:53:07 -04:00
Anuken 07ff2de2a2 Misc tech tree & block stuff 2022-05-16 17:53:09 -04:00
Anuken 13e57ba89e Re-added xRand 2022-05-16 13:50:40 -04:00
Anuken 2641404f46 Fixed black atlas bug 2022-05-16 13:25:48 -04:00
Anuken 9212c178fc Weapon utility handleBullet method 2022-05-16 11:06:50 -04:00
Anuken bf91676fea Laser damage intersect fix 2022-05-16 01:53:44 -04:00
Anuken 67344ffd7d Turret instant reload fix 2022-05-14 23:28:15 -04:00
Anuken bc65e63654 Beter payload updating system 2022-05-14 17:20:49 -04:00
Anuken 69a32c5ac9 Cleanup/Outline utility methods 2022-05-14 12:16:44 -04:00
Anuken e9290af4d2 Misc fixes for mods (2) 2022-05-14 01:42:49 -04:00
Anuken b66283fbd0 Misc fixes for mods 2022-05-13 22:23:50 -04:00
Anuken ad5e4f2556 disabled gl30 2022-05-13 20:55:49 -04:00
Anuken 4b86d4cf6d typo fix 2022-05-13 09:53:13 -04:00
Anuken ec50ea62d5 Fixed #6852 2022-05-12 10:49:32 -04:00
Anuken 8e9d0d5c29 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-05-12 10:10:14 -04:00
Anuken cd78fd6340 Misc bugfixes 2022-05-12 10:10:11 -04:00
Anuken f64a45f78d Fixed elude place check 2022-05-12 09:40:03 -04:00
Anuken d1c1455565 Don't sense hidden items/liquids 2022-05-12 00:38:32 -04:00
Anuken e83e402612 Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-12 00:19:14 -04:00
Anuken 9b9a1dd332 Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-12 00:06:55 -04:00
Anuken 9edab6e742 Merge remote-tracking branch 'origin/master' 2022-05-11 23:28:41 -04:00
Anuken 263f129c8b Fixed #6843 2022-05-11 23:28:37 -04:00
Anuken 6e79f22734 Merge remote-tracking branch 'origin/master' 2022-05-11 22:20:17 -04:00
Anuken eae371854b Zenith item capacity revert (for now) 2022-05-11 22:20:13 -04:00
Anuken ac4d5b66b3 Enabled gl30 by default, will likely crash on certain devices... 2022-05-11 21:38:30 -04:00
Anuken de909b2ad3 Merge remote-tracking branch 'origin/master' 2022-05-11 20:18:29 -04:00
Anuken d4b0c9da1b Hide command mode popup on mobile 2022-05-11 20:18:25 -04:00
Anuken 650b67365b Fixed #6829 2022-05-11 16:58:18 -04:00
Anuken c1e98a1406 Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-11 14:40:39 -04:00
Anuken 3554d64573 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-05-11 14:36:36 -04:00
Anuken be9b7da892 Automatic consumeCoolant 2022-05-11 14:36:34 -04:00
Anuken f54116425d Bugfixes 2022-05-11 12:33:10 -04:00
Anuken 25cc53625c Merge remote-tracking branch 'origin/master' 2022-05-11 12:02:25 -04:00
Anuken 2beca30b0c Spore press craft time fix 2022-05-11 12:02:19 -04:00
Anuken 60cb4a2a73 Merge remote-tracking branch 'origin/master' 2022-05-11 09:42:21 -04:00
Anuken 35f07150f2 aaa 2022-05-11 09:42:17 -04:00
Anuken debf940973 Fixed preview render crash 2022-05-11 09:39:43 -04:00
Anuken 9b33ab3c0a Fixed #6815 2022-05-11 00:44:15 -04:00
Anuken 24a6ef2bc3 Correct team usage 2022-05-10 23:13:59 -04:00
Anuken afe02bf3a0 Misc fixes 2022-05-10 22:55:28 -04:00
Anuken aa3bf50731 Merge remote-tracking branch 'origin/master' 2022-05-10 21:56:41 -04:00
Anuken 8c98f8f9bf Mass driver reloadTime -> reload 2022-05-10 21:56:34 -04:00
Anuken 2e4037451f Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-10 21:07:48 -04:00
Anuken 0fa280c964 fix random errors 2022-05-10 20:50:36 -04:00
Anuken 211cf250dc deploy script for jitpack 2022-05-10 20:46:53 -04:00
Anuken e15ed4403c Unignore icons.properties 2022-05-10 20:38:05 -04:00
Anuken 9d65aa014c dfgnb 2022-05-10 20:30:07 -04:00
Anuken 8fad5a1757 Horrible 2022-05-10 20:28:09 -04:00
Anuken 60d3a51ebc What a horrible waste of time 2022-05-10 20:08:48 -04:00
Anuken 0218e2ed2d Package publish token fix 2022-05-10 19:47:40 -04:00
Anuken 0169a925ef Testing Github Packages 2022-05-10 19:43:47 -04:00
Anuken 8f31faa98e Merge remote-tracking branch 'origin/master' 2022-05-10 19:19:38 -04:00
Anuken 6a129371d2 Fixed #6811 2022-05-10 19:19:21 -04:00
Anuken 6bda5546a6 Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-10 19:01:40 -04:00
Anuken 0c6c9620a7 lang 2022-05-10 19:01:33 -04:00
Anuken be3e487fae Trigger BE build 2022-05-10 18:44:52 -04:00
Anuken a089afc626 Merge branch 'master' of https://github.com/Anuken/Mindustry into erekir 
 Conflicts:
	core/assets/bundles/bundle_zh_TW.properties
 2022-05-10 18:15:43 -04:00
Anuken 01ba06ddef Faster erekir mining speed 2022-05-10 17:35:43 -04:00
Anuken eb8395fa19 Requirement swapbac 2022-05-10 16:25:06 -04:00
Anuken 4ddcd57191 Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir 2022-05-10 16:21:24 -04:00
Anuken cffba7b685 Made useless items/liquids/blocks hidden 2022-05-10 16:21:22 -04:00
Anuken 36513d6ed6 Tech tree restructuring 2022-05-10 16:01:49 -04:00
Anuken 595f3fd117 arc 2022-05-10 13:16:09 -04:00
Anuken 3dd17474c5 Fixed OpenGL vertex arrays / Fixed bullet shrink crop 2022-05-10 13:12:12 -04:00
Anuken 9ac75df34e Merui swap / Bomber command support 2022-05-10 11:13:13 -04:00
Anuken 85d7f2cd62 Bugfixes 2022-05-10 10:17:43 -04:00
Anuken ca67b0f43c launchCapacityMultiplier per-planet 2022-05-10 00:24:44 -04:00
Anuken f7e74bdbfc Fixed annotations 2022-05-10 00:14:33 -04:00
Anuken 6efca04ea8 and gone 2022-05-09 23:50:01 -04:00
Anuken 95254eef44 Duct router distribution fixes 2022-05-09 23:11:52 -04:00
Anuken 051a41e86d String overload for mod options 2022-05-09 22:35:58 -04:00
Anuken 83d15ce65e Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-09 20:51:31 -04:00
Anuken 2162770e57 Custom settings categories 2022-05-09 20:51:27 -04:00
Anuken aa1abeb4be Typo fixes 2022-05-09 19:55:51 -04:00
Anuken 2b46bbfd2c Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-09 18:24:31 -04:00
Anuken 76f1cfbc07 Actually fixed Serpulo base gen 2022-05-09 18:24:27 -04:00
Anuken 31c5ef2dc5 Some world processor documentation 2022-05-09 17:41:42 -04:00