1
0
mirror of https://github.com/tobspr/shapez.io.git synced 2025-06-13 13:04:03 +00:00
Commit Graph

1030 Commits

Author SHA1 Message Date
Sense101
e390e6e7d2 Merge branch 'master' into puzzle 2021-06-25 15:47:16 +01:00
tobspr
dba91fa50c Merge branch 'master' of https://github.com/tobspr/shapez.io 2021-06-25 16:31:56 +02:00
tobspr
db355da09e Minor puzzle control refactoring 2021-06-25 16:31:54 +02:00
Sense101
5fb7bb0586
Minor goal acceptor adjustments to help prevent backing up belts to complete (#1236)
* added the new splitter

* Update base-en.yaml

* added the new splitter

Update changelog and update translation regarding 20 upgrade tiers, closes #907

* Update base-en.yaml

* minor goal acceptor adjustments to help prevent backing up belts to complete

* removed gap between completion and fill as it doesn't look nice

* removed api override

* fixed mistake with fill percentage

* Allowed for copying acceptors to remember the required shape

* further adjusted required items, so it looks a bit nicer
2021-06-25 16:16:09 +02:00
tobspr
285dd3840d Some fixes 2021-06-25 16:15:05 +02:00
tobspr
6359bbeadf Update changelog 2021-06-25 16:10:27 +02:00
Sense101
a75a880126
Fixed blueprint not properly clearing on right click (#1235)
* added the new splitter

* Update base-en.yaml

* added the new splitter

Update changelog and update translation regarding 20 upgrade tiers, closes #907

* Update base-en.yaml

* fixed blueprints not clearing properly
2021-06-25 16:08:00 +02:00
Thomas (DJ1TJOO)
aa553e63eb
Fixed when achievements are given on levels (#1233)
Co-authored-by: TcePrepK <TcePrepK@users.noreply.github.com>

Co-authored-by: TcePrepK <TcePrepK@users.noreply.github.com>
2021-06-25 16:06:50 +02:00
Sense101
25db6e69ea kept api 2021-06-25 11:45:02 +01:00
Sense101
ad50bd64f7 Merge branch 'macro_fix_2' into puzzle 2021-06-25 11:44:24 +01:00
Sense101
c70f910f70 further adjusted required items, so it looks a bit nicer 2021-06-25 11:33:33 +01:00
Sense101
feb780394b Allowed for copying acceptors to remember the required shape 2021-06-25 11:31:26 +01:00
Sense101
11bb62b42c fixed mistake with fill percentage 2021-06-25 11:30:53 +01:00
Sense101
d339e18767 removed api override 2021-06-25 00:19:44 +01:00
Sense101
d3ac6db86c Merge branch 'macro_fix_2' into puzzle 2021-06-25 00:18:55 +01:00
Sense101
e9b072746b removed gap between completion and fill as it doesn't look nice 2021-06-24 22:08:34 +01:00
Sense101
1abf4ebd56 minor goal acceptor adjustments to help prevent backing up belts to complete 2021-06-24 21:48:31 +01:00
Sense101
2b9a24206b fixed blueprint not clearing properly on right click 2021-06-24 21:22:00 +01:00
Sense101
afb0a35538 Merge branch 'master' into puzzle 2021-06-24 19:35:03 +01:00
Sense101
658a6a569e changed to the right api 2021-06-24 19:33:29 +01:00
Sense101
a16d11fbf6 Merge branch 'copy-paste' into puzzle 2021-06-24 18:28:19 +01:00
Sense101
cb1a729288 added back easter egg 2021-06-24 18:27:59 +01:00
tobspr
5074727efa Update translations and changelog 2021-06-24 19:16:10 +02:00
tobspr
7b18d54cbe Minor PR adjustments 2021-06-24 19:13:21 +02:00
tobspr
d24a4a848e Merge branch 'master' of https://github.com/tobspr/shapez.io 2021-06-24 18:46:49 +02:00
tobspr
9703187105 Start changelog for 1.4.2 2021-06-24 18:46:47 +02:00
Sense101
f7cc313ff4
Add back copy/paste in puzzle mode. (#1230)
* added the new splitter

* Update base-en.yaml

* added the new splitter

Update changelog and update translation regarding 20 upgrade tiers, closes #907

* Update base-en.yaml

* Added back copy/paste in puzzle mode

* fixed rotating non-rotatable buildings as blueprints and made blocker non-rotatable
2021-06-24 18:45:48 +02:00
Sense101
1c23549b39
Added a button to clear all non fixed buildings in both modes (#1229)
* added the new splitter

* Update base-en.yaml

* added clear buildings button to both game modes

* Minor cleanups and added translation for new button
2021-06-24 18:41:37 +02:00
Sense101
6efbdc6ad1
Fix for cheating puzzles by quickly switching belts (#1226)
* added the new splitter

* Update base-en.yaml

* adjusted how acceptor works to fix macro

* fixed a minor bug

* applied changes to the puzzle-editor-review script

* minor cleanups
2021-06-24 18:39:50 +02:00
Sense101
20c24f5997 fixed rotating non-rotatable buildings as blueprints and made blocker non-rotatable 2021-06-24 16:47:59 +01:00
Sense101
6dd4d5b57a Merge branch 'clear-buildings-button' into puzzle 2021-06-24 15:18:39 +01:00
Sense101
7667b5e43b Merge branch 'copy-paste' into puzzle 2021-06-24 15:18:31 +01:00
Sense101
6f85212fd8 Merge branch 'macro-fix' into puzzle 2021-06-24 15:18:20 +01:00
Sense101
c12be469dd Added back copy/paste in puzzle mode 2021-06-24 15:10:41 +01:00
Sense101
8dfa5483f3 Minor cleanups and added translation for new button 2021-06-24 10:21:08 +01:00
Sense101
3032f45af2 minor cleanups 2021-06-24 09:53:41 +01:00
Sense101
6b60206865 added clear buildings button to both game modes 2021-06-23 22:59:16 +01:00
Sense101
ac6fe1a74b applied changes to the puzzle-editor-review script 2021-06-23 21:43:14 +01:00
Sense101
f514e2735b fixed a minor bug 2021-06-23 20:58:54 +01:00
Sense101
f16d01365f adjusted how acceptor works to fix macro 2021-06-23 20:23:34 +01:00
tobspr
acc25a93f0 Add hint about activating the DLC 2021-06-22 15:13:22 +02:00
tobspr
10428ec6b9 Fix "disableGrid" option causing glitches in the puzzle dlc 2021-06-22 14:37:03 +02:00
tobspr
6d3faabce5 v1.4.1 2021-06-22 11:22:49 +02:00
tobspr
cab21a43ca Update translations 2021-06-21 13:39:55 +02:00
tobspr
cc3242011f Allow deleting puzzles 2021-06-20 17:42:44 +02:00
tobspr
4e763ae93a Merge branch 'master' of https://github.com/tobspr/shapez.io 2021-06-20 11:53:50 +02:00
tobspr
c6bb1a22fb Bugfix backport 2021-06-20 11:53:37 +02:00
tobspr
39d6d3d565 Minor adjustments, add "trending weekly" 2021-06-20 11:50:36 +02:00
tobspr
8149ba875b Minor artwork adjustments 2021-06-19 17:46:28 +02:00
tobspr
416f89bbf4 - Puzzle DLC browser improvements / new categories
- Fix errors not being thrown sometimes
- Minor other stuff
2021-06-19 17:16:01 +02:00