mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-30 09:30:39 +07:00
Code Issues Packages Projects Releases Wiki Activity
1,581 Commits 4 Branches 160 Tags 2.3 GiB
3c0310120d
Commit Graph

1324 Commits

Author SHA1 Message Date
Anuken
c7ec7db61a Fixed empty inventories showing, debug blocks getting unlocked 2018-06-24 21:58:04 -04:00
Anuken
27cf4b0218 Fixed a bug in drone AI 2018-06-24 21:49:41 -04:00
Anuken
50372ed9f3 Disabled NYI gamemode selection, removed test map 2018-06-24 21:33:37 -04:00
Anuken
d8e8765cec Balanced a few electric turrets, fixed crash 2018-06-24 21:26:22 -04:00
Anuken
6ec28be541 Implemented homing silicon bullets 2018-06-24 21:17:48 -04:00
Anuken
6e5aec080a Implemented artillery turret, carbide artillery shells 2018-06-24 21:05:00 -04:00
Anuken
c7fb517e6c Made core drone pick up dropped items 2018-06-24 20:18:56 -04:00
Anuken
ca10ab0274 Increased fog view range, added tile fog discovery 2018-06-24 16:20:42 -04:00
Anuken
41e611d7db Improved fog of war, added minimap display 2018-06-24 14:42:45 -04:00
Anuken
77a63a39ad Added terrible fog-of-war 2018-06-24 00:09:00 -04:00
Anuken
0267ad574f Fixed some AI quirks, re-added debug blocks, fixed cultivator 2018-06-23 15:11:13 -04:00
Anuken
8f2aae6065 Added unit death scorch effects, more bugfixes 2018-06-23 12:30:54 -04:00
Anuken
a4edf827c8 Added random slopes, various bugfixes and balance fixes 2018-06-23 11:53:14 -04:00
Anuken
f9947d2e53 Improved world generation 2018-06-23 10:36:47 -04:00
Anuken
0a6614d1b3 Added rocks again 2018-06-22 23:04:58 -04:00
Anuken
98cfb4d5ed New block color and ore system 2018-06-22 22:48:00 -04:00
Anuken
74878b5cb1 Loads of bugfixes, gameplay tweaks 2018-06-22 19:14:50 -04:00
Anuken
57d5628750 Fixed unit stats bars not being interpolated 2018-06-22 15:48:38 -04:00
Anuken
fc058476ed Made drone more intelligent 2018-06-22 15:38:14 -04:00
Anuken
c24eb231ab Added core miner drone, massive amount of balancing/setup 2018-06-22 15:07:48 -04:00
Anuken
f7dbe807e4 Added unit drops, boosting 2018-06-21 15:58:37 -04:00
Anuken
a76e99af86 Playtesting begins: balancing fixes 2018-06-21 14:07:20 -04:00
Anuken
13bb78ffa0 Added new conveyor animation 2018-06-21 12:41:33 -04:00
Anuken
8c194398a9 Added deselection, fixed pump placement and junction skipping 2018-06-21 10:20:37 -04:00
Anuken
21238e7376 lerp -> slerp 2018-06-20 22:57:22 -04:00
Anuken
ca30f49481 Added spatial indexing of tile targets, many bugfixes 2018-06-20 22:56:53 -04:00
Anuken
45da578756 Implemented dynamic ground unit spawning 2018-06-20 20:23:43 -04:00
Anuken
1c80314cfd Added procedural map borders 2018-06-20 18:14:12 -04:00
Anuken
23d621e9c7 Added incomplete procedural map generator 2018-06-20 16:16:59 -04:00
Anuken
2884e4b847 Improvements to playability at low TPS 2018-06-20 15:06:53 -04:00
Anuken
0c7f6432d8 Fixed glitchy minimap unit rendering 2018-06-20 12:15:56 -04:00
Anuken
56bb23400a Moved over map generator / Fixed logic updating on both threads 2018-06-20 11:09:44 -04:00
Anuken
33a278ccb4 Added unit squads, new spawning, WaveSpawner class 2018-06-19 23:46:46 -04:00
Anuken
e79494b5cb Implemented desktop carrying 2018-06-19 16:02:25 -04:00
Anuken
3c3147d665 Implemented flying for desktop, new ship bodies 2018-06-19 15:38:09 -04:00
Anuken
23f3f68767 Implemented basic mech factories 2018-06-19 14:23:59 -04:00
Anuken
6cfd1a1ef6 Improved texture gen system, mech icon generation 2018-06-18 23:05:31 -04:00
Anuken
354c6e17c0 Implemented smelting with flux 2018-06-18 17:20:23 -04:00
Anuken
c31a710aa7 Cleanup up turret definitions/recipes 2018-06-18 16:37:38 -04:00
Anuken
0304512b8a Implemented unstable fusion reactor, mending core, liquid cooled turrets 2018-06-18 16:07:37 -04:00
Anuken
80d0a1555a Added phasewalls 2018-06-18 14:37:50 -04:00
Anuken
ee2cba89d5 New generators, projectors, status system, sprites renamed 2018-06-18 14:27:50 -04:00
Anuken
84d80525fa Duplicate ID check, hasItems cleanup, web host message, projector start 2018-06-17 23:19:58 -04:00
Anuken
4d9fab6cf2 Added all new stat definitions to bundle 2018-06-17 10:25:10 -04:00
Anuken
77856a3ff7 Improved stat system 2018-06-16 23:17:47 -04:00
Anuken
eb99132b8c Implemented volatile teleporters 2018-06-16 22:00:10 -04:00
Anuken
e1cdf80b17 Changed teleporter name, fixed some bugs 2018-06-16 21:55:38 -04:00
Anuken
1a8cd2e24c Added reconstructor blocks 2018-06-16 19:41:54 -04:00
Anuken
6c620182ea Implemented mass drivers 2018-06-16 14:34:11 -04:00
Anuken
ff542a9946 Improved efficiency of areEnemies() function 2018-06-16 11:35:32 -04:00
Anuken
6281826b92 Updated uCore 2018-06-15 21:54:26 -04:00
Anuken
eb94a4ee14 Added deflector walls 2018-06-15 21:52:02 -04:00
Anuken
09ebb7a01c Added entries for all new smelters 2018-06-15 18:47:53 -04:00
Anuken
11d2ada6b3 Added texture generation system 2018-06-15 18:06:05 -04:00
Anuken
ffbb6bb40b Sprite reorganization, new power and tier-based pumps 2018-06-15 15:53:43 -04:00
Anuken
604f315a83 Switched to binary preference file for desktop 2018-06-15 12:13:52 -04:00
Anuken
ba67c01dd0 Fixed a minor cursor bug, changed drill/pump place verification 2018-06-14 18:36:55 -04:00
Anuken
fab3704dbd Moved over Streamable inner classes, added test map 2018-06-14 17:11:38 -04:00
Anuken
1436e78305 Fixed extra space in uCore dependency 2018-06-13 23:49:25 -04:00
Anuken
125677f787 Added toggleable syncing 2018-06-13 23:16:34 -04:00
Anuken
63d5539427 Updated uCore 2018-06-13 21:18:52 -04:00
Anuken
4be101e9fc Implemented ore generation 2018-06-13 21:02:47 -04:00
Anuken
d0302cdbf3 Many fixes to admin/trace/UUID system 2018-06-13 17:52:31 -04:00
Anuken
c077f6e1e8 Implemented authoritative movement/shooting, fixed netbugs 2018-06-13 17:06:46 -04:00
Anuken
4ca9a26bdd Added name validation 2018-06-13 11:38:12 -04:00
Anuken
6b713b283a Updated inventory menu, weapon factory mechanics 2018-06-12 22:26:16 -04:00
Anuken
9abbd8c158 Implemented slopes 2018-06-12 11:36:55 -04:00
Anuken
4df0641d67 Improved event exception format 2018-06-12 11:05:17 -04:00
Anuken
4b093812bc Added elevation tool 2018-06-12 10:58:07 -04:00
Anuken
d7120af5cb Fixed a small map renderer bug 2018-06-11 21:16:16 -04:00
Anuken
e36a666542 Implemented elevation in-game with sprites 2018-06-11 21:08:15 -04:00
Anuken
b609b5909b Implemented elevation in editor and mechanically in-game 2018-06-11 15:18:25 -04:00
Anuken
cbd83b5e39 Fixed many various bugs with syncing things 2018-06-10 23:33:37 -04:00
Anuken
2ddd768393 Actually implemented puddle syncing 2018-06-10 21:00:23 -04:00
Anuken
c508f30d92 Synced puddles, updated uCore 2018-06-10 20:53:13 -04:00
Anuken
9b7750c1f3 Synced fireballs and fire 2018-06-10 19:16:59 -04:00
Anuken
a9b5949a7b Fixed units not shooting 2018-06-10 14:46:04 -04:00
Anuken
f56247df7a Added placed() method support 2018-06-10 14:43:28 -04:00
Anuken
0ef76aa66d Implemented block input sync, cursor bugfix 2018-06-10 14:29:29 -04:00
Anuken
5c98283932 Implemented unit syncing, new instantiation system 2018-06-10 13:03:52 -04:00
Anuken
ce6bd0fd6d Fixed item drop quantities not syncing 2018-06-09 23:33:01 -04:00
Anuken
aca1001f9a Fixed player dupes, new breaking system, multiplayer block edits 2018-06-09 23:23:14 -04:00
Anuken
d5a58be440 Updated uCore, fixed GWT build, better client snapshot system 2018-06-09 17:05:47 -04:00
Anuken
b33dd7e91c Fixed ammo resupply and shooting not working clientside 2018-06-09 14:20:08 -04:00
Anuken
30e13259b3 Updated client snapshot system, fixed stuck respawn bug 2018-06-09 13:44:24 -04:00
Anuken
be2fa1dfad Fixed interpolation, made death and damage serverside 2018-06-09 11:58:15 -04:00
Anuken
bc7b584001 Local forwarding fixes, remote building 2018-06-09 01:12:49 -04:00
Anuken
690571eec0 Massive amount of fixes and changes with multiplayer/annotations 2018-06-08 22:43:23 -04:00
Anuken
8e00bdcf30 First client/server snapshot implementation 2018-06-08 12:22:07 -04:00
Anuken
0bd0602655 Fixed build errors 2018-06-08 10:02:15 -04:00
Anuken
2bcbc3294b Updated saving to DataOutput/Input 2018-06-07 20:30:02 -04:00
Anuken
9aa5460688 Added DEZ library 2018-06-07 17:23:32 -04:00
Anuken
e451cdd519 More codegen fixes, fixed (one) multiplayer connect crash 2018-06-07 00:01:08 -04:00
Anuken
ab9cdf5610 Increased max packet size to 1024 2018-06-06 21:07:53 -04:00
Anuken
c443eee15d Annotation system bugs fixed 2018-06-06 20:56:59 -04:00
Anuken
ccb97e34d5 Moved many block files; work on annotation processor 2018-06-06 14:51:25 -04:00
Anuken
917e2e40fb Memory optimizations, multithreading fixes, uCore updated 2018-06-05 14:03:08 -04:00
Anuken
c5ed0afb4e Added (mobile) pickup/dropping of units 2018-06-05 00:02:07 -04:00
Anuken
b10fa9e5b2 Added carry traits 2018-06-04 21:15:40 -04:00
Anuken
210967cfef Added syncable bullets 2018-06-04 18:32:03 -04:00
Anuken
2a5118326a Added item drops, fixed various bugs 2018-06-04 16:17:24 -04:00
Anuken
a6225962b0 Updated uCore 2018-06-04 13:02:07 -04:00
Anuken
01f4a9b23b Changed too many things to fit in commit log 2018-06-04 12:47:08 -04:00
Anuken
3202d62a92 Further targeting improvements for AI 2018-06-03 20:03:53 -04:00
Anuken
270dc351a1 Unit system rewrite, new drone AI 2018-06-03 12:12:18 -04:00
Anuken
12c746a4e4 Fixed build errors, AI improvements 2018-06-03 00:09:41 -04:00
Anuken
a116a2a553 Fixed crash caused by lack of multithreading 2018-06-02 22:08:37 -04:00
Anuken
9555b10b97 Bugfixes, cleanup, optimization 2018-06-02 21:45:07 -04:00
Anuken
ae6b4211b9 Added mining 2018-06-02 11:13:07 -04:00
Anuken
3fe7e4e8da mess cleanup 2018-06-02 00:47:22 -04:00
Anuken
ba805739b0 one painful merge later 2018-06-02 00:46:40 -04:00
Anuken
5b65c2e27e Fixed MapIO not reading map stream fully 2018-06-02 00:19:31 -04:00
Anuken
6f9b712230 Fixed trail appearing behind player mech 2018-06-01 18:35:14 -04:00
Anuken
be8632d94b Added Android automatic shooting 2018-06-01 18:23:45 -04:00
Anuken
1bc4b16d38 Added map import button 2018-06-01 14:45:55 -04:00
Anuken
c79c23899f
Merge branch 'master' into feature-blocklogsandrollback 2018-06-01 11:21:34 -06:00
Anuken
a04e432aea Fixed multithreading 2018-06-01 13:11:40 -04:00
Anuken
5c120e532f Added support for Mac file association; minor optimizations 2018-06-01 13:01:05 -04:00
Anuken
c4ae6121b4 Implemented loading map/save files on launch (Android) 2018-06-01 12:20:16 -04:00
Anuken
23d07600f7 Bugfixes, added saving/loading maps in editor for web version 2018-05-31 23:49:43 -04:00
Anuken
418467e467 Fixed bad app-data directory being provided 2018-05-31 21:24:04 -04:00
Anuken
e60b3880ce MapEditor tweaks, fixed file browser on Android w/ permissions 2018-05-31 20:27:13 -04:00
Anuken
92acf009b0 Fixed FileChooser conflict 2018-05-31 17:04:26 -04:00
Anuken
a141df434c Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 
# Conflicts:
#	build.gradle
#	core/src/io/anuke/mindustry/Vars.java
#	core/src/io/anuke/mindustry/core/Control.java
#	core/src/io/anuke/mindustry/core/Platform.java
#	core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java
#	core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java
#	core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java
#	desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
 2018-05-31 17:00:47 -04:00
