mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-13 19:39:04 +07:00
Code Issues Packages Projects Releases Wiki Activity
3,312 Commits 4 Branches 160 Tags 2.3 GiB
5039763a52
Commit Graph

2887 Commits

Author SHA1 Message Date
Anuken
eb5b50b3e9 Added pick keybind / Minor visual tweaks 2019-02-04 13:23:41 -05:00
Anuken
82b908f0ab Unit balancing 2019-02-04 09:09:47 -05:00
Anuken
336256fc71 Bundle/tech tree fixes 2019-02-03 23:08:48 -05:00
Anuken
49a7da6393 Finalized unit type definitions 2019-02-03 22:48:27 -05:00
Anuken
a8c645f00d Weapon refactor / New units with edgy names / Spritesheet cleanup 2019-02-03 21:11:26 -05:00
Anuken
62d8cb0b25 Impact reactor 2019-02-03 11:22:53 -05:00
Anuken
f5028a4937 Multipress sprite / Shields re-added 2019-02-02 22:33:12 -05:00
Anuken
203612853b Better block hover info / Liquids source crash fix / Generator fix 2019-02-02 18:03:52 -05:00
Anuken
8e8e95cd2d Merged alpha and dart mech pads / Differential gen / Fixed optional display 2019-02-02 17:39:46 -05:00
Anuken
696e6cb84b Pad respawning 2019-02-02 16:10:29 -05:00
Anuken
67940476af Fixed refactoring errors 2019-02-02 15:59:07 -05:00
Anuken
0dd9d2b460 Moved entity package from Arc / Entity code cleanup 2019-02-02 15:53:35 -05:00
Anuken
6b2f2d0664 Preparing to refactor entity module 2019-02-02 14:42:47 -05:00
Anuken
636bfdb530 Unit factory limit / Removed overdrive block effects / BlockFlag cleanup 2019-02-02 14:33:13 -05:00
Anuken
c0d6618808 Final map 2019-02-02 12:35:36 -05:00
Anuken
e21a3347ac Misc bugfixes / New zone 2019-02-02 10:14:16 -05:00
Anuken
59a68ee981 Spritesheet cleanup / Heat blocks / Editor bugfix 2019-02-01 21:47:44 -05:00
Anuken
7a072746d9 Fixed map colors / Cultivator tweak / Color gen 2019-02-01 19:01:08 -05:00
Anuken
a6799dd29b Kiln texture fix / New map resize dialog 2019-02-01 18:08:09 -05:00
Anuken
163ecb160a Added new unit type / Made reactor use cryo only / Balancing 2019-02-01 15:55:11 -05:00
Anuken
f00d1f9505 Added missing tech tree blocks / Zone improvements 2019-02-01 13:14:42 -05:00
Anuken
87b489a541 Tile cleanup 2019-02-01 09:22:08 -05:00
Anuken
f670ade2ee Work on new maps continues 2019-02-01 00:04:21 -05:00
Anuken
b5508c1152 New power node type / Bugfixes / Random item caches 2019-01-31 15:57:21 -05:00
Anuken
564c258c86 Core tiers 2019-01-31 15:33:07 -05:00
Anuken
745ff1a270 Map implemented / Editor pick key / Crash fix 2019-01-31 12:45:11 -05:00
Anuken
e727ee6d4a Even more blocks / Map generator config / Editor fixes 2019-01-31 10:58:26 -05:00
Anuken
e6a39a8255 Shader crash fix / More blocks / Kiln / Removed (unused) flux 2019-01-30 22:51:24 -05:00
Anuken
43bff5c34d Removed camera clamp / Self-destruct timer / More blend tweaks 2019-01-30 19:48:41 -05:00
Anuken
c046a1b474 New blocks / Floor edge fixes 2019-01-30 18:39:10 -05:00
Anuken
209e3f03c1 Implemented shore map / New blocks / Bugfixes 2019-01-30 13:34:38 -05:00
Anuken
dbf05a1419 New basic water sprite 2019-01-29 22:26:02 -05:00
Anuken
5af35b6771 Zone balancing 2019-01-29 14:33:41 -05:00
Anuken
00abba11ae Removed carrying 2019-01-29 14:13:29 -05:00
Anuken
d268d94f76 Edge cleanup / Spawn warn / Bugfixes 2019-01-29 11:51:41 -05:00
Anuken
76af3e3077 Customizable edge stencil / Reduced redundant sprites 2019-01-28 23:30:11 -05:00
Anuken
54bade668e New tile edge algorithms / Struct value type generation 2019-01-28 22:11:23 -05:00
Anuken
5a3ec8f407 Fixed server crash / Struct annotation begins 2019-01-28 15:43:33 -05:00
Anuken
c043664ad6 2 2019-01-28 09:04:59 -05:00
Anuken
7e9ca6fbb6 Compile fix 2019-01-28 09:04:28 -05:00
Anuken
e9a82652a0 New blocks 2019-01-27 23:26:07 -05:00
Anuken
db2e6b6973 Better launch / Better spawns / Tweaks 2019-01-27 18:09:59 -05:00
Anuken
da9278ad8d Added recorder module 2019-01-27 12:31:14 -05:00
Anuken
5a9307e9a7 Smooth block shadows / Large procedural blocks 2019-01-27 12:09:01 -05:00
Anuken
f31fd622dd Fixed #396 2019-01-27 09:19:23 -05:00
Anuken
6723157ca5 Power tweaks 2019-01-26 17:33:20 -05:00
Anuken
956448a1a5 Fixed tests again, locally 2019-01-26 13:20:07 -05:00
Anuken
4be675f977 Thermal generator now based on floor / Power restructuring 2019-01-26 12:48:15 -05:00
Anuken
7924051c0d Graphite press balancing 2019-01-26 11:32:39 -05:00
Anuken
83b5f6ef2d Custom game loading 2019-01-26 10:52:16 -05:00
Anuken
0f26d62a0a Bundle update / Custom game button / Join button 2019-01-26 10:37:04 -05:00
Anuken
a9f11256cd Unfinished graphite press block 2019-01-25 23:15:30 -05:00
Anuken
ead0547d59 Tree-based zone layout 2019-01-25 21:48:03 -05:00
Anuken
89e29bce62 Incomplete zone layout 2019-01-25 14:09:08 -05:00
Anuken
058db5d5d0 Sprite cleanup 2019-01-24 20:00:35 -05:00
Anuken
76aa409f89 Changed unnecessary server output to 'debug' log level 2019-01-24 16:36:48 -05:00
Anuken
923d0497e6 Added sprites 2019-01-24 13:11:41 -05:00
Anuken
dd4f4b83fc Editor variant display / Visual changes 2019-01-24 13:11:22 -05:00
William So
c2bed82db5
Update 'bundle_zh_TW.properties' 2019-01-24 20:07:59 +08:00
Anuken
9a444da343 Unfinished block / Bugfixes 2019-01-23 23:43:31 -05:00
Anuken
9dd6a77c76 Various blocks added / Crater map updated / Fixed status effect bugs 2019-01-23 20:08:28 -05:00
Anuken
895725df64 Removed ores near enemy spawns 2019-01-23 16:55:35 -05:00
Anuken
c3883cdad0 Slight improvements to editor rendering / Renamed blockpart -> part 2019-01-23 08:51:21 -05:00
Anuken
e9e2cd614d Basic crater map / Spray tool / Crater floor / canProduce() 2019-01-22 23:02:04 -05:00
Anuken
55e1759b47 Block optimizations 2019-01-22 19:35:00 -05:00
Anuken
33f5215e6d Finished ground zero map layout 2019-01-22 17:58:43 -05:00
Anuken
5459a646b3 In-game block team display / Editor bugfix 2019-01-22 15:46:22 -05:00
Anuken
6229f99a2e Fixed tests / Various build tools updated 2019-01-22 15:01:30 -05:00
Anuken
0e5b95e3aa Added health bars to block info / Fixed block info refresh bug 2019-01-22 13:46:10 -05:00
Anuken
72d7c1ba54 Fixed 'unlocks' dialog entries 2019-01-21 22:29:50 -05:00
Anuken
ee9a2ee03d Deploy dialog requirements done 2019-01-21 19:37:02 -05:00
Anuken
6bfbcc4aa9 Added zone requirement display 2019-01-21 16:04:50 -05:00
Anuken
a9d7ed50b7 Re-added all recipes to blocks 2019-01-20 21:11:58 -05:00
Anuken
bc77ebc10c Automatic tech node cost generation 2019-01-20 15:44:54 -05:00
Anuken
cbdce79d7d Misc. cleanup 2019-01-20 15:21:46 -05:00
Anuken
46dfa064d0 Removed recipe definitions 2019-01-20 13:50:56 -05:00
Anuken
0478af2564 Recipe class removed completely 2019-01-20 13:49:53 -05:00
Anuken
750388a425 Defined first 12 zones 2019-01-20 11:49:17 -05:00
Anuken
ea9155b903 Further UI cleanup 2019-01-19 23:13:46 -05:00
Anuken
d34f228d2f Functional tech tree 2019-01-19 22:16:28 -05:00
Anuken
093043750b UI cleanup 2019-01-19 17:45:33 -05:00
Anuken
4fb0c246db Tech tree filled out 2019-01-19 14:58:29 -05:00
Anuken
5e951f27c9 Block icon rework / Dynamic icon generation / Tech tree tweaks 2019-01-19 12:42:02 -05:00
Anuken
49253964d8 Tech tree rendering + layout 2019-01-19 00:26:39 -05:00
Anuken
4ff1d0c2e1 Render fix 2019-01-18 15:41:49 -05:00
Anuken
2385011f96 Better build request display / Fixed incorrect rotation axes 2019-01-18 11:30:15 -05:00
Anuken
7527f9326c Fixed units not rotating to target 2019-01-18 09:23:39 -05:00
Anuken
9c7b80f066 Scrap ore / Player shadows 2019-01-18 09:19:42 -05:00
Anuken
48facc0978 Launch button 2019-01-17 23:17:17 -05:00
Anuken
22a6c4e8af Glass 2019-01-17 19:28:25 -05:00
Anuken
bd6cfa6461 Removed UnitCommand / Disabled mechs flying over env. blocks 2019-01-17 19:00:18 -05:00
Anuken
c63dca1c0d Map distortion / Multi-spawns 2019-01-17 16:28:42 -05:00
Anuken
c6af151bf3 Sprite cleanup / Stats / More balancing / New events 2019-01-17 15:30:50 -05:00
Anuken
ccc20a9716 Balancing 2019-01-17 13:03:06 -05:00
Anuken
47605583d1 Saving fix 2019-01-16 23:48:21 -05:00
Anuken
58e83c11f0 Saves / Paused dialog cleanup / Zone rule save 2019-01-16 23:25:43 -05:00
Anuken
836a4eb892 Antialiasing 2019-01-16 22:45:51 -05:00
Anuken
6d50a747e3 Basic map shading 2019-01-16 20:37:43 -05:00
Anuken
4344af1f02 Added unlock messages for all content 2019-01-16 19:52:58 -05:00
Anuken
6510d83524 Starting items / No editor unlocks / Fixed Block#synthetic() 2019-01-16 19:36:30 -05:00
Anuken
733a064c79 NetworkIO cleanup 2019-01-15 21:33:08 -05:00
Anuken
8715f6a301 Removed zone init() 2019-01-15 21:26:45 -05:00
Anuken
b51725633e Merge remote-tracking branch 'origin/master' 2019-01-15 21:21:32 -05:00
Anuken
5ec11c61bd Added map-specific generator 2019-01-15 21:21:28 -05:00
Anuken
a976a7affb
Merge branch 'master' into patch-19 2019-01-15 20:29:34 -05:00
Anuken
2f76684113 Cheaper arc 2019-01-14 18:38:32 -05:00
Anuken
017b83d375 push time 2019-01-13 14:20:25 -05:00
Anuken
650b443fd0 Starting items / Zone balancing 2019-01-12 18:51:21 -05:00
Anuken
8aa1509f47 Gamemodes removed 2019-01-12 16:55:24 -05:00
VizardAlpha
b21bf2d544
Updates bundle_fr_BE.properties 2019-01-12 14:56:51 +01:00
Anuken
777bd60f88 Added basic ore generator 2019-01-11 20:29:50 -05:00
Anuken
7889db43a8 Zone generator requirement 2019-01-11 09:46:49 -05:00
Anuken
ae3aa20508 elevation is gone but this time I'm not doing the crab rave meme 2019-01-10 21:45:18 -05:00
Anuken
84e754dd10 Added zone class / Dialog method inline 2019-01-09 18:50:10 -05:00
Anuken
b9618d66f2 Removed 'text.*' prefix 2019-01-09 16:58:06 -05:00
Anuken
daa7b20e4a World generation launch pad preset 2019-01-09 16:37:14 -05:00
Anuken
2bc63b37e4 Bugfixes 2019-01-09 11:49:28 -05:00
Anuken
33afab7294 Launchpad block 2019-01-09 11:44:33 -05:00
VizardAlpha
8010a82776
Update bundle_fr_BE.properties 2019-01-09 16:49:25 +01:00
Anuken
048b7bd32f Global inventory / 'Deploying' / Removed command center 2019-01-09 09:07:48 -05:00
Anuken
28fa0b070d Merge branch 'unsector' 
# Conflicts:
#	core/src/io/anuke/mindustry/maps/SectorPresets.java
#	core/src/io/anuke/mindustry/maps/Sectors.java
#	core/src/io/anuke/mindustry/maps/TutorialSector.java
#	core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java
#	core/src/io/anuke/mindustry/maps/missions/MissionWithStartingCore.java
#	core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
 2019-01-08 22:28:13 -05:00
