mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-03 04:44:24 +07:00
Code Issues Packages Projects Releases Wiki Activity
15,608 Commits 4 Branches 160 Tags 2.3 GiB
a33c482ead
Commit Graph

3602 Commits

Author SHA1 Message Date
Anuken
4ca9a26bdd Added name validation 2018-06-13 11:38:12 -04:00
Anuken
9abbd8c158 Implemented slopes 2018-06-12 11:36:55 -04:00
Anuken
b609b5909b Implemented elevation in editor and mechanically in-game 2018-06-11 15:18:25 -04:00
Lorex
2e210e7adc Add Traditional Chinese support 2018-06-09 16:15:17 +08:00
Anuken
3fe7e4e8da mess cleanup 2018-06-02 00:47:22 -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
Gureumi
8f283b2226
Update bundle_ko.properties 
Early update language file!
may be?
 2018-05-31 20:53:38 +09: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
9693de8885 Added new screen for managing and viewing maps, many editor fixes 2018-05-23 21:40:59 -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
c920fa6740 Added all export/import menus, fixed bad icons for editor blocks 2018-05-22 23:56:29 -04: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
2d65c9734c Added IndexedRenderer rotation, map editor rotation 2018-05-21 23:00:40 -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
8d66d43a98 Some more sharing revisions 2018-05-19 20:19:47 -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
Prosta4okua
b2ea733b45
Update bundle_ru.properties 2018-05-19 21:49:29 +03: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
cf1148e7c8 iOS plist fixes, re-added music 2018-05-16 11:06:15 -07:00
Anuken
ca24e64c42 Implemented local multiplayer fully 2018-05-13 20:48:44 -07:00
Commodore64x
7f2c2d9d6b Added edit logging and whole world rollback 2018-05-12 18:34:44 +10:00
Gureumi
cbdf252fe6
fix missing tranlate lang and update about info 2018-05-09 20:33:53 +09:00
Prosta4okua
665f0ee03e
Update bundle_ru.properties 2018-05-06 09:45:17 +03:00
Prosta4okua
e422f64b8b
Update bundle_ru.properties 2018-05-06 09:42:43 +03:00
Prosta4okua
f9c48f5edf
Update bundle_ru.properties 2018-05-06 09:27:03 +03:00
Anuken
c931bbf107 Merged with master 2018-05-06 01:43:12 -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
Gureumi
3dd1fc2efe
Update translate file to Mindustry 4.0 2018-05-04 13:13:12 +00:00
Anuken
d0a44906fe API changes for getting traces and upgrades 2018-04-28 19:52:38 -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
cbbd5ffc62 Renamed 'android' usage to 'mobile' 2018-04-28 11:22:35 -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
ff6dc98bbe Added spanish bundle 2018-04-23 21:47:39 -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
90716ebaad Added italian bundle 2018-04-21 18:32:56 -04:00
Commodore64x
0e50fbf3f2 Fixed rendering and other issues. 2018-04-16 09:08:44 +10:00
Commodore64x
c17b34c70d Added Placement Preview 2018-04-15 19:40:22 +10:00
Anuken
1789fadbf6 Merged with master 2018-04-08 10:46:48 -04:00
Anuken
59530909d6 Added terrain exporting and importing 2018-03-25 00:44:25 -04:00
Anuken
8eb2a13efd Added host/join info text 2018-03-24 12:25:56 -04:00
Anuken
9e309c9592 Changed uranium to thorium, fixed faulty vault transfer issues 2018-03-24 00:53:26 -04:00
Anuken
4e9d1d348e Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-03-23 22:48:51 -04:00
Anuken
216b3969ed Minor admin bugfixes, made players wait 30 seconds after being kicked 2018-03-20 18:27:19 -04:00
Anuken
5323ef68ca Added ukranian lang, updated uCore, minor fixes 2018-03-19 20:46:40 -04:00
Anuken
4a7c722673 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-03-16 22:18:58 -04:00
Anuken
5846af9453 Finished new menu layout, added submenu for playing 2018-03-16 19:36:44 -04:00
Anuken
ac4369ce3b Main menu rework [currently incomplete] 2018-03-16 17:00:11 -04:00
Anuken
b9f565f5fc Minor cleanup of gamemode description PR 2018-03-16 00:39:39 -04:00
Cedric L'homme
4dff6d834a add an info button for descriptions of the game mode. 2018-03-15 21:18:06 +01:00
Anuken
b4ec2ccb90 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-03-15 12:57:03 -04:00
Anuken
ae89a004a6 Fixed port bug, possible random disconnect fix 2018-03-15 12:53:47 -04:00
Anuken
0b2a933faa Fixed startup crash, implemented basic player animations 2018-03-14 23:03:27 -04:00
Anuken
ea9b3cc7dd Fixed some minor bugs with teleporters an changelog 2018-03-13 13:40:57 -04:00
Anuken
c9342d60d7 Fixed invalid FR bundle format 2018-03-10 14:03:23 -05:00
Anuken
3fa9d5ed10 Updated FR bundle 2018-03-10 12:14:10 -05:00
Anuken
9c05ddbd7d Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/version.properties
 2018-03-09 20:58:21 -05:00
