1
0
mirror of https://github.com/tobspr/shapez.io.git synced 2024-10-27 20:34:29 +00:00
Commit Graph

1171 Commits

Author SHA1 Message Date
tobspr
8ec4037656 Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-07-06 15:08:20 +02:00
tobspr
1e5aa3867d Allow building mac on windows, closes #355 2020-07-06 15:08:17 +02:00
tobspr
4dcdf0535b
Merge pull request #396 from Astavie/patch-2
Update base-nl.yaml
2020-07-06 14:52:21 +02:00
tobspr
989347d0ea Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-07-06 14:48:11 +02:00
tobspr
d87c9c9e1f Update changelog 2020-07-06 14:48:09 +02:00
tobspr
f35558bb28
Merge pull request #367 from MizardX/planner-initial-direction
Initial planner direction based on cursor movement
2020-07-06 14:47:44 +02:00
tobspr
22cba96f6e Refactor debug overlay 2020-07-06 14:40:31 +02:00
tobspr
c4d7e65d9f
Merge pull request #347 from dengr1065/debug-info
Improved debug info (position and version)
2020-07-06 14:21:32 +02:00
tobspr
756bcdb473 Fix tunnels entrances connecting to exits sometimes when they shouldn't 2020-07-06 14:19:46 +02:00
tobspr
ef8d520d94 Add slovenian translation prefab 2020-07-06 14:03:50 +02:00
dengr1065
b3c9c186d3
debug info - use "detailed" instead of "full"
i'm retarded pls help
2020-07-06 14:17:58 +03:00
dengr1065
b61e0aac73
debug info - fix lint fail
github editor sucks without built-in prettier
2020-07-06 12:07:46 +03:00
dengr1065
f4c9c66354
debug info fixes 2020-07-06 12:02:31 +03:00
dengr1065
6546c023a6
debug info css - prepare for attribute usage 2020-07-06 12:00:40 +03:00
tobspr
6c6ad6af22 Update standalone build script 2020-07-06 08:14:44 +02:00
tobspr
4896e9b89e Clear selection when switching layers 2020-07-05 18:47:09 +02:00
tobspr
a1007591e5 Fix multiple bugs, 2 2020-07-05 18:33:46 +02:00
tobspr
65337f90fc Fix multiple bugs 2020-07-05 18:33:41 +02:00
tobspr
719812c3cf Move artwork to seperate repository 2020-07-05 18:03:53 +02:00
tobspr
d09bd0bcd7 Huge refactoring of the whole placement logic 2020-07-05 17:56:54 +02:00
MizardX
322e7fbcc9 Initial planner direction based on cursor movement 2020-07-05 17:38:14 +02:00
tobspr
ca8745b1c0 Fix bad rendering of item acceptors / ejector hints 2020-07-05 17:11:03 +02:00
tobspr
34ef26b289 Fix multiple issues regarding saving / restoring games 2020-07-05 16:56:01 +02:00
Astavie
8c777a4712
Additieve kleurmening 2020-07-05 14:27:03 +02:00
Astavie
8593e05de3
Update base-nl.yaml 2020-07-05 13:46:22 +02:00
tobspr
0b9b35b79e Update store page, again 2020-07-05 13:13:58 +02:00
tobspr
23df0cf1e0 Update store page text 2020-07-05 13:08:13 +02:00
tobspr
04839b1956 Unlock energy generator from the beginning 2020-07-05 12:59:40 +02:00
tobspr
e3875aab2a Fix translation error 2020-07-05 12:55:13 +02:00
tobspr
83d635269c Add alpha build functionality 2020-07-05 12:54:43 +02:00
tobspr
5e67ae8548 Update store page 2020-07-05 12:52:33 +02:00
tobspr
867b55ca38 Update changelog 2020-07-05 12:14:55 +02:00
tobspr
c87b87c572 Minor phrasing change 2020-07-05 12:14:29 +02:00
tobspr
ec38c6820a
Merge pull request #383 from isaisstillalive/warningInsufficientCut
Confirm cutting if not enough shapes to rebuild blueprint back
2020-07-05 12:13:48 +02:00
tobspr
c81be8b1a3
Merge pull request #395 from Astavie/patch-1
Change the suffix for large numbers to use SI in Dutch
2020-07-05 12:12:23 +02:00
tobspr
58633ef04a
Merge pull request #390 from RisenAlex/patch-2
Update base-ro.yaml
2020-07-05 12:10:40 +02:00
tobspr
4497bbb2ff
Merge pull request #389 from ivanbratovic/patch-1
Add first version of Croatian translation.
2020-07-05 12:10:21 +02:00
Astavie
6ee05a7e0d
Change the suffix for large numbers to use SI
Changes made:
 - change 'k' to uppercase 'K' (source: https://taaladvies.net/taal/advies/vraag/1818/)
 - change 'B' to 'G'

This PR has been made because the English system does not work for Dutch. As `mln.`, `mlj.`, and `bln.` are too long for the game, I suggest using the SI suffixes instead of the English ones.
2020-07-05 12:04:39 +02:00
isaisstillalive
0ba4722be6 Show confirm dialog instead of notification 2020-07-05 11:14:11 +09:00
isaisstillalive
6a279923e3 If cost is low, copy instead of cut 2020-07-05 09:51:45 +09:00
tobspr
1837e72952 Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-07-04 18:34:04 +02:00
tobspr
85bb280326 Update changelog & artwork 2020-07-04 18:34:02 +02:00
tobspr
7cf467f4c3
Merge pull request #386 from Dimava/feature/scroll-center
Center zoom on mouse
2020-07-04 18:32:47 +02:00
RisenAlex
e0f57788a6
Update base-ro.yaml 2020-07-04 19:30:40 +03:00
Dimava
af1893ba08 find a more meaningful name and make it const 2020-07-04 19:28:10 +03:00
Dimava
35f427da82 remove moving on min/max zoom 2020-07-04 19:28:07 +03:00
Dimava
785f20c35f fix jumps with desiredCenter 2020-07-04 19:28:04 +03:00
Dimava
2f6b3afbab Wheel zoom saves world mouse position 2020-07-04 19:28:02 +03:00
tobspr
f0a75a8255 Minor changes, update changelog with latest contributions 2020-07-04 16:46:01 +02:00
tobspr
db5b2e5870
Merge pull request #384 from Jaeyoon07031/patch-1
Super minor changes
2020-07-04 16:37:18 +02:00