Anuken
dc0be93b25 Status effect cleanup 2019-01-08 20:32:22 -05:00
Anuken
1d8efe5f9d Packer reorganization 2019-01-08 17:41:51 -05:00
Anuken
521174f911 Removed autogenerated liquid sprites 2019-01-08 09:56:42 -05:00
Anuken
a6f7bd9099 Cleanup 2019-01-07 21:22:06 -05:00
Anuken
fed964e0f7 a rather large merge 2019-01-07 21:10:57 -05:00
Anuken
351b8c2469 Fixed content class errors 2019-01-07 18:48:55 -05:00
Anuken
ee9f65d4a3 Block class merge 2019-01-07 18:39:06 -05:00
Anuken
a1a69f62e1 🦀 FX classes are gone 🦀 2019-01-07 17:11:53 -05:00
Anuken
ff52fec663 Cleanup: all bullet definitions moved into one class 2019-01-07 16:53:04 -05:00
Anuken
5743d30851 Removed AmmoType class completely 2019-01-07 16:01:27 -05:00
Anuken
de02061b5e Removed dependency on old BulletEntity/BaseBulletType classes 2019-01-07 12:25:54 -05:00
Anuken
568e55e373 Crash fix 2019-01-07 10:37:58 -05:00
Anuken
415252a5b2 Merge branches 'master' and 'unsector' of https://github.com/Anuken/Mindustry into unsector 2019-01-06 10:21:15 -05:00
Anuken
307bb7aeec Merge branch 'master' of https://github.com/Anuken/Mindustry into crafting-rework 
# Conflicts:
#	core/src/io/anuke/mindustry/content/Recipes.java
 2019-01-06 09:45:11 -05:00
Anuken
fdd0c25a25 Removed core drone 2019-01-06 09:27:56 -05:00
Anuken
d691e9f39d it is commit o'clock 2019-01-05 23:00:58 -05:00
Anuken
a5cbe19d23 Merge branches 'crafting-rework' and 'master' of https://github.com/Anuken/Mindustry into crafting-rework 
# Conflicts:
#	core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java
#	core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java
#	core/src/io/anuke/mindustry/core/Renderer.java
#	core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java
 2019-01-04 16:15:23 -05:00
Anuken
5661124d86 Merge branches 'master' and 'unsector' of https://github.com/Anuken/Mindustry into unsector 2019-01-04 16:11:30 -05:00
Anuken
1346e163e9 Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-01-04 15:27:39 -05:00
Anuken
0900c13fa1 Cleanup 2019-01-04 15:11:58 -05:00
Anuken
5019f200b7 Large world size optimizations 2019-01-04 13:55:06 -05:00
Anuken
3b41ded045 More zoom fixes 2019-01-04 12:18:26 -05:00
Anuken
9f84b84819 Removed all extra floor rendering for larger worlds 2019-01-04 12:17:42 -05:00
Anuken
f61f3af687 Zoom fixes 2019-01-04 11:39:49 -05:00
Anuken
0a6f7ac817 Functional play button 2019-01-03 20:42:34 -05:00
Anuken
153e6c5f1b Re-structuring 2019-01-03 19:46:25 -05:00
Anuken
e24d96da6f Note 2019-01-03 18:35:48 -05:00
Anuken
59e5099ed6 Merge remote-tracking branch 'origin/master' 2019-01-03 18:22:26 -05:00
Anuken
b8e6e5df61 Power PR merged / Various bugfixes 
Closes #288
 2019-01-03 18:22:13 -05:00