Commit Graph

502 Commits

Author SHA1 Message Date
Anuken
cccf4a7e38 Changed weapon to an upgrade 2018-01-05 21:04:12 -05:00
Anuken
5480a92cbb Fixed weapons not being reset on multiplayer connect 2018-01-05 19:58:57 -05:00
Anuken
4cdddd9408 Fixed bug with weapons not costing anything server-side 2018-01-05 19:42:38 -05:00
Anuken
1b9d42e2e4 Fixed bug with upgrade dialog not showing up 2018-01-05 19:33:55 -05:00
Anuken
355c0854f9 Made teleporters use power as well 2018-01-05 19:30:39 -05:00
Anuken
39fab0c842 Renamed Crafter block to better fit role 2018-01-05 19:12:06 -05:00
Anuken
cda1115e9d Implemented rework for both smelter and crucible 2018-01-05 19:11:36 -05:00
Anuken
07fad06558 Heuristic changes 2018-01-05 16:53:58 -05:00
Anuken
1f9a92cf32 Optimization, refactoring, documentation 2018-01-05 16:28:22 -05:00
Anuken
ba2cfc2820 Added benchmark 2018-01-05 13:17:13 -05:00
Anuken
60c11b84aa Renamed some dialogs, final uCore update 2018-01-05 12:51:22 -05:00
Anuken
32e1c6e3b8 Re-added host dialog, fixed join dialog UI error 2018-01-05 12:46:08 -05:00
Anuken
7fdd50d85c Fixed build errors 2018-01-05 11:39:41 -05:00
Anuken
d9c15a8599 Partial conversion done 2018-01-04 23:46:22 -05:00
Anuken
d6f3e2a31f Initial UI cleanup commit 2018-01-04 20:41:58 -05:00
Anuken
c435249c4f Renamed Table pad methods 2018-01-04 19:58:42 -05:00
Anuken
3004e627cc Fixed some Windows bugs 2018-01-04 15:38:00 -08: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
b486570c28 Made PlatformFunction an interface, changed permission requests 2018-01-04 14:08:52 -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
169b9cddc5 Improved Discord RPC, refactored Input and fixed net crash 2018-01-03 20:15:05 -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
c3238008fd Fixed RPC lag, refactored enemy types 2018-01-03 14:47:58 -05:00
Anuken
6034b5ec79 Implemented new enemy system (largely untested) 2018-01-03 13:53:50 -05:00
Anuken
e61163c5ae Implemented write perms requesting for each file session 2018-01-03 11:37:40 -05:00
Anuken
d68768e24a Fixed save file crash, implemented save ID mapping 2018-01-03 11:28:07 -05:00
Anuken
5809c43516 Fixed crashes for inputting IP and port 2018-01-02 23:22:34 -05:00
Anuken
086652a9dc Added names for multiplayer 2018-01-02 22:31:12 -05:00
Anuken
2c056cbdda Removed Renderer test code 2018-01-02 21:18:44 -05:00
Anuken
d12f78f6ce Implemented basic save backups 2018-01-02 21:05:44 -05:00
Anuken
3a46146055 Merge remote-tracking branch 'origin/master' 2018-01-02 20:45:56 -05:00
Anuken
c23743ee45 Various minor UI/Net changes 2018-01-02 20:45:13 -05:00
Krzysztof Skrzętnicki
eed70fe63c
formatting 2018-01-02 23:38:45 +01:00
Krzysztof Skrzętnicki
9897e200a8
Implement outbound queue limits.
Fixes infinite status bar issue. Lowered timer to 5 to make it drain more quickly - makes sense given the production is instant.
2018-01-02 23:19:27 +01:00
Anuken
2796ab9801 Added new save file format system, wall balancing 2018-01-02 15:47:08 -05:00
Krzysztof Skrzętnicki
d8eab0ffb4
huh 2018-01-02 18:20:17 +01:00
Krzysztof Skrzętnicki
2aeb2dc7e0
remove 'craft' variable, no longer needed 2018-01-02 18:16:57 +01:00
Krzysztof Skrzętnicki
417db7b60c
Implement queues for inbound resources
There are now input queues per resource (currently flat 20 per resource type) along with indicator of how full the queue is.
2018-01-02 18:14:38 +01:00
Anuken
7f8598f2bc Re-added sand, better teleporter/sorter UI 2018-01-02 12:14:14 -05:00
Jan Polák
4a706a8a29
Merge branch 'master' into feature_rich_presence 2018-01-02 17:26:28 +01:00
BeefEX
86802b98c2 Fix debug mode enabled 2018-01-02 17:21:46 +01:00
BeefEX
12fad819b5 Discord integration, basic rich presence 2018-01-02 17:21:03 +01:00
Anuken
8a38160124 Implemented LAN discovery 2018-01-01 22:13:20 -05:00
Anuken
24248df4af Started working on discovery, implemented GWT saving 2018-01-01 21:33:51 -05:00
Anuken
1b55d00254 Commented out extra items 2018-01-01 18:13:34 -05:00
Anuken
c8e41c08ea Fixed Kryo crash 2018-01-01 18:01:24 -05:00
Anuken
20eea3b385 Switched to different Kryonet fork; full Android support 2018-01-01 16:09:17 -05:00
Anuken
c7dbdd1773 Modularized Kryonet handler 2018-01-01 13:32:18 -05:00
Anuken
4bf78587db Fixed absolutely nothing 2017-12-31 22:29:11 -05:00
Anuken
f13dc0c49d Basic android support 2017-12-31 22:18:39 -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
eecd0f6d02 Implemented sending of players to client (incomplete) 2017-12-30 23:06:43 -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
6db329900e Fixed save delete causing a crash 2017-12-30 19:37:09 -05:00
Anuken
25488d00e6 Slowly descending into a branchy mess 2017-12-30 19:36:23 -05:00
Anuken
4a2b2dee72 Added NetClient/NetServer classes 2017-12-30 19:20:20 -05:00
Anuken
e7a88811c0 Fixed saves not being overwritten 2017-12-30 19:00:55 -05:00
Anuken
0c4397fd08 Set autosavedefault to 1.5 minutes 2017-12-30 18:57:22 -05:00
Anuken
ac581180b7 Merge remote-tracking branch 'origin/master' 2017-12-30 18:55:06 -05:00
Anuken
efd53b6180 Made game autosave when quitting 2017-12-30 18:54:25 -05:00
Anuken
79e18f7f4d Implemented basic client/server connection and title font 2017-12-30 18:40:02 -05:00
Krzysztof Skrzętnicki
d9d247f9f7
Omnidrill will report unproductive base surface
In contrast with one-resource drill, the omnidrill is not reporting it has been placed on unproductive base surface (i.e. water, grass, sand, lava etc.). This change fixes this issue.
2017-12-30 22:03:01 +01:00
Anuken
af64e4f021 Fixed enemies not considering conveyors as bridges 2017-12-30 13:40:21 -05:00
Anuken
c14e233723 Basic server hosting done 2017-12-30 13:39:37 -05:00
Anuken
e24179cd4c Added full Kryonet server/client implementation 2017-12-30 12:28:17 -05:00
Anuken
14093c8915 Added french bundle 2017-12-30 11:45:13 -05:00
Anuken
f6e9710b33 Added basic Kryonet support 2017-12-30 11:43:47 -05:00
Anuken
40e4722147 Updated uCore, removed debug save message 2017-12-30 10:51:56 -05:00
Anuken
d628600657 Added some new block types, fixed some save dialog issues 2017-12-30 10:51:56 -05:00
Anuken
54662ee83f Added some new resources 2017-12-29 19:59:58 -05:00
Anuken
e39f9c624d Changed strange list access for items and liquids 2017-12-29 19:35:34 -05:00
Anuken
43e728739a Merge remote-tracking branch 'origin/master' 2017-12-29 19:27:59 -05:00
Anuken
b2065b49d2
Merge pull request #35 from BeefEX/feature_fluid-rework 2017-12-29 19:27:48 -05:00
Anuken
019cc75fb9 Fixed autosave 2017-12-29 19:27:21 -05:00
BeefEX
71af8d8df6 Changed Item to class. This required way more modifications than Liquids. 2017-12-29 23:50:42 +01:00
BeefEX
8ed3b4dcf5 Changed Liquid to class, tried to keep it as similar to the enum as possible to avoid incompatibilities. 2017-12-29 23:30:36 +01:00
Anuken
b7c8ff4d5b Removed saves that weren't support to be there 2017-12-29 16:51:49 -05:00
Anuken
152dc515db Added autosave 2017-12-29 16:20:20 -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
13b1cead4d
Delete 0.mins 2017-12-26 18:00:23 -05:00
Anuken
a8a62984ca
Delete maps.json 2017-12-26 18:00:15 -05:00
Anuken
75144fc5df Added extra files 2017-12-26 17:58:59 -05:00
Anuken
42909abf53 Converted almost everything to an I18nBundle 2017-12-26 17:58:20 -05:00
Anuken
40bb499eeb Fixes to shader code, collapsible placement menu 2017-12-26 12:57:56 -05:00
Anuken
00d781dadd Add to TODO 2017-12-26 00:28:13 -05:00
Anuken
560ab4d379 Disabled controller support 2017-12-24 20:50:00 -05:00
Anuken
740b996c69 Final attempts at implementing Windows/GWT controller support 2017-12-24 20:07:27 -05:00
Anuken
c69779bf7e Fixed all GWT errors, released new version 2017-12-24 14:40:08 -05:00
Anuken
ea63451f49 Fixed GWT build errors and rotation axis bug 2017-12-24 11:55:08 -05:00
Anuken
003457ba72 Fixed android debugging 2017-12-23 20:16:35 -05:00
Anuken
2f90b74960 Added better controller support 2017-12-23 20:05:18 -05:00
Anuken
a83e06f9cd Added basic controller support 2017-12-23 17:57:51 -05:00
Anuken
60216b45f9 UI refactoring, new save dialog 2017-12-22 18:10:34 -05:00
Anuken
cbcdc96aaa Fix rendering bug 2017-12-22 00:25:48 -05:00
Anuken
09a7132a26 Change build upload formatting 2017-12-21 21:56:01 -05:00
Anuken
460c7163d9 uCore dependency setup 2017-12-21 20:59:40 -05:00
Anuken
295ddc42aa Add line tool and undo tools 2017-12-21 13:40:57 -05:00
Anuken
f418d52160 Add things 2017-12-20 23:02:28 -05:00
Anuken
7b8de91b8c Add vSync, fix multiple bugs 2017-12-20 22:06:36 -05:00
Anuken
ddb7c32491 Possible zip crash fix 2017-12-20 21:25:30 -05:00
Anuken
ac7deb77b6 Fix archive local storage bug 2017-12-20 20:56:59 -05:00
Anuken
a8b6ebacca Add Operation classes for undoing 2017-12-20 19:29:30 -05:00
Anuken
db79d59701 More rendering optimizations 2017-12-20 17:32:13 -05:00
Anuken
19ae53ae6a Add new more efficient block rendering system 2017-12-20 17:05:15 -05:00
Anuken
8cff097d1a Break rendering, fix level dialog bug 2017-12-20 13:49:35 -05:00
Anuken
2000a4b6f6 Fix pathfind crash for closed maps 2017-12-20 12:26:30 -05:00
Anuken
707d164678 Convert audio files to ogg 2017-12-20 11:39:21 -05:00
Anuken
5cb72ef36f Minor optimizations 2017-12-20 10:49:22 -05:00
Anuken
c6dd1c29ff Add drop shadow to icon 2017-12-20 00:46:01 -05:00
Anuken
096fae957b Change scaling 2017-12-20 00:07:59 -05:00
Anuken
e529cabfb1 Death to unit.dp 2017-12-19 20:51:46 -05:00
Anuken
9e298bde03 heck 2017-12-19 19:17:17 -05:00
Anuken
ed59e7c7cb Finish all editor features 2017-12-19 18:01:16 -05:00
Anuken
a6e72c93f0 Finish map editor core functionality 2017-12-19 00:05:41 -05:00
Anuken
7953a21073 Scale waves based on difficulty; improve map editor 2017-12-18 17:37:14 -05:00
Anuken
1ae875ebf4 Fix ridiculous tunnel loop crash 2017-12-18 00:11:47 -05:00
Anuken
1a8fdda421 Add basic map editor, change map system 2017-12-17 23:51:55 -05:00
Anuken
1b3d964b83 Fix invisible turret and broken RTG generators 2017-12-17 10:34:30 -05:00
Anuken
9f9f153125 Edit TODO, fix crashes 2017-12-16 23:27:02 -05:00
Anuken
f2027cd58c Change area-delete to work with rightclick on desktop 2017-12-16 19:35:50 -05:00
Anuken
ac17a2fcc4 Fix more bugs, add support for tablets 2017-12-16 18:30:55 -05:00
Anuken
7ecbd3afd0 Add Discord link and fix more placement bugs 2017-12-16 17:04:38 -05:00
Anuken
93f58bb458 Changes to break/place system 2017-12-16 10:47:06 -05:00
Anuken
97d1542ff4 Fix select bug, update TODO 2017-12-15 22:16:12 -05:00
Anuken
8fb001a693 Fixes for new placement system 2017-12-15 20:54:32 -05:00
Anuken
9c0d9f4e13 Finished new placement controls 2017-12-15 20:28:11 -05:00
Anuken
64439126a3 Major bugfix, new incomplete placemodes 2017-12-15 01:39:54 -05:00
Anuken
1acc47190c Fix another sorter crash 2017-12-14 11:38:06 -05:00
Anuken
8205745f9d Finish multiline placing 2017-12-14 02:17:45 -05:00
Anuken
a81f90d140 Implement slightly better multi-place 2017-12-14 01:17:10 -05:00
Anuken
949288393b Refactor input, fix color crash bugs, prototype multi-block placement 2017-12-13 23:28:20 -05:00
Anuken
a100ee0e91 Fix Android invisible enemy bug 2017-12-13 14:11:49 -05:00
Anuken
66b068f5e0 Fix multiple crashes, add shader fallback 2017-12-13 13:13:22 -05:00
Anuken
ece7ad0fd3 Fix more bugs 2017-12-13 01:42:15 -05:00
Anuken
5c1d7a146b Fix game-over bypass bug, de-blur icons 2017-12-13 00:38:56 -05:00
Anuken
940d4b3980 Fix slew of bugfixes based on google play reports 2017-12-13 00:09:44 -05:00
Anuken
1554d998bf Balanced maps, fixed donation dialog crash 2017-12-12 21:37:25 -05:00
Anuken
84c5938236 Fix major bug with dumping of blocks and conveyors 2017-12-12 15:43:02 -05:00
Anuken
de6ccbbc88 Re-implement E/R controls, add toggle UI button for debugging 2017-12-12 14:28:51 -05:00
Anuken
c7c7021699 Modify TODO, change 'about' text 2017-12-12 12:08:11 -05:00
Anuken
ecaca3df9c
Merge pull request #14 from Luxray5474/patch-4 2017-12-12 11:46:26 -05:00
Anuken
b5c57e5957 Implemented Google Play donations 2017-12-12 11:31:35 -05:00
Luxray5474
4d5bed78d4
Did TODO for 'advanced version' for NuclearReactor
Saw comment for that, thought 'why not?'
Also shortened first line of desc.
2017-12-12 11:08:43 -05:00
Anuken
60f23b34e6 Implement unfinished donation dialog 2017-12-12 01:38:24 -05:00
Anuken
825251fa0a Merge branch 'master' of https://github.com/Anuken/Mindustry.git 2017-12-11 23:49:18 -05:00
Anuken
b4852247d0 More enemy balancing 2017-12-11 23:48:37 -05:00
Luxray5474
7b00d1160e
Grammatical correction for remaining enemies label
Noticed that when the remaining enemy count comes down to 1, the word 'enemies' persists on the label, so i corrected that to show 'enemy' or 'enemies' instead, depending on the remaining enemy count.

