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

1091 Commits

Author SHA1 Message Date
tobspr d09bd0bcd7 Huge refactoring of the whole placement logic 2020-07-05 17:56:54 +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
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
tobspr ff1c1700fe
Merge pull request #382 from isaisstillalive/patch-3 
Fixed Fill blueprint shapes of SandboxController may not work
 2020-07-04 16:35:23 +02:00
tobspr 3a1ef1ec5f
Merge pull request #381 from RisenAlex/patch-4 
Update base-ro.yaml
 2020-07-04 16:35:10 +02:00
tobspr eeed8dd991
Merge pull request #380 from isaisstillalive/patch-2 
Close-shop-and-stats key mapping doesn't seem to exist
 2020-07-04 16:34:35 +02:00
Ivan Bratović ed74c4be6e
Add first version of Croatian translation. 
This is still incomplete, I still have some things left to translate. However, should be good enough for a first version.
 2020-07-04 16:26:49 +02:00
RisenAlex c4f7d69864
Update base-ro.yaml 2020-07-04 00:37:46 +03:00
RisenAlex 9d69bc87f2
Update base-ro.yaml 2020-07-03 18:35:08 +03:00
Jaeyoon07031 cea6692e2a
Super minor changes 
Just found small changes i can make, not really big.
Someone was probably using google translate for the new parts and they could be replaced with better words so thats just what i did.
These changes are really small so you can wait for me to make more changes later on and then merge it.
 2020-07-03 22:21:29 +09:00
isaisstillalive 7f6584297e Fixed Fill blueprint shapes of SandboxController may not work 2020-07-03 19:53:09 +09:00
RisenAlex 23119f9a1f
Update base-ro.yaml 2020-07-03 13:05:45 +03:00
isaisstillalive 50c53ec1f2 Close-shop-and-stats key mapping doesn't seem to exist 2020-07-03 17:31:19 +09:00
tobspr 503f9a7fe5
Merge pull request #372 from isaisstillalive/patch-1 
Fixed an issue that caused an error when pressing the tab key
 2020-07-03 09:38:24 +02:00
isaisstillalive e822552a60 Refactoring obscure variable name 2020-07-03 16:29:29 +09:00
tobspr 689980f819
Merge pull request #379 from RisenAlex/patch-2 
Update base-ro.yaml
 2020-07-03 08:53:20 +02:00
tobspr df3121aca2
Merge pull request #378 from JeremyMeissner/patchfr-1 
Update base-fr.yaml
 2020-07-03 08:53:04 +02:00
tobspr a99d12a7ff
Merge pull request #377 from EnderDoom77/patch-2 
Made minor adaptations for consistency or grammar
 2020-07-03 08:52:45 +02:00
tobspr 4ca867d346
Merge pull request #364 from rogeriocamorim/patch-1 
Update base-pt-BR.yaml
 2020-07-03 08:48:05 +02:00
tobspr c8fd9b8789
Merge pull request #362 from Gumball73/patch-4 
Update base-pt-PT.yaml
 2020-07-03 08:47:46 +02:00
tobspr daa5cdecb4
Merge pull request #361 from Sandwichs-del/Close-shop-and-stats-by-Q-too 
Close shop and stats by Q too
 2020-07-03 08:47:32 +02:00
tobspr 31fa93bbe6
Merge pull request #359 from Jaeyoon07031/patch-3 
A few small changes
 2020-07-03 08:46:57 +02:00
tobspr b584a206ae
Merge pull request #349 from EnderDoom77/patch-1 
Correcting spelling and translated missing section
 2020-07-03 08:44:53 +02:00
RisenAlex 4031ad526e
Update base-ro.yaml 2020-07-03 01:31:18 +03:00
Jeremy Meissner 2aa4673d69 Update base-fr.yaml 
Fix the marker demo description text misspelling
 2020-07-02 22:44:19 +02:00