mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-27 16:09:57 +07:00
Code Issues Packages Projects Releases Wiki Activity
1,406 Commits 4 Branches 160 Tags 2.3 GiB
98cfb4d5ed
Commit Graph

149 Commits

Author SHA1 Message Date
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