~~also first dialogue JSON coming soon~~
2017-12-11 20:22:16 -05:00
Anuken
2d9710c708 Fix #10, tweak tunnel range, change tunnel sprite 2017-12-11 18:53:28 -05:00
Anuken
a5f3ddcb2b Changed tutorial to cover power blocks 2017-12-10 20:33:09 -05:00
Anuken
5ea8f0b8e2 Added new SFX, dashing, made generation FPS-independent 2017-12-10 17:01:14 -05:00
Anuken
347cae23e5 Various optimizations; made healer enemies explode after a while 2017-12-10 15:06:33 -05:00
Anuken
9f70290c69 Optimization; fixed #9 2017-12-10 00:46:34 -05:00
Anuken
8ae74932c0 Dumped plans into TODO.md, minor edits to README 2017-12-09 16:00:36 -05:00
Anuken
2c7402f809 Optimized conveyors and all timer blocks, edited laser FX 2017-12-09 13:36:41 -05:00
Anuken
e671153e6d Fixed #6, removed save folder from repository 2017-12-08 22:50:40 -05:00
Anuken
aa6308fffc Fixed building for HTML5 2017-12-08 20:59:40 -05:00
Anuken
404ec68570 Changed pathfinding algorithm slightly, added debugging for paths 2017-12-08 19:59:04 -05:00
Anuken
cffb673bae Changed rotation control scheme, fixed "transparent" boxes 2017-12-07 21:55:13 -05:00
Anuken
956e35b677 UI fixes; fixed conveyor infinite item pileup 2017-12-07 14:45:04 -05:00
Anuken
475efc38d2 Optmizied drawing of map 2017-12-07 14:23:43 -05:00
Anuken
d9ed5bfd98 Changed generator style 2017-12-06 23:01:03 -05:00
Anuken
c461c80122 Made AI smarter 2017-12-06 19:14:51 -05:00
Anuken
8e80af26d7 More bugfixes 2017-12-06 09:26:39 -05:00
Anuken
aafe7fb74a Many bugfixes and tweaks 2017-12-05 12:21:08 -05:00
Anuken
dbb6673752 Added tunnel conveyor, fixed generator bugs 2017-12-03 20:27:50 -05:00
Anuken
8481a3a5f3 Fixed tutorial, many balancing changes 2017-12-03 17:08:28 -05:00
Anuken
9dd2bfaeeb More difficulty tweaks, made sandbox work properly 2017-12-03 15:29:49 -05:00
Anuken
19a4dd41e3 Balanced all enemies, tweaked waves 2017-12-03 12:02:48 -05:00
Anuken
9cadb08024 More block descriptions, improved indicators 2017-12-02 14:59:28 -05:00
Anuken
597c5161e3 Added 2x2 door, fixed bugs with multiblocks and iteractables 2017-12-02 13:31:35 -05:00
Anuken
704ee097f3 Made doors save state properly 2017-12-02 12:52:14 -05:00
Anuken
6e111f1e80 Many bugfixes and tweaks, added doors 2017-12-02 12:46:02 -05:00
Anuken
01b431801d Increased number of save slots, UI colors tweaked 2017-12-02 00:29:44 -05:00
Anuken
8455d48693 Filled map list, added more blocks 2017-11-30 21:57:10 -05:00
Anuken
8abe4a9cee Added new blocks, maps, and a temporary editor 2017-11-30 19:11:54 -05:00
Anuken
ff993a353d Added new map 2017-11-29 23:20:15 -05:00
Anuken
6fb5cb839e Implemented nuclear reactor functionality and explosiveness 2017-11-28 14:34:53 -05:00
Anuken
63d8aed9a5 Implemented shield hit effects and bullet absorption and powered rturret 2017-11-28 01:00:59 -05:00
Anuken
c0d28eca65 Updated build.gradle, changed scroll dialog, UI tweaks 2017-11-27 22:23:47 -05:00
Anuken
0c6578c229 Implemented Fortress enemy spawning, added level save display 2017-11-26 23:20:43 -05:00
Anuken
cb9acb7a52 Fixed some loading bugs 2017-11-26 22:53:41 -05:00
Anuken
d9a66278ff Added sandbox mode and new fortress enemy 2017-11-26 22:40:43 -05:00
Anuken
07ac552495 Major refactoring; implemented multi-frame pathfinding 2017-11-26 18:59:03 -05:00
Anuken
25952985dd Groupified entities, improved performance 2017-11-24 21:14:01 -05:00
Anuken
56113cd1de Fixed bugs with router clogging and save loading 2017-11-23 23:05:19 -05:00
Anuken
f5583f6bc8 Fixed many pathfinding issues 2017-11-23 22:10:31 -05:00
Anuken
b2cd95899c Broken attempt at per-enemy pathfinding; balancing 2017-11-23 20:58:32 -05:00
Anuken
88e4154ea3 Implemented additional lava crafting blocks 2017-11-22 16:40:38 -05:00