Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2024-10-27 20:34:29 +00:00
Code Issues Projects Releases Wiki Activity
2,103 Commits 6 Branches 26 Tags 670 MiB
f534a88f80
Commit Graph

977 Commits

Author SHA1 Message Date
tobspr
5a96e76151 Allow configuring map resources scale 2020-10-08 09:13:53 +02:00
EmeraldBlock
a79500d574
Fix non-uniform distribution for freeplay shape color palette (#789) 
* use nextIntRange instead of nextIntRangeInclusive

* Remove nextIntRangeInclusive

This function gave the minimum and maximum integer half as much weight, and it was not used anywhere except to generate a freeplay shape color palette, and that now uses nextIntRange.
 2020-10-08 08:44:10 +02:00
tobspr
21c9c3cee6 Fix belt path epsilon 2020-10-07 19:31:11 +02:00
tobspr
38ba763897 Allow disabling zoom towards cursor 2020-10-07 19:12:49 +02:00
tobspr
bc5ffcddd1 Change rotator, improve artwork 2020-10-07 19:02:42 +02:00
tobspr
1bb8b6f079 Get rid of performance warning, refactor roman numbers, mark balancers, rebalance upgrades 2020-10-07 18:35:03 +02:00
tobspr
f3dcdeb2b8 Fix pinned shapes not being removable 2020-10-07 18:05:11 +02:00
tobspr
7dccc1a844 Unlock all levels when having a legacy savegame 2020-10-07 15:02:27 +02:00
tobspr
fa27d1681f Cleanup IS_DEMO flags and introduce Restriction Manager 2020-10-07 09:48:31 +02:00
tobspr
81e7d96dd8 Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-10-07 08:36:26 +02:00
tobspr
9844641d11 Missing parts from last commit 2020-10-07 08:36:24 +02:00
tobspr
94266173d8 Introduce game modes and get rid of global level definitions etc 2020-10-07 08:36:02 +02:00
EmeraldBlock
00cce9479a
Set atlas scale for screenshot to constant value (#776) 2020-10-06 17:27:47 +02:00
EmeraldBlock
0481c84e72
"Fix" getStringForKeyCode returning incorrect strings (#753) 
* Fix getStringForKeyCode returning wrong result

This adds the full stop/period (.) key to the switch statement, and replaces String.fromCharCode (which works with Unicode) with the replacement character (�).

* Make letter keys work properly

* Add digits and display unknown codes in brackets

* better formatting
 2020-10-04 10:34:40 +02:00
dengr1065
a02438a70a
LibGDX Texture Packing (finally!) (#755) 
* Format tsconfig, remove atlas files

* Add helpers for texture packing

* Rest of the texture packing...

* Update gitignores

* Update readme
 2020-10-04 09:21:37 +02:00
tobspr
83c4552f9c DE translation fixes 2020-10-01 09:25:29 +02:00
tobspr
abaf9890b8 Don't cache pattern 2020-09-29 19:30:03 +02:00
tobspr
f62eaa45c0 Hide 1.1.19 changelog 2020-09-29 19:26:56 +02:00
tobspr
1c97f3f32a Fix demo flags 2020-09-29 18:42:29 +02:00
tobspr
1c88b99de3 A/B test whether showing the price is good or not 2020-09-29 18:26:38 +02:00
tobspr
8b7c0a91cd Change watermark interval 2020-09-29 18:06:39 +02:00
tobspr
344f213566 Minor refactoring 2020-09-29 18:03:53 +02:00
dengr1065
9aff7f9f6d
Rename delta to scale in camera.js (#705) 2020-09-29 17:44:22 +02:00
tobspr
69a3ae39bd proper sandbox flags 2020-09-29 17:06:31 +02:00
EmeraldBlock
7f6c1187b8
Make zoom in and zoom out equal (#704) 
* Make zoom in and zoom out equal

Makes zooming out zoom an amount equal to zooming in.

* format things better

* Made zoom keys also equal

Made zoom out equal to zoom in

* Actually made arrow keys equal

hope this actually works
 2020-09-29 16:48:41 +02:00
tobspr
5a3807883e Update demo hint and lock demo to lvl 14 2020-09-29 16:46:29 +02:00
tobspr
9b7225bf44 Limit throughput 2020-09-29 13:16:37 +02:00
tobspr
e96821b555 Fix throughput goals and add layer preview to producer 2020-09-29 12:58:16 +02:00
tobspr
8ec2a90ae3 Do not send stats in sandbox 2020-09-29 11:19:16 +02:00
tobspr
e93b475f72 Rebalance, again 2020-09-29 11:14:27 +02:00
tobspr
db6db7caca Add sandbox building, restructure levels, show pinned shapes in constant signal dialog 2020-09-29 10:52:25 +02:00
tobspr
fd3bbcdc20 Enable beta overlay again 2020-09-28 18:24:18 +02:00
tobspr
25135056f7 update beta overlay 2020-09-28 18:20:57 +02:00
tobspr
07ac928717 Show warning when placing too many buildings 2020-09-28 15:01:28 +02:00
tobspr
9c75e1777d Show secondary toolbar on wires layer too 2020-09-28 14:50:55 +02:00
tobspr
31641bedad Skip fade on low fps 2020-09-28 14:47:23 +02:00
tobspr
d5f7a78386 Allow copying wire values 2020-09-28 14:45:53 +02:00
tobspr
028b4ee8e4 Fix pipette in wires layer 2020-09-28 13:19:13 +02:00
tobspr
d11642e402 Update beta overlay 2020-09-28 13:17:21 +02:00
LeopoldTal
c9d260f65e
Fix lint (#688) 
* trim trailing space in Greek translation

* add missing type imports

* remove unused arg

* remove duplicate declaration
 2020-09-28 12:42:15 +02:00
tobspr
2c50944732 Minor changes 2020-09-28 12:37:15 +02:00
tobspr
f841a05f52 Migrate levels 2020-09-28 12:35:43 +02:00
tobspr
507121b886 Load css async 2020-09-28 12:24:52 +02:00
tobspr
0d52793c27 Minor refactoring 2020-09-28 12:17:38 +02:00
tobspr
d4617edad5 Rework constant signal dialog 2020-09-28 12:17:13 +02:00
tobspr
4f6d9785c1 Add final shapes and upgrades until tier 20 2020-09-28 10:54:21 +02:00
tobspr
d27e9226be Re-balance, fixes, etc etc 2020-09-27 22:22:05 +02:00
tobspr
f584d9d93e Further fixes found during testing, update local config 2020-09-24 17:43:50 +02:00
tobspr
7cd1ee22fd Further fixes 2020-09-24 17:14:15 +02:00
tobspr
a4b46f8527 Further adjustments 2020-09-24 16:37:44 +02:00
tobspr
d4dd30857e Further pre-release adjustments 2020-09-24 16:12:05 +02:00
tobspr
1ecc2ebb5d Minor adjustments and fixes 2020-09-24 14:59:15 +02:00
tobspr
c54ec9fd2a Restructure buildings 2020-09-24 12:53:40 +02:00
tobspr
fd77ba135a Fix markers and translation 2020-09-23 16:24:10 +02:00
tobspr
e040a47195 Update regular layer building descriptions, update artwork 2020-09-23 15:20:12 +02:00
tobspr
1f12e755a9 Load css resources async, improve building descriptions 2020-09-23 11:14:35 +02:00
tobspr
9881bd6799 Update toolbar 2020-09-23 09:24:25 +02:00
tobspr
f8371a96cf Make the storage its own building, add sanity checks 2020-09-23 08:59:39 +02:00
tobspr
05847add71 Re-balance 2020-09-22 20:21:09 +02:00
tobspr
091ffd1031 Make chained miner default and the only option after unlocking it 2020-09-22 19:31:40 +02:00
tobspr
c6eb1dad04 Rebalance the whole game, rename splitter -> balancer 2020-09-22 14:47:59 +02:00
tobspr
b0058cb59b Adjust item size 2020-09-22 11:21:45 +02:00
tobspr
1ec8b4fe28 Only render shapes in map overview 2020-09-22 11:21:18 +02:00
tobspr
607fd15a18 Improve overlay transition on low performance setups 2020-09-22 10:54:51 +02:00
tobspr
fae67bb7b2 Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-09-22 10:50:38 +02:00
tobspr
5f2cf4e589 Improve color rendering performance 2020-09-22 10:50:36 +02:00
przemko07
ea3cad0e37
Use same scale for Atlas as zoomLvl (#680) 
Scale 1 is never gonnna be saved as screenshot. for most image exports 0.5 is used. chunkScale is determining that.
 2020-09-22 10:32:13 +02:00
tobspr
0274597a1c Fix tslint 2020-09-22 10:31:47 +02:00
tobspr
afa08b06dc Vastly improve underground belt performance 2020-09-22 10:29:04 +02:00
tobspr
9075841768 Migrate old savegames 2020-09-22 09:32:31 +02:00
tobspr
0ca623f24e Fix reader throughput 2020-09-21 18:32:26 +02:00
tobspr
ad3be750fc Fix mouse pan 2020-09-21 18:17:55 +02:00
Exund
cceffc1832
Fix camera pan (#673) 
* Fix some literal edge cases

* Fixed for fullscreen
 2020-09-21 18:16:36 +02:00
Exund
b32ae43464
Fix 180° rotater not renamed everywhere (#675) 
* Fixed atlas and buildingSpeed

* Revert atlas.json changes
 2020-09-21 18:15:30 +02:00
tobspr
4636080dd7 Huge performance improvements 2020-09-21 18:09:27 +02:00
tobspr
2ac570f6d8 Fix belt paths not rendering 2020-09-21 18:07:47 +02:00
Exund
c4f2379010
Refactor entity cloning (#671) 2020-09-19 21:41:48 +02:00
tobspr
1f3991301d Fix miner highlight 2020-09-19 21:40:42 +02:00
tobspr
54f1c1dc93 Update changelog 2020-09-19 21:05:03 +02:00
tobspr
7def60c050 Fix belt planner placing down once a dialog pops up 2020-09-19 21:04:41 +02:00
tobspr
749383a318 Update changelog 2020-09-19 20:59:56 +02:00
tobspr
24eb060000 Fix mouse panning 2020-09-19 20:57:20 +02:00
tobspr
ed32238412 Allow toggling units in the statistics dialog 2020-09-19 20:51:47 +02:00
tobspr
fbff0a0ad4 Allow to pan the map with the mouse by moving the cursor to the edges of the screen 2020-09-19 20:30:35 +02:00
tobspr
26cd38b68c Refactor filters to make them not stall if one output is blocked 2020-09-19 19:30:04 +02:00
tobspr
fe97d28674 Minor adjustments 2020-09-19 18:57:14 +02:00
tobspr
d0aa6db630 Trim savegame names 2020-09-19 18:32:39 +02:00
tobspr
1cd52f6dbd Fix tslint 2020-09-19 17:56:40 +02:00
tobspr
5ab3afdd30 Move item processing into separate methods 2020-09-19 17:55:36 +02:00
tobspr
3e93681ce6 Add virtual stacker and painter, fix css 2020-09-19 15:33:24 +02:00
tobspr
8fa348ef30 Minor fixes 2020-09-19 15:14:10 +02:00
tobspr
6b7cfb48b3 Further ui improvements, fix simple belts with wires 2020-09-19 14:48:48 +02:00
tobspr
7d6af359a1 Polishing, CSS Improvements, Improve dark mode 2020-09-19 14:27:25 +02:00
tobspr
2075f4d011 Improve simplified belt, show hints everywheer 2020-09-19 12:21:32 +02:00
tobspr
ed206363f2 Fix crash in potato mode 2020-09-19 10:45:55 +02:00
tobspr
47443058e0 Add potato mode 2020-09-19 10:34:46 +02:00
tobspr
7bc45d8959 Improve buffer backlog performance, should speed up whole game 2020-09-19 09:28:29 +02:00
tobspr
5bdf6386a1 Improve mass deletion performance 2020-09-19 08:51:28 +02:00
tobspr
b7c773a70e Improve entity debugger 2020-09-19 08:15:40 +02:00
dengr1065
7650931f1f
New Entity Debugger (i hope so) (#665) 2020-09-19 07:57:29 +02:00
tobspr
b5a2e77db4 Fix multiple typos, closes #627 2020-09-19 07:49:17 +02:00
tobspr
1ebfafd8de Further performance improvements, show indicator while game is saving 2020-09-18 20:41:40 +02:00
tobspr
bba29b8a8b Improve (rendering-) performance in DEV mode 2020-09-18 19:51:15 +02:00
tobspr
0238de1260 Minor performance improvements, improve underground belt performance 2020-09-18 19:21:12 +02:00
tobspr
746f4935ad Improve item ejector system 2020-09-18 18:32:53 +02:00
tobspr
c0c624135b Fix belt underlays 2020-09-18 18:20:18 +02:00
tobspr
b8f27aec44 Proper belt underlays for splitters 2020-09-18 18:18:38 +02:00
tobspr
16902bed8d Rename belt_base -> belt, minor refactorings 2020-09-18 12:55:46 +02:00
tobspr
0377c6d58f Highlight connected miners, improve miner performance 2020-09-13 18:39:06 +02:00
tobspr
3529a5d77f Fix tslint 2020-09-13 11:19:16 +02:00
tobspr
10507b735a Update settings version and changelog 2020-09-13 09:22:17 +02:00
Exund
3741934b39
Add a setting to disable picking the miner when on a resource patch (#649) 
* Add a setting to disable picking the miner when on a  resource patch

* Fix that one space :D

Linter go brrrr

Co-authored-by: dengr1065 <dengr1065@gmail.com>
 2020-09-13 09:19:53 +02:00
tobspr
0e1e595531 Update changelog 2020-09-13 09:13:15 +02:00
tobspr
2740674053 Update changelog 2020-09-13 09:05:13 +02:00
tobspr
a24e7b8d33 Properly hide some hud elements when hovering 2020-09-13 09:05:05 +02:00
tobspr
6042fcba62 Properly implement sound and music volumes, debounce writes 2020-09-13 08:40:56 +02:00
Yoshie2000
50e40888fd
Music & Sound volume sliders in the settings menu (#611) 
* Added music & sound volume sliders in the settings menu

* Changed the order of the sound options in the settings menu

* Fixed the formatting, removed extra semicolon

* Removed a bad character

* Update base-en.yaml

* Updated base-en.yaml

* Removed trailing spaces

* Type safety fixes

* Replaced logical XOR (^) with !==
 2020-08-31 15:46:21 +02:00
tobspr
05cedc965a Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-08-31 12:00:08 +02:00
tobspr
04b8b62045 Update local config 2020-08-31 12:00:06 +02:00
Ryan Liptak
bdb08f67d8
Show that chainable miners can connect to eachother during placement (#613) 
Removes the red X when placing a chainable miner feeding into another chainable miner, and instead shows it as a green arrow.
 2020-08-31 11:57:51 +02:00
tobspr
244cede010 Make logic gates output empty if there is a conflict 2020-08-30 16:12:01 +02:00
tobspr
f667329572 Fix savegame serialization 2020-08-30 15:56:30 +02:00
tobspr
b248c4d1f5 Show 2 digits in item processor 2020-08-30 15:44:19 +02:00
tobspr
3e0f42e47c Make belt readers store their last read item 2020-08-30 15:35:47 +02:00
tobspr
9b8745535b Refactor item processor to use charges and thus be more correct, even at low tick rates 2020-08-30 15:31:53 +02:00
tobspr
091401e52b Store wires state on save 2020-08-29 23:38:49 +02:00
tobspr
b478f4be63 Store lever state 2020-08-29 23:20:03 +02:00
tobspr
5ec50678b0 Fix typo 2020-08-29 23:06:14 +02:00
tobspr
270f51d9ec Increase tier 2 tunnel range to 9 2020-08-29 23:05:34 +02:00
tobspr
bca379ee89 Add setting to show chunk borders 2020-08-29 22:52:52 +02:00
tobspr
49ea6fc381 Fix typo and typings 2020-08-29 22:37:44 +02:00
tobspr
78fe34840a Fix buildings not working at their advertised speed, closes #440, closes #442, closes #437, closes #449 2020-08-29 22:35:30 +02:00
tobspr
12892dcf54 Improve visibility of color items 2020-08-29 21:45:32 +02:00
tobspr
cf0f02826b Make comparer compare shapes, colors and booleans 2020-08-29 21:40:57 +02:00
tobspr
238b08d4d1 Make shapes truthy 2020-08-29 11:08:30 +02:00
tobspr
b210db2361 Revert item filter behaviour 2020-08-29 10:45:38 +02:00
tobspr
06e276f021 Add belt reader building 2020-08-29 10:38:23 +02:00
tobspr
bb739c80fa Rework quad painter and filter, rework logic gates 2020-08-29 09:35:14 +02:00
dengr1065
5487ec9818
"Logic pain fix" - Fixing quad painter pain... (#607) 
* (wip) 4-painter accept pins

* fix everything

* finish 4-painer fix

* refactor processing requirement
 2020-08-29 07:56:47 +02:00
tobspr
ec830ed5bc minor refactoring 2020-08-28 23:12:12 +02:00
tobspr
7a4fcb5c99 Prevent rendering selection outline twice 2020-08-28 23:11:56 +02:00
tobspr
707323591b Fix crash on constant signal dialog 2020-08-28 23:10:07 +02:00
tobspr
807deaa705 Fix wires not showing placement indicator properly 2020-08-28 23:06:10 +02:00
tobspr
a67448fbdf Fix being able to create constant signals without value 2020-08-28 22:56:56 +02:00
tobspr
7cbe5bb8e7 Reverse order of shapes in shape info 2020-08-28 22:48:47 +02:00
tobspr
5336467838 statistics are now shown in shapes / second instead of shapes / minute 2020-08-28 22:41:13 +02:00
tobspr
5076c03dab Fixed rotated levers not being rendered correctly 2020-08-28 22:25:31 +02:00
tobspr
e04fcceecc Fix icons in dark mode, fix long savegame names 2020-08-28 22:22:29 +02:00
tobspr
728f4ae253 Allow naming savegames 2020-08-28 22:15:12 +02:00
tobspr
a095cd6324 Allow rotating levers 2020-08-28 21:57:29 +02:00
TrapperHell
3f497c5b47
- Minor adjustments in English translation of game and adjust casing of product names (#593) 
- Fix comment typo
 2020-08-28 21:37:15 +02:00
tobspr
5459e6470b Add 1x1 compact splitters 2020-08-28 21:28:29 +02:00
tobspr
b6328cd9a0 Update changelog 2020-08-28 21:18:18 +02:00
tobspr
8ba6517591 Mark pinned shapes in statistics dialog 2020-08-28 21:17:07 +02:00
tobspr
e6b5f8d2ed Added setting to be able to delete buildings while placing, closes #45 2020-08-28 21:05:20 +02:00
tobspr
bfe2795677 Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-08-28 20:56:04 +02:00
tobspr
cda31732b1 Fix rendering bug 2020-08-28 20:56:02 +02:00
Ryan Liptak
4bcef8e725
Add button to toggle sortedness of the statistics screen (#590) 2020-08-24 20:51:29 +02:00
tobspr
93f9d7ae23 Fix cutter 2020-08-18 20:12:18 +02:00
tobspr
1a6c91f4e9 Fix crash 2020-08-18 20:07:44 +02:00
tobspr
296b76bf11 Add virtual shape processing buildings 2020-08-18 20:02:39 +02:00
Bjorn Stromberg
1ff76e0b2e
[core/rectangle] Remove unused methods (#571) 
* [core/rectangle] Remove unused methods

* Restore some methods
 2020-08-18 14:19:25 +02:00
tobspr
1dfb5f7476 Give more blueprint shapes in sandbox controller, create wire network even if it consists of tunnels only 2020-08-15 23:19:55 +02:00
tobspr
d4cbb5b124 Fix belt underlays not rendering 2020-08-15 22:52:16 +02:00
tobspr
b7efda9bf6 Further performance improvements 2020-08-15 22:44:15 +02:00
tobspr
b2880700e8 Huge rendering performance improvements and minor other changes, lots of refactorings 2020-08-15 22:32:55 +02:00
tobspr
d1a5dd8c9e Update local config with latest variables and cleanup a bit 2020-08-15 19:55:39 +02:00
tobspr
7e139d116d Catch up with enum change / merge 2020-08-15 19:50:22 +02:00
Bjorn Stromberg
6a447e3583 Remove enumLayer and enumItemType 2020-08-15 19:47:01 +02:00
tobspr
7b40292be3 Start to optimize rendering 2020-08-15 19:43:03 +02:00
tobspr
b1fb0fca7e Fix wires blueprint pasting bug, do not show wire info on unconnected wires 2020-08-15 18:14:00 +02:00
tobspr
070bce7020 Minor fixes 2020-08-15 17:55:14 +02:00
tobspr
699bb6a21e Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-08-15 17:51:30 +02:00
tobspr
7279b75187 Improve information when hovering wires 2020-08-15 17:51:28 +02:00
Bjorn Stromberg
779ba8a1b8
Using reject here is uncaught, make this a single promise and resolve/reject accordingly (#556) 2020-08-15 16:26:54 +02:00
tobspr
5a0d3dcbe8 Add wire coating 2020-08-15 16:16:17 +02:00
tobspr
6a3a9c49cf Improve layer preview 2020-08-15 15:24:42 +02:00
tobspr
c25428357e Remove unused code 2020-08-14 15:48:33 +02:00
tobspr
6c8a29cea6 Sneak preview to the wires layer when placing on the regular layer 2020-08-14 15:48:26 +02:00
tobspr
390c4ce1a5 Add display 2020-08-14 14:55:37 +02:00
tobspr
349657bafc Update storage to also return if its full or not 2020-08-14 13:15:26 +02:00
dengr1065
1dab9539bf
Add storage shape ejector pin (#568) 2020-08-14 13:10:57 +02:00
tobspr
8c39d31c5b Optimize performance by using singletons for items 2020-08-14 13:09:10 +02:00
tobspr
3c34227c24 Unify assets, refactor waypoints 2020-08-14 12:14:15 +02:00
tobspr
9085f32ec3 Add multiple performance settings 2020-08-14 09:38:48 +02:00
tobspr
9e76606674 Minor refactoring 2020-08-14 08:54:52 +02:00
tobspr
7fcfae747a Fix tunnels, nr. 2 2020-08-14 08:53:35 +02:00
tobspr
c982827d60 New building sprites 2020-08-14 08:20:39 +02:00
tobspr
f69af63aa3 Fix wires tunnel bug 2020-08-14 07:21:49 +02:00
tobspr
fd7ae79971 Fix hub not accepting items 2020-08-13 21:06:54 +02:00
tobspr
efd8ba7ae9 Add wire bridges and fix Q on hub crash 2020-08-13 21:04:44 +02:00
tobspr
ff02508361 Add transistor building (Gate) 2020-08-13 20:47:33 +02:00
tobspr
f44563fc05 Add item filter 2020-08-13 20:30:43 +02:00
tobspr
984bea1921 Add OR gate and different colors of wire based on the value 2020-08-13 20:01:54 +02:00
tobspr
49da768b73 Add NOT gate 2020-08-13 19:33:35 +02:00
tobspr
52b4d4d742 Implement wire networks, add levers 2020-08-13 19:23:00 +02:00
tobspr
75ab655998 Add basic logic gate and improve wires in general 2020-08-13 10:23:50 +02:00
tobspr
93186cbb9f Enable new buildings by default for now 2020-08-12 21:06:05 +02:00
tobspr
f4ac6dfe03 Add constant signal emitters 2020-08-12 21:05:32 +02:00
tobspr
f65b3728ed Improve wire auto-connect 2020-08-12 20:11:24 +02:00