Anuken
32201dda72 Implemented nuclear reactor 'heating' 2018-05-31 16:45:45 -04:00
Anuken
13b0c8880d Implemented block breaking on Android 2018-05-31 16:27:30 -04:00
Anuken
24e7d755eb Added respawn animation on game start 2018-05-31 11:48:07 -04:00
Anuken
e534a6b7fc Merge remote-tracking branch 'origin/4.0' into 4.0 2018-05-31 11:41:38 -04:00
Anuken
277d75016c Updated uCore, added new respawn mechanics 2018-05-31 11:41:31 -04:00
Gureumi
8f283b2226
Update bundle_ko.properties 
Early update language file!
may be?
 2018-05-31 20:53:38 +09:00
Anuken
857b76980b Fixed shaky camera, many other small bugs 2018-05-30 23:51:42 -04:00
Anuken
fae7bfa8c5 Dynamic layout for unlocking blocks 2018-05-30 22:41:52 -04:00
Anuken
e9e7d2e289 Place menu scrolling, fixed some settings menu bugs 2018-05-30 18:32:01 -04:00
Anuken
e3cbe118c5 Done with desktop breaking 2018-05-30 13:43:49 -04:00
Anuken
9d05cfba36 Implemented desktop line placement 2018-05-30 12:40:51 -04:00
Anuken
b5966afe25 Removed unnecessary UI fragments, began work on Desktop input 2018-05-30 00:32:20 -04:00
Anuken
1cf91c0ce3 Added rotation to Android placement 2018-05-29 23:18:31 -04:00
Anuken
0f09a0b152 New shaders, remake of Android placement partially done 2018-05-29 22:03:43 -04:00
Anuken
b434c37f01 Rewrite of all static initialization code 2018-05-29 15:24:47 -04:00
Anuken
4655bd5502 Massive input refactoring 2018-05-29 00:15:24 -04:00
Anuken
fcb74d4fba Removed additional info from mac version 2018-05-28 16:55:46 -04:00
Anuken
2bf7d06a91 Scrapped current place menu 2018-05-28 16:23:23 -04:00
Anuken
ce68c2a3e9 Documentation, added Content/ContentDatabase classes 2018-05-28 15:20:46 -04:00
Anuken
e58194ac3c Confined Mac users to Downloads/ directory 2018-05-28 12:34:01 -04:00
Anuken
857f36e01a Re-definition of all ammo and new turrets 2018-05-28 12:28:50 -04:00
Anuken
83c3a80766 Definition of all bullet types listed on trello 2018-05-27 19:12:01 -04:00
Anuken
736552f3b1 Removed all usage of drawBullet, switched to BasicBulletType 2018-05-27 15:49:01 -04:00
Anuken
0b28f97d8f Bullet refactoring 2018-05-27 15:17:35 -04:00
Anuken
47b627d669 Added sprites for all ammo types 2018-05-25 23:04:48 -04:00
Anuken
b051a296fc Added definitions for all bullet types 2018-05-25 21:56:23 -04:00
Anuken
908a569413 Added all dummy ammo types, added ItemType class 2018-05-25 11:45:47 -04:00
Anuken
31f83dfb40 Merge remote-tracking branch 'origin/master' 2018-05-25 01:10:31 -04:00
Anuken
022b16c8e6 Updated Platform.java 2018-05-25 01:10:12 -04:00
Anuken
86360049c3 Updated FileChooser dir 2018-05-25 01:09:18 -04:00
Anuken
f524be6738 Added native file choosers for importing/exporting save 2018-05-24 23:16:03 -04:00
Anuken
519d2c1714 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/sprites/icon.icns
 2018-05-24 21:14:10 -04:00
Anuken
c19fcb831f Added native file chooser, fixed macOS prefs errors 2018-05-24 21:13:31 -04:00
Anuken
ff6268e616 Updated icns file 2018-05-24 21:12:41 -04:00
Anuken
570226a051 Renamed all turrets 2018-05-24 15:40:36 -04:00
Anuken
96cfb51bd8 Sprite changes 2018-05-24 13:30:56 -04:00
Anuken
ba0c7907ca Merge remote-tracking branch 'origin/master' 2018-05-24 11:21:16 -04:00
Anuken
4c6ae83d4b Build 40 release 2018-05-24 11:19:03 -04:00
Anuken
e4231e012d Fixed a few minor bugs with scrolling in editor 2018-05-23 22:23:52 -04:00
Anuken
9693de8885 Added new screen for managing and viewing maps, many editor fixes 2018-05-23 21:40:59 -04:00
Anuken
d096a7ceb1 Merge fixes 2018-05-23 10:37:14 -04:00
Anuken
fd77dfd66d Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 
# Conflicts:
#	build.gradle
#	core/src/io/anuke/mindustry/Vars.java
#	core/src/io/anuke/mindustry/core/Control.java
#	core/src/io/anuke/mindustry/core/Logic.java
#	core/src/io/anuke/mindustry/core/NetClient.java
#	core/src/io/anuke/mindustry/core/NetServer.java
#	core/src/io/anuke/mindustry/core/UI.java
#	core/src/io/anuke/mindustry/editor/MapSaveDialog.java
#	core/src/io/anuke/mindustry/input/GestureHandler.java
#	core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java
#	core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java
#	core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
#	gradle/wrapper/gradle-wrapper.properties
#	server/src/io/anuke/mindustry/server/ServerControl.java
 2018-05-23 10:36:59 -04:00
Anuken
3f1389818c Changed TextArea padding 2018-05-23 10:28:47 -04:00
Anuken
c920fa6740 Added all export/import menus, fixed bad icons for editor blocks 2018-05-22 23:56:29 -04:00
Anuken
b4088dcfbc Some more revisions to iOS version 2018-05-22 14:30:54 -07:00
Anuken
b20f026c7b Added dialogs for saving/loading maps directly, work on web support 2018-05-22 17:28:21 -04:00
Anuken
f0fa126e7b Changed map edit menu, added map info dialog 2018-05-22 14:16:12 -04:00
Anuken
2999694f48 Fixed brush not respecting multiblock rules 2018-05-22 12:33:42 -04:00
Anuken
fcc60957c1 Made DrawOperation non-disposable 2018-05-22 12:09:18 -04:00
Anuken
4781351184 Testing github webhook 2018-05-22 12:07:33 -04:00
Anuken
d97a585eba Added undoing for map editor 2018-05-22 00:02:43 -04:00
Anuken
2d65c9734c Added IndexedRenderer rotation, map editor rotation 2018-05-21 23:00:40 -04:00
Anuken
3b5a9c0a10 Added IndexedRenderer color, block team indicator 2018-05-21 18:49:00 -04:00
Anuken
f6184004e5 Implemented editor multiblock support 2018-05-21 17:45:12 -04:00
Anuken
5602cb8920 Added basic enemy spawning, fixed turret base sprite, input place lag 2018-05-21 15:03:34 -04:00
Anuken
4a250b4e27 Fixed brush size layout, added map resize button 2018-05-21 13:59:35 -04:00
Anuken
37afb46957 Deprecated Draw.color(String), switched to type-safe usage 2018-05-21 13:37:16 -04:00
Anuken
9708d3183f Implemented multiblock replacement, upgrade-safe building 2018-05-21 12:20:23 -04:00
Anuken
241b86d704 Updated item transfer visuals, centered block inventory 2018-05-21 12:03:49 -04:00
Anuken
8f137eadf0 New ItemTransfer entity 2018-05-21 11:25:41 -04:00
Anuken
93353ff900 Removed action-based item transfer animation 2018-05-21 11:05:10 -04:00
Anuken
ed7e77b2db New breaking animation and colors 2018-05-21 00:27:01 -04:00
Anuken
2108aab523 Added usage of OS.getAppDataDirectory() 2018-05-20 21:52:45 -04:00
Anuken
75f01099ee Re-added resource harvesting from blocks 2018-05-20 20:51:56 -04:00
Anuken
26e1ad51ff Documentation, cleanup, incremental resource usage, core seeking 2018-05-20 20:41:10 -04:00
Anuken
c1a5482ad2 Major refactoring of building, sound, inventory 2018-05-20 17:59:52 -04:00
Anuken
ed232248a2 Updated polish bundle 2018-05-20 16:05:24 -04:00
Anuken
e215324292 Updated spanish bundle, added missing formatted text 2018-05-20 15:50:01 -04:00
Anuken
b64cbc223f Updated icons again 2018-05-20 15:16:44 -04:00
Anuken
de40df7f7b Fixed place mode not overwriting old queue 2018-05-20 13:05:25 -04:00
Anuken
94896451ac Merge remote-tracking branch 'origin/master' 2018-05-20 11:47:32 -04:00
Anuken
0e35bb4852 Fixed scrolling player menu causing panning on mobile 2018-05-20 11:47:20 -04:00
Anuken
8d66d43a98 Some more sharing revisions 2018-05-19 20:19:47 -07:00
Anuken
1c1df81341 Added sharing for iOS saves, fixed icons 2018-05-19 17:13:04 -07:00
Anuken
66a1cc7b71 Updated iOS map sharing 2018-05-19 18:25:20 -04:00
Anuken
0543569315 Merge remote-tracking branch 'origin/master' 2018-05-19 15:01:55 -07:00