mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-02 12:23:47 +07:00
Code Issues Packages Projects Releases Wiki Activity
881 Commits 4 Branches 160 Tags 2.3 GiB
e5656896e7
Commit Graph

389 Commits

Author SHA1 Message Date
Anuken
41ee817d18 More server debugging changes. 2018-03-01 17:57:42 -05:00
Anuken
59e8a85c7e Added Edges class, broke tiles and saving 2018-02-28 23:16:35 -05:00
Anuken
7e20b493ea Fixed high-FPS slow water/no block sounds 2018-02-28 15:11:35 -05:00
Anuken
b67a4f3c14 Fixed dedicated server crashes 2018-02-27 20:30:55 -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
1195b6c541 Updated uCore 2018-02-27 19:36:25 -05:00
Anuken
f72fd01050 More bugfixes 2018-02-27 19:13:08 -05:00
Anuken
828dd78611 Fixed some GWT bugs and errors 2018-02-26 23:31:29 -05:00
Anuken
bbe3115186 Updated to 3.4 2018-02-26 22:13:36 -05:00
Anuken
17b17222b6 Fixed some admin bugs 2018-02-26 22:05:07 -05:00
Anuken
00c204b589 Made break mode get set to 'none' when collapsing 2018-02-26 19:10:15 -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
c90395ee2b Fixed placement teleporter crash, invalid packet handling 2018-02-26 10:06:36 -05:00
Anuken
7429d029f3 Added admins with in-game icons and permissions; untested 2018-02-25 23:44:35 -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
de340255fe Updated to build 28 2018-02-23 15:11:42 -05:00
Anuken
a6737c5a54 Added german language 2018-02-23 14:49:33 -05:00
Anuken
07aab732b7 Better tunnel debugging, improved keybind dialog controller info 2018-02-23 13:59:21 -05:00
Anuken
2518564f92 Added Vault block 2018-02-23 10:26:47 -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
7ee01f19fe Updated uCore 2018-02-21 19:50:27 -05:00
Anuken
04865350e1 Added LiquidTurret class 2018-02-21 19:23:36 -05:00
Anuken
621ec4ee0f A few minor bugfixes, updated version to 3.3 release 2018-02-21 15:07:49 -05:00
Anuken
26a472d31d Updated version 2018-02-21 14:43:51 -05:00
Anuken
f2a952fcfe Possible build upload script fix 2018-02-20 19:40:19 -05:00
Anuken
d52d9bec81 Added warning message for upgrading users of the game 2018-02-19 20:44:14 -05:00
Anuken
1397ed2d06 Possible junction clog fix 2018-02-19 20:13:45 -05:00
Anuken
2208198aa8 "Fixed" items quantities jumping around due to lag 2018-02-19 15:08:05 -05:00
Anuken
5cc092f58c Fixed some more synchronization bugs 2018-02-19 14:57:43 -05:00
Anuken
ffabdba119 Fixed incorrect discord presence updating 2018-02-19 14:45:18 -05:00
Anuken
edc124c90d Added better block debugging 2018-02-19 14:31:35 -05:00
Anuken
03079e9611 Updated uCore, recorder fix 2018-02-19 12:47:57 -05:00
Anuken
cba42d2f19 Fixed 32-bit version not working due to Discord integration 2018-02-19 11:31:43 -05:00
Anuken
6f55870a1f Updated version, teleporter tweaks 2018-02-18 12:49:59 -05:00
Anuken
fb97d00756 Fixed teleporter loop crash 2018-02-18 12:26:18 -05:00
Anuken
39db04872c Minor cleanup 2018-02-18 11:33:38 -05:00
Anuken
1c3bad0aca Fixed StackOverFlow exception thrown with certain block designs 2018-02-18 11:31:09 -05:00
Anuken
dbd84103cb Added variable to control block syncing 2018-02-17 23:39:31 -05:00
Anuken
a79dfe29ef Synchronized tile modification with updating 2018-02-17 16:04:09 -05:00
Anuken
30d0d7715a Version update 2018-02-17 14:21:32 -05:00
Anuken
05f7bc256b Made server send wave and map data on websocket ping 2018-02-17 13:21:22 -05:00
Anuken
26fc1c1fb0 Many crashes fixed, added server run script 2018-02-17 12:06:57 -05:00
Anuken
fe3eb356fa Partial teleporter item stacking fix. 2018-02-16 11:32:01 -05:00
Anuken
b70f5b82ee Changed teleporter validity system 2018-02-15 19:22:39 -05:00
Anuken
71ce6d0bec Version update, GWT error fix 2018-02-15 18:15:25 -05:00
Anuken
d117225877 Made server log stop command, partial teleporter fix 2018-02-15 17:00:59 -05:00
Anuken
008889966f Fixed incorrect mode selection, updated TODO 2018-02-14 17:50:44 -05:00
Anuken
c03619c5de Fixes to many multithreading crashes and freezes 2018-02-13 18:19:33 -05:00
Anuken
6b42525f8a Added tile background to background for large screens 2018-02-13 17:21:14 -05:00
Anuken
a8a402745f Reverted syncing 2018-02-12 18:48:23 -05:00
Anuken
4d54e5c0e1 Experimental sync changes 2018-02-12 18:10:14 -05:00
Anuken
86a4ff971c Updated Russian bundle 2018-02-12 16:11:46 -05:00
Anuken
76d298610f Fixed glitchy zoom at low FPS 2018-02-12 16:06:45 -05:00
Anuken
4e004d4973 Fixed healer enemies not healing on multiplayer, blast enemy explosions 2018-02-12 15:03:51 -05:00
Anuken
3f8e6e85bd Added delay after game-over to prevent SocketInUse error 2018-02-11 19:38:03 -05:00
Anuken
4311e57dd7 Fixed ghost enemies and jerky movement at low FPS values 2018-02-11 17:07:05 -05:00
Anuken
b0f26a0cf4 Updated discord link to point to #rules 2018-02-11 16:20:36 -05:00
Anuken
a248891a94 Large-scale bugfix: fixed #76, as well as many other timer bugs 2018-02-11 16:10:23 -05:00
Anuken
0b09ca0817 Improved shuffle command for dedicated server 2018-02-10 15:14:41 -05:00
Anuken
e5365d5572 Fixed some multithreading bugs and crashes 2018-02-10 12:38:02 -05:00
Anuken
2ff4a1ee0d Fixed editor crashing with multithreading on 2018-02-10 11:14:11 -05:00
Anuken
ff406027b0 Fixed uncloseable doors, uncolored teleporters 2018-02-09 22:23:10 -05:00
Anuken
3c3a440424 Removed extra build argument for travis 2018-02-09 14:53:42 -05:00
Anuken
58aaee30a0 Fixed zoom clamping too strictly 2018-02-09 14:49:53 -05:00
Anuken
859621d13d Possible build error fix 2018-02-09 10:14:29 -05:00
Anuken
850e1559bf More minor bugfixes and tweaks to junctions/tunnels 2018-02-09 10:08:23 -05:00
Anuken
30b4b78f9f Updated uCore, bugfixes, changed build script 2018-02-09 00:15:27 -05:00
Anuken
1f4a72d459 Added completely new build version system 2018-02-08 23:41:07 -05:00
Anuken
714a4895bf Minor UI fixes 2018-02-07 23:25:03 -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
93cd497c8d Multiple bugfixes, addition of Logic class 2018-01-27 11:26:26 -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
257335ebaf Updated uCore 2018-01-23 21:31:17 -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
f8514a0f3d Changed application icon 2018-01-20 23:01:54 -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
c5211121cd Implemented player list for android 2018-01-16 15:37:38 -05:00
Anuken
6ba1f117bd Improved russian glyphs, made menu buttons fallback 2018-01-16 15:17:21 -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
cc45e5afca Implemented new syncing system 2018-01-14 20:27:10 -05:00
Anuken
e545b7cca7 Fixed disconnect with many enemies and editor redo/undo bug 2018-01-14 11:37:23 -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
cda1115e9d Implemented rework for both smelter and crucible 2018-01-05 19:11:36 -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
4d44fc3855 Minor UI changes for pause button 2018-01-04 15:18:38 -05:00
Anuken
226ad16242 Added underscore to font 2018-01-04 14:36:41 -05:00
Anuken
325453cce0 Added support for cryllic letters 2018-01-04 13:52:43 -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
dc1700f0ff Chat implementation, currently buggy 2018-01-03 23:12:46 -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
6034b5ec79 Implemented new enemy system (largely untested) 2018-01-03 13:53:50 -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
7f8598f2bc Re-added sand, better teleporter/sorter UI 2018-01-02 12:14:14 -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
62ae6dc159 More multiplayer setup, possible android support 2017-12-31 22:06:18 -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
85ade1b346
Merge branch 'master' into multiplayer 2017-12-30 19:44:31 -05:00
Anuken
25488d00e6 Slowly descending into a branchy mess 2017-12-30 19:36:23 -05:00
Anuken
79e18f7f4d Implemented basic client/server connection and title font 2017-12-30 18:40:02 -05:00