Mascali
/
shapez
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity
923 Commits 6 Branches 26 Tags 655 MiB
Commit Graph

923 Commits

Author SHA1 Message Date
tobspr 597eefe968 Deselect blueprint on pipette 2020-06-21 22:51:42 +02:00
tobspr d907dbb191 Improve pipette 2020-06-21 22:29:23 +02:00
tobspr 5b2df00cc7 Fix pipetting belts 2020-06-21 22:05:41 +02:00
tobspr ba52edf7a4 Fixes for the pipette 2020-06-21 21:59:35 +02:00
tobspr 76b619e4e7 Allow deselecting with pipette 2020-06-21 21:46:20 +02:00
tobspr 0b31ad0c7b Pipette 2020-06-21 21:44:53 +02:00
tobspr 38114ff3f6 Fix right click to delete not working 2020-06-21 21:22:33 +02:00
tobspr 2ca5dc9715 Fix hub marker being hidden by building info panel 2020-06-21 21:05:51 +02:00
tobspr 0b8f7cdf65 update artwork 2020-06-21 20:54:48 +02:00
tobspr 47b3ed5cbf Add option to render info boxes compact 2020-06-21 20:47:37 +02:00
tobspr 1f136ba892 Minor fixes for dark mode 2020-06-21 20:27:39 +02:00
tobspr d198fcad4f
Merge pull request #197 from dengr1065/dark-theme-is-cool 
Dark Theme - slowly for everything
 2020-06-21 20:19:01 +02:00
tobspr d1fe231bcb Remove unused keybindings 2020-06-21 20:17:03 +02:00
tobspr 0cf47d139b
Merge pull request #243 from findaldudu/master 
Simplifed Chinese translation patch.
 2020-06-21 20:10:56 +02:00
tobspr 1458e1aad0 Update changelog 2020-06-21 19:58:54 +02:00
findaldudu 7a5094939d chinese translation patch 2020-06-21 12:56:55 -05:00
findaldudu 2b04f675aa Merge commit '25957c86b150a7bdc9bab720a36115a3923c587f' 2020-06-21 12:55:28 -05:00
tobspr 71a98a75f1
Merge pull request #232 from Keriew/patch-1 
Fix a bunch of typos in the Polish translation
 2020-06-21 19:44:37 +02:00
tobspr 7cd0054c55
Merge pull request #223 from Joker-vD/labels-are-way-too-short 
Map markers' labels are way too short.
 2020-06-21 19:42:01 +02:00
tobspr 6795a98256
Merge pull request #222 from Killgaru/Lang_ru2 
Russian translation updated
 2020-06-21 19:41:20 +02:00
tobspr 44a5e945cd
Merge pull request #221 from Ryoncai/patch-3 
Update base-nl.yaml
 2020-06-21 19:40:45 +02:00
tobspr 061815c7ed
Merge pull request #219 from findaldudu/master 
Add simplified Chinese translation
 2020-06-21 19:39:04 +02:00
tobspr 51bd87a970
Merge pull request #218 from davidburhans/left-then-right-click-button-fix 
Clumsy clicker fix
 2020-06-21 19:37:31 +02:00
tobspr 60b1e62a60
Merge pull request #213 from DerFeldspatz/patch-5 
Update base-de.yaml translation
 2020-06-21 19:34:33 +02:00
tobspr cd36e9084a Minor code style adjustments 2020-06-21 19:33:58 +02:00
tobspr ece02e7545 Update changelog 2020-06-21 19:33:28 +02:00
tobspr e4b2c51484
Merge pull request #212 from xSparfuchs/master 
fix for screenshots larger than 16,384 x 16,384
 2020-06-21 19:32:57 +02:00
tobspr 0343c9b961
Merge pull request #205 from PascalGrosse/master 
Updated french translation
 2020-06-21 19:31:34 +02:00
tobspr daef0f1e4e Refactor keybindings overlay to show more appropriate keybindings 2020-06-21 19:30:44 +02:00
tobspr ecda498cac Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-06-21 18:11:43 +02:00
tobspr 2dec257dd9 Cleanup click detector code 2020-06-21 18:11:41 +02:00
tobspr fd70130ec4 Update artwork and sound 2020-06-21 18:11:10 +02:00
tobspr cbdc302760
Merge pull request #193 from Phlosioneer/miner-optimization 
[Minor Opt] Make miners cache mined item
 2020-06-21 18:10:46 +02:00
tobspr 2c25c4ceda Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-06-21 18:04:37 +02:00
tobspr 0c0feac26c Add kroatian translation prefab 2020-06-21 18:04:35 +02:00
EganWolf 60862c271a
Mainly typos and not translated parts. 2020-06-20 01:34:29 +02:00
Killgaru 169ff6c9de Russian translation updated 
Another fix
 2020-06-19 18:12:08 +03:00
ananbaobeichicun 25957c86b1
L1-100 translated 2020-06-19 21:17:06 +08:00
Keriew 5dc31e7e40 Fix a bunch of typos in the Polish translation 2020-06-19 04:11:39 +02:00
Joker_vD 2b6a8e49d1 Only 14 characters for labels? That's 1/10 of a twit! 2020-06-18 22:26:15 +03:00
Killgaru 773aecca56 Russian translation updated 
Some fixes.
 2020-06-18 20:01:14 +03:00
Pascal Grossé b6d43bea72 Merge branch 'master' of github.com:PascalGrosse/shapez.io 2020-06-18 18:48:05 +02:00
Pascal Grossé 11749625bd Resolved merge conflict 2020-06-18 18:46:23 +02:00
Pascal Grossé f116eb2460 Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-06-18 18:46:07 +02:00
Wessel 759dae4107
Update base-nl.yaml 
Added new translations, fixed some small errors, reversed some unnecessary/confusing translations, made the translations of the other person more consistent with the rest of the text.
 2020-06-18 18:39:58 +02:00
findaldudu 76bbee0b7c finish simplified chinese translation for v1.15 2020-06-17 23:47:45 -05:00
findaldudu 1adf7d09f9 add simplified Chinese translation (75%) 2020-06-17 21:13:50 -05:00
David Burhans 60baf4476f clear ClickDetector.clickDownPosition on right-click to prevent detecting subsequent left-clicks as double-clicks 2020-06-17 19:35:02 -05:00
PascalGrosse 05551b6c77
Merge branch 'master' into master 2020-06-18 00:44:58 +02:00
Phlosioneer f15cd5bcff Rework to cache instead of serialize 
Using lessons from other PRs
 2020-06-17 15:38:39 -04:00