mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-23 04:59:19 +07:00
Code Issues Packages Projects Releases Wiki Activity
1,396 Commits 4 Branches 160 Tags 2.3 GiB
8c194398a9
Commit Graph

1151 Commits

Author SHA1 Message Date
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
Anuken
e5a94bd140 Grid updates 2018-05-19 15:01:18 -07:00
Anuken
adfebdb3f6
Merge pull request #122 from Prosta4okua/patch-1 
Update bundle_ru.properties[Work in progress]
 2018-05-19 15:58:41 -06:00
Prosta4okua
dbe06b0a93
Update bundle_ru.properties 2018-05-19 22:50:50 +03:00
Anuken
e8305d1245 Updated map editor with better placement preview 2018-05-19 11:53:01 -07:00
Prosta4okua
b2ea733b45
Update bundle_ru.properties 2018-05-19 21:49:29 +03:00
Anuken
fc320fb9ee Moved Platform.java, basic iOS image loading 2018-05-19 10:35:48 -07:00
Commodore64x
a3268eefbf Fixed field size in rollback menu. 2018-05-19 14:34:50 +10:00
Commodore64x
5a77eebb34 Fixed ui in the rollback menu. 2018-05-19 14:22:07 +10:00
Commodore64x
68af32bc9f Added rollback into the admin menu, fixed a bug where players would crash upon trying to view their own logs on relog. 2018-05-19 13:37:44 +10:00
Anuken
100e5042de Fixed block placement crash 2018-05-18 18:24:36 -07:00
Anuken
b3e188a5f4 Improvements to annotation code generation system, client RMI 2018-05-18 17:21:18 -07:00
Anuken
ae3bcac3b7 Removed gifimages folder 2018-05-18 09:26:50 -07:00
Anuken
afed54b217 Fixed a few bugs with new placement system 2018-05-18 09:22:40 -07:00
Anuken
57b0e3e311 Fixed iOS donate button and changelog appearing 2018-05-17 20:55:29 -07:00
Anuken
19e62786c9 New placement system without limits, queue block placements 2018-05-17 20:36:43 -07:00
Anuken
97cac33773 New build limits, recipe refactoring 2018-05-16 14:27:25 -07:00
Anuken
a889571b98 Added unit-based block building with effects 2018-05-16 12:54:36 -07:00
Anuken
cf1148e7c8 iOS plist fixes, re-added music 2018-05-16 11:06:15 -07:00
Anuken
e2f74fd4f0 Removed build effect surface usage 2018-05-16 07:52:17 -07:00
Anuken
57bcea56b5 Implemented block build animation and shaders 2018-05-15 20:03:03 -07:00
Commodore64x
380a955e7a Updated the way packets are exchanged for edit logs. 2018-05-15 16:36:39 +10:00
Anuken
cf50f47459 Improvements to ground unit AI 2018-05-14 08:51:16 -07:00
Anuken
eb69dce585 Removed Invoke class 2018-05-14 06:40:23 -07:00
Commodore64x
b3adf7b331 Replaced ArrayLists with Arrays, overhauled requesting of logs from the server, improved rollback command and added log resetting. 2018-05-14 18:48:44 +10:00
Anuken
c79f0b76ff Keybind fixes 2018-05-13 21:16:44 -07:00
Anuken
ca24e64c42 Implemented local multiplayer fully 2018-05-13 20:48:44 -07:00
Anuken
d1a3752b2d Annotation processing done, more work on local multiplayer input 2018-05-13 16:41:50 -07:00
Anuken
00e70cbb6a Massive amount of refactoring for local multiplayer, annotations 2018-05-12 07:30:23 -07:00
Commodore64x
7f2c2d9d6b Added edit logging and whole world rollback 2018-05-12 18:34:44 +10:00
Anuken
959f756ff5 Local multiplayer initial commit 2018-05-11 07:59:10 -07:00
Anuken
90b9ba71de Removed delta() usage in modules 2018-05-11 07:02:10 -07:00
Anuken
26025a3018 Fixed multithreading affecting wave time 2018-05-09 16:58:53 -07:00
Anuken
09bdfd7ac1 Added local method invocation annotation 2018-05-09 16:41:02 -07:00
Anuken
ce2b73b737 Updated Bullet to use floats 2018-05-09 09:46:24 -07:00
Anuken
83d1707b56 Added event method, changed Fireball to projectile type 2018-05-09 10:52:51 -04:00
Gureumi
cbdf252fe6
fix missing tranlate lang and update about info 2018-05-09 20:33:53 +09:00
Anuken
55cd0c2bae Added basic RMI-like system for network evens 2018-05-08 18:39:52 -04:00
Anuken
6cc1cecf5a Updated RDX item, changed packet creation to use pooling 2018-05-08 10:53:36 -04:00
Anuken
7a94ebcf2a Implemented packet pooling 2018-05-07 14:23:52 -04:00
Anuken
84a126253a Fixed player looking at cursor with no ammo 2018-05-06 21:35:59 -04:00
Anuken
ad3ce3f9fc Minor comment fix 2018-05-06 11:52:10 -04:00
Anuken
c74ee2150c Implemented new accurate turret prediction 2018-05-06 10:54:18 -04:00
Prosta4okua
665f0ee03e
Update bundle_ru.properties 2018-05-06 09:45:17 +03:00
Anuken
f8a4128c88 Updated sprites 2018-05-06 01:43:33 -04:00
Anuken
c931bbf107 Merged with master 2018-05-06 01:43:12 -04:00
Anuken
b020336f8c Temporarily disabled validating replacements 2018-05-05 22:26:59 -04:00
Anuken
299c2af59b Added configurable anti-grief 2018-05-05 20:20:34 -04:00
Anuken
37a73eda37 Fixed menu opening and closing when chat is open 2018-05-05 18:36:25 -04:00
Anuken
450fc456be Fixed extra wave time counting down on tutorial 2018-05-05 14:13:21 -04:00
Anuken
f7e0dc4818 Changed music back 2018-05-05 13:50:32 -04:00
Anuken
b496f51afc Added turk bundle, updated wrapping, added fastshoot kick message 2018-05-05 13:45:04 -04:00
Anuken
c1163a078a Updated translation bundles, added autowrap to menu 2018-05-05 13:18:21 -04:00
Anuken
90c243dec8 Merge remote-tracking branch 'origin/master' 2018-05-05 12:49:01 -04:00
Anuken
fab22a152c Fixed instant disconnect due to UDP flood, extremely jumpy interpolation 2018-05-05 12:48:50 -04:00
Anuken
3905da1a62 Added RDX entry 2018-05-05 10:16:26 -04:00
Gureumi
3dd1fc2efe
Update translate file to Mindustry 4.0 2018-05-04 13:13:12 +00:00
Anuken
c1066e94f2 Implemented drone sprite, basic AI 2018-05-03 22:54:21 -04:00
Anuken
3a3c23d2f1 Fixed discarded shells appearing in water 2018-05-03 15:19:00 -04:00
Anuken
2af750cfec Implemented shooting and states for ground units 2018-05-03 12:59:23 -04:00
Anuken
42b3b19a57 Fixed broken blocks not updating path 2018-05-02 17:26:20 -04:00
Anuken
496498b913 Implemented auto-updating pathfinder 2018-05-02 17:14:10 -04:00
Anuken
3fcdfbd01a Optimized floor rendering 2018-05-02 11:38:44 -04:00
Anuken
72fc673020 Fixed floor rendering 2018-05-02 00:19:38 -04:00
Anuken
c3967c79c9 Fixed some hitbox issues, preparing to remake floor rendering 2018-05-01 23:45:32 -04:00
Anuken
3dd07d2f4a Implemented fast dijkstra-map pathfinding 2018-05-01 21:34:30 -04:00
Anuken
036f233946 Improved rubble and VTOL accuracy 2018-05-01 19:07:13 -04:00
Anuken
9776884a91 Fixed controllers not aiming properly 2018-05-01 17:04:32 -04:00
Anuken
131f646024 Fixed broken resupply animations 2018-05-01 16:46:10 -04:00
Anuken
1bf728359d Fixed build errors 2018-05-01 16:02:42 -04:00
Anuken
8a83e0fc1a Fixed server compile errors, added resupply point block 2018-04-30 22:28:47 -04:00
Anuken
0be49002ba Added repair point block 2018-04-30 17:14:35 -04:00
Anuken
2b96c820fd Fixed rubble-related crash, improved vtol AI 2018-04-29 23:34:40 -04:00
Anuken
9641a388e2 Improved vtol effects, added state machines for behavior 2018-04-29 15:31:13 -04:00
Anuken
37fcd81e87 Improved VTOL animation, made power nodes circular 2018-04-29 10:46:14 -04:00
Anuken
b589d8a1df Added VTOL animation 2018-04-29 01:22:26 -04:00
Anuken
d0a44906fe API changes for getting traces and upgrades 2018-04-28 19:52:38 -04:00
Anuken
5b8ee48600 Merge fixes 2018-04-28 16:29:23 -04:00
Anuken
e5f6b7f66c Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-04-28 16:28:58 -04:00
Anuken
941ebd39bf Added new royalty-free music 2018-04-28 13:44:46 -04:00
Anuken
44965a42e4 Added new splash screens and icons for iOS 2018-04-28 12:42:06 -04:00
Anuken
cbbd5ffc62 Renamed 'android' usage to 'mobile' 2018-04-28 11:22:35 -04:00
Anuken
0db22f2cff Fixed place mode visual bug 2018-04-28 11:12:24 -04:00
Anuken
59fe8f444f Merge remote-tracking branch 'origin/master' 2018-04-27 23:43:32 -04:00
Anuken
8cc3a865e2 iOS fixes 2018-04-27 23:42:59 -04:00
Anuken
8a13482c38 Changed OGGs to MP3s, fixed desktop version being unable to start 2018-04-27 22:44:21 -04:00
Anuken
3ba57c3473 Minor cleanup with bars 2018-04-27 13:43:08 -04:00
Anuken
094aa5a326 Fixed lightning not rendering 2018-04-25 21:19:15 -04:00
Anuken
4b71b30418 Fixed compile error with new effects system, update uCore 2018-04-25 20:55:20 -04:00
Anuken
91c3cb93f0 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 
# Conflicts:
#	build.gradle
#	core/assets/bundles/bundle_es_LA.properties
#	core/assets/version.properties
 2018-04-25 20:45:39 -04:00
Anuken
8c369d9874 Removed version.properties 2018-04-25 20:44:22 -04:00
Anuken
b5008f4ad3 Added unit ammo support, multi-ammo inventories 2018-04-25 20:40:51 -04:00
Anuken
deefab8a5b Implemented ammo ressuplying 2018-04-24 21:38:57 -04:00
Anuken
ff6dc98bbe Added spanish bundle 2018-04-23 21:47:39 -04:00
Anuken
8581213126 Moved bullet FX to ammo type, beginning of weapon rework 2018-04-23 21:35:40 -04:00
Anuken
19d058a644 More base unit types added 2018-04-23 19:14:52 -04:00
Anuken
aa83510fbe Moved unit-related classes, added base flying types 2018-04-22 17:40:23 -04:00
Anuken
5aa995b5ef Version.properties update 2018-04-21 18:49:06 -04:00
Anuken
1a9d701d32 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 
# Conflicts:
#	core/assets-raw/sprites/blocks/chainturret-icon.png
#	core/assets-raw/sprites/blocks/chainturret.png
#	core/assets-raw/sprites/blocks/titancannon-icon.png
#	core/assets-raw/sprites/blocks/titancannon.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/version.properties
#	core/src/io/anuke/mindustry/entities/effect/TeslaOrb.java
#	core/src/io/anuke/mindustry/graphics/BlockRenderer.java
#	core/src/io/anuke/mindustry/input/InputHandler.java
#	core/src/io/anuke/mindustry/input/PlaceMode.java
 2018-04-21 18:47:43 -04:00
Anuken
9f4f107b6d Changed version build 2018-04-21 18:39:49 -04:00
Anuken
90716ebaad Added italian bundle 2018-04-21 18:32:56 -04:00
Anuken
496b4e77e8 Updated version 2018-04-21 18:28:38 -04:00
Anuken
6e9d833c77 Added infinite reach on sandbox 2018-04-21 18:08:34 -04:00
Anuken
48061d3cae Fixed flick scroll issues 2018-04-21 18:03:43 -04:00
Anuken
292ce33e0f Fixed placement preview PR 2018-04-21 15:54:21 -04:00
Anuken
365fc6af20
Merge pull request #117 from hellomouse/feature-blockpreview 
Added Placement Preview
 2018-04-21 15:41:03 -04:00
Anuken
97360b33f4 Added new chain/titan sprites 2018-04-21 15:18:12 -04:00
Anuken
5012313dc4 Implemented inefficient pathfinding 2018-04-21 14:26:05 -04:00
Anuken
95f10aeb06 Attempts to further optimize pathfinding 2018-04-21 11:55:32 -04:00
Anuken
8a965e56cd Fixed not being able to pan with invalid recipe selected 2018-04-21 11:02:54 -04:00
Anuken
fb14a83b9a More work on pathfinding 2018-04-21 01:09:06 -04:00
Commodore64x
8cef351ed9 Fixed preview for multiblocks. 2018-04-21 12:44:23 +10:00
Anuken
4261e6242c Implemented JPS badly 2018-04-20 19:55:41 -04:00
Anuken
ccd25c7e76 Implemented basic minimap 2018-04-19 21:57:55 -04:00
Anuken
7df232c65d Added block rubble, more liquid interaction 2018-04-19 19:06:52 -04:00
Anuken
d950396f68 Updated DrawLayer 2018-04-18 21:32:06 -04:00
Anuken
7d5f336e36 Final block rendering system revisions, for now 2018-04-18 21:31:33 -04:00
Anuken
b5cba3abfd New unbroken floor rendering system 2018-04-18 21:18:12 -04:00
Anuken
1d8630dd7d Improved conduit interaction / Various messups 2018-04-18 15:23:20 -04:00
Anuken
bfcce4f7ab Messed up rendering some more 2018-04-17 23:52:38 -04:00
Anuken
622f0d9355 Refactored BlockRenderer into two classes 2018-04-17 22:20:57 -04:00
Anuken
434256b0a5 Messed up many things 2018-04-17 20:04:57 -04:00
Anuken
e7a4ce2e19 Implemented entity pooling, effect saving, other fixes 2018-04-17 18:57:03 -04:00
Anuken
23dc62dbd2 Fixed map file names not being shown 2018-04-17 17:15:43 -04:00
Anuken
739e636a2c Added 'sleeping entity' optimization 2018-04-17 17:07:04 -04:00
Anuken
b020bf6816 Variable name refactorings / Untested entity sleeping 2018-04-17 09:31:41 -04:00
Anuken
47d61c4a0e Changed GridMap usage to IntMap 2018-04-17 09:06:55 -04:00
Anuken
714c5fd784 Added missing synchronized block 2018-04-17 08:59:01 -04:00
Anuken
7f2a0a77c7 Player saveWrite tweaks 2018-04-17 08:57:30 -04:00
Anuken
0bebe5008b Implemented leaky liquid explosions / New entity save system 2018-04-16 22:46:16 -04:00
Anuken
ee24eb8d1b Made saves load backup files if original save gets corrupted 2018-04-16 21:11:49 -04:00
Anuken
a4962c5225 Basic documentation for fire/puddles 2018-04-16 17:41:49 -04:00
Anuken
bece87c790 Implemented puddles of liquid 2018-04-16 17:32:35 -04:00
Anuken
e6f9ce888f Fixed autosave not updating meta 2018-04-15 23:12:26 -04:00
Anuken
871b6548ab Implemented player explosion intensity calculation / Fixed fire spread 2018-04-15 22:41:27 -04:00
Anuken
cb569be3b3 Improved fireballs and general block explosions 2018-04-15 20:06:38 -04:00
Commodore64x
0e50fbf3f2 Fixed rendering and other issues. 2018-04-16 09:08:44 +10:00
Anuken
3adc599278 Implemented fire 2018-04-15 17:12:09 -04:00
Anuken
68593acf89 Changed UUID generation slightly 2018-04-15 16:04:22 -04:00
Anuken
6007e511ba Implemented basic block explosion modeling 2018-04-15 15:49:50 -04:00
Anuken
01fc7108d8 Implemented conveyor item access 2018-04-15 13:05:18 -04:00
Commodore64x
494e415bd3 Fixed formatting? 2018-04-15 19:53:23 +10:00
Commodore64x
c17b34c70d Added Placement Preview 2018-04-15 19:40:22 +10:00
Anuken
02ab945ab8 Made junction ignore clogs 2018-04-14 21:57:10 -04:00
Anuken
97e5ac4c1e Implemented 'deep' unplaceable floor blocks 2018-04-14 21:51:46 -04:00
Anuken
458d4378f0 Removed liquid storage 2018-04-14 21:13:10 -04:00
Anuken
b715e0d34e Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-04-14 20:45:46 -04:00
Anuken
cce4113b2d Fixed flipped fin/fout usage 2018-04-14 20:44:40 -04:00
Anuken
89f06506c1 Fixed transfer exploit 2018-04-14 20:38:33 -04:00
Anuken
4b6b1b43cd Updated uCore 2018-04-14 13:49:42 -04:00
Anuken
913ee34c8d Implemented item dumping 2018-04-14 13:47:55 -04:00
Anuken
4e77f24a06 Implemented inventory capacity 2018-04-14 12:00:42 -04:00
Anuken
fcf62ada8f Changed inventory system to use real core inventory 2018-04-14 11:14:00 -04:00
Anuken
86b7966027 Implemented item dragging and transferring 2018-04-13 23:55:53 -04:00
Anuken
43c9bc51dc Implemented basic block inventories 2018-04-13 20:05:42 -04:00
Anuken
439d2c88ae Updated uCore 2018-04-12 17:34:24 -04:00
Anuken
37aced0ad3 Minor tweaks to fit new Effects position 2018-04-12 17:22:29 -04:00
Anuken
a3a1e6d3a9 Added liquid bridge conduits 2018-04-11 21:39:54 -04:00
Anuken
2c769cad0b Removed tunnels / Added item bridge 2018-04-11 21:14:12 -04:00
Anuken
b1ad8f917d Changed parameters of griefer command 2018-04-11 13:06:03 -04:00
Anuken
221f7be21b Added utility griefer scan command 2018-04-11 13:05:08 -04:00
Anuken
bed34c4cad Fixed typo in findip command / Tweaks to kicking criteria 2018-04-11 10:25:59 -04:00
Anuken
f8b0819fb3 Fixed stone formers 2018-04-11 10:24:01 -04:00
Anuken
25778a143c Added overflow gate block 2018-04-10 21:30:24 -04:00
Anuken
5b11875a5a Better conveyor physics / Performance test maps / Unit inventory begin 2018-04-09 20:25:08 -04:00
Anuken
6967093689 Added liquid bridge / Smoothed conduit liquid display 2018-04-09 18:31:06 -04:00
Anuken
0cafa152bf Added fix for overflow block IDs 2018-04-09 10:30:15 -04:00
Anuken
aa28c3a45b Added light item bridge 2018-04-08 21:46:48 -04:00
Anuken
815daccff1 Made server connection info slightly less verbose 2018-04-08 12:38:22 -04:00
Anuken
f61aa6068b Added additional server commands, fixed a crash 2018-04-08 12:33:13 -04:00
Anuken
21fe0f9246 Added incinerator 2018-04-08 12:23:39 -04:00
Anuken
6db1175c95 Implemented conveyor physics 2018-04-08 12:02:42 -04:00
Anuken
30ddd91a34 Merge fixes 2018-04-08 10:47:09 -04:00
Anuken
1789fadbf6 Merged with master 2018-04-08 10:46:48 -04:00