Anuken
8743a60d02 Added in-game changelogs 2018-03-09 17:11:01 -05:00
Anuken
3131e8c7e9 Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 2018-03-08 22:34:26 -05:00
Anuken
c611066791 Completely borked liquid/power/inventory system 2018-03-07 22:54:12 -05:00
Anuken
a8ce961268 Added server version display and compatibility checking 2018-03-06 23:18:34 -05:00
Anuken
686e526e8c Added UUID banning 2018-03-06 19:22:50 -05:00
Anuken
6de48b4535 Merge branches '4.0' and 'master' of https://github.com/Anuken/Mindustry into 4.0 
# Conflicts:
#	core/assets/version.properties
#	core/src/io/anuke/mindustry/core/NetClient.java
#	core/src/io/anuke/mindustry/world/Tile.java
 2018-03-03 18:06:57 -05:00
Anuken
94f6c1b902 More debugging changes 2018-03-02 15:01:49 -05:00
Anuken
d3ec50825e Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/version.properties
#	core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java
 2018-02-27 19:58:34 -05:00
Anuken
13e592a758 Cleanup 2018-02-26 18:42:06 -05:00
Anuken
32791b4baa Added player tracing tools, fixed some bugs 2018-02-26 17:20:05 -05:00
Anuken
9f5f6ae382 Security changes: placement verification, banning, unfinished admins 2018-02-25 22:32:12 -05:00
Anuken
9985a19e6a Better net error messages, bugfixes, new command handler 2018-02-23 21:42:05 -05:00
Anuken
a6737c5a54 Added german language 2018-02-23 14:49:33 -05:00
Anuken
81de9875d3 New resources, blocks, core no longer accepts fuel materials 2018-02-22 20:12:20 -05:00
Anuken
eae07c15a7 Added pulverizer, new temporary laser graphics, debug power blocks 2018-02-21 23:28:02 -05:00
Anuken
1fdffa8be5 Added splitter, power smelter, new sections 2018-02-21 22:29:15 -05:00
Anuken
d52d9bec81 Added warning message for upgrading users of the game 2018-02-19 20:44:14 -05:00
Anuken
dbd84103cb Added variable to control block syncing 2018-02-17 23:39:31 -05:00
Anuken
86a4ff971c Updated Russian bundle 2018-02-12 16:11:46 -05:00
Anuken
757f4f5a53 Reduced multithreaded conveyor corruption, improved interpolation 2018-02-07 21:06:26 -05:00
Anuken
460558bc87 Implemented toggling of multithreading 2018-02-07 14:47:39 -05:00
Anuken
1c9395ed43 Added 'block info' tool, fixed sorter corruptions 2018-02-03 21:49:43 -05:00
Gab_351
a1df98dafc
Update bundle_fr_FR.properties 2018-02-03 12:45:58 +01:00
Anuken
da5e58f40b Updated russian bundle 2018-02-02 16:27:47 -05:00
Anuken
83ce2329f4 Made save difficulty display in dialog 2018-02-01 18:42:10 -05:00
Anuken
c62af31401 Bugfixes 2018-02-01 09:24:46 -05:00
Anuken
f396190fcf Added polish lang, fixed conveyor stacking bug 2018-01-31 10:20:52 -05:00
Anuken
fe458d03bd Added russian bundle 2018-01-31 09:42:39 -05:00
Anuken
0c4f3dc612 Fixed bugs with player list, rturret description and deserialization 2018-01-30 22:11:54 -05:00
Anuken
aaa9f85206 Added fullscreen, player outlines, better weapon display 2018-01-29 15:24:10 -05:00
Anuken
3562a70669 Fixed many network-related bugs 2018-01-28 17:09:21 -05:00
Anuken
205c4e723a More commands added to server, new logging 2018-01-28 14:18:21 -05:00
Anuken
c0a9cfc6b2 Fixed zoom/web save export/liquid crafter/menu button scale bugs 2018-01-26 14:01:16 -05:00
Anuken
6abbc3eca7 Implemented map run-length encoding, updated KO lang 2018-01-26 00:08:12 -05:00
Anuken
43ea984772 (removed extra string) 2018-01-24 19:12:10 -05:00
Anuken
8b2f63ecb6 Web compilation fix, new logging, cleanup 2018-01-24 18:48:59 -05:00
Anuken
b1c85da528 Added Indonesian language, fixed bug with saves disappearing 2018-01-22 12:46:00 -05:00
Anuken
40f7bf51c2 Added version check, fixed chat being open in singleplayer 2018-01-21 10:38:34 -05:00
Anuken
f14ec2e87a Fixed save crash, nerfed junction speed 2018-01-20 10:35:53 -05:00
Anuken
e9c606bc75 Added korean font 2018-01-18 22:33:20 -05:00
Anuken
3b8b3dc345 Added language select menu 2018-01-18 22:13:45 -05:00
Anuken
345537cdd9 New tutorial section on tunnels, fixed tutorial bugs 2018-01-18 19:41:41 -05:00
Anuken
06f9d7b36e Moved difficulty to level select 2018-01-17 21:59:32 -05:00
Anuken
6aefc22ac9 Stability improvements, minor fixes. Ready to merge. 2018-01-17 19:13:42 -05:00
Anuken
b266516fad Implemented new custom serialization 2018-01-16 23:30:24 -05:00
Anuken
6211afb904 Minor bugfixes, ready for next release 2018-01-16 15:52:26 -05:00
Anuken
1e63236cc4 Made friendly fire an option 2018-01-16 15:00:46 -05:00
Anuken
c9a8d10898 Fixes to tutorial and typos 2018-01-15 18:43:19 -05:00
Anuken
f4635b2882 Added server browser 2018-01-13 13:41:11 -05:00
Anuken
7c014de2c5 Improved LAN discovery-- fixed #55 2018-01-13 11:10:49 -05:00
Anuken
5e2173fc54 Fixed crash when connnecting, improved error messages 2018-01-12 20:03:52 -05:00
Anuken
804758b179 Many bugfixes for multiplayer, QoL, balancing, new difficulties 2018-01-11 13:46:32 -05:00
Anuken
d6bc6bf88c Fixed some crashes, changed some colors 2018-01-10 21:34:01 -05:00
Anuken
8d82639afc Implemented saving of weapons after disconnect 2018-01-10 18:46:00 -05:00
Anuken
0b71dcecc0 Prepared for 3.3 beta release 2018-01-09 23:10:41 -05:00
Anuken
974f0c8689 Made server closing display a loading message 2018-01-09 20:16:17 -05:00
Anuken
09333b60d4 Fixed some android memory errors and weapon factory bugs 2018-01-09 20:11:56 -05:00
Anuken
9c48ab1128 Implemented desktop-specific recipes, removed Configurable 2018-01-09 17:47:34 -05:00
Anuken
8e676494e3 Changes to save importing, player sync fix, autosave on death fix 2018-01-09 13:19:36 -05:00
Anuken
adba601256 New weapon factory sprites, ready to merge 2018-01-08 17:29:07 -05:00
Anuken
eba6c9bb8e Added new recipes, fixed some bugs, changed names 2018-01-08 16:38:03 -05:00
Anuken
0e82a4491f Implemented many new weapons (still broken) 2018-01-08 16:14:32 -05:00
Anuken
c5d13d26ea Fixed bundle settings, edited basic guns, removed weapon display 2018-01-08 11:39:18 -05:00
Anuken
07bc8a04f6 Implemented dual wielding 2018-01-06 11:43:41 -05:00
Anuken
a4cc149aab Added weapon factory block, refactored recipes 2018-01-05 23:38:59 -05:00
Anuken
32e1c6e3b8 Re-added host dialog, fixed join dialog UI error 2018-01-05 12:46:08 -05:00
Anuken
d9c15a8599 Partial conversion done 2018-01-04 23:46:22 -05:00
Anuken
2939c30d8d Rebalancing of drills to slow down progression 2018-01-04 12:12:31 -05:00
Anuken
9e7eaaaf41 Improved player list 2018-01-04 11:50:51 -05:00
Anuken
0063e32f6f Implemented LAN refreshing and kick reasons 2018-01-03 16:50:13 -05:00
Anuken
d22c682e5b Implemented player menu with kick option (untested) 2018-01-03 16:23:18 -05:00
Anuken
086652a9dc Added names for multiplayer 2018-01-02 22:31:12 -05:00
Anuken
c23743ee45 Various minor UI/Net changes 2018-01-02 20:45:13 -05:00
Anuken
8a38160124 Implemented LAN discovery 2018-01-01 22:13:20 -05:00
Anuken
20eea3b385 Switched to different Kryonet fork; full Android support 2018-01-01 16:09:17 -05:00
Anuken
701c7f6e78 Implemented full multiplayer; block syncing still unfinished 2017-12-31 19:56:40 -05:00
Anuken
36e357819b Basic multiplayer placing/breaking/movement (broken) 2017-12-31 14:23:13 -05:00
Anuken
7b1c8d5769 Implemented server sending world data to client 2017-12-30 22:02:23 -05:00
Anuken
25488d00e6 Slowly descending into a branchy mess 2017-12-30 19:36:23 -05:00
Anuken
14093c8915 Added french bundle 2017-12-30 11:45:13 -05:00
Anuken
d628600657 Added some new block types, fixed some save dialog issues 2017-12-30 10:51:56 -05:00
Anuken
019cc75fb9 Fixed autosave 2017-12-29 19:27:21 -05:00
Anuken
036a246769 Finished most of new save system, added new localized strings 2017-12-29 15:54:59 -05:00
Anuken
6774ea67ce Added Mac and Windows32 support, better placing, bundle crashfixes 2017-12-28 15:26:11 -05:00
Anuken
b25c611c33 More character support, made menus collapsible 2017-12-27 23:05:10 -05:00
Anuken
c693674ac6 Fixed bundle bug, updated uCore 2017-12-26 22:36:19 -05:00
Anuken
bbda002a5b Transcribed all ingame text to a bundle 2017-12-26 22:13:33 -05:00
Anuken
75144fc5df Added extra files 2017-12-26 17:58:59 -05:00