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

1013 Commits

Author SHA1 Message Date
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
Jesús Lapastora
d74d58afb7
Fixed compressInt cache bug (#1210)
Now `compressInt` uses the cache properly.
2021-06-19 16:17:42 +02:00
tobspr
b2c9a7715c Merge branch 'master' of https://github.com/tobspr/shapez.io 2021-06-19 13:18:40 +02:00
tobspr
e4c1355e9c Query login token for puzzle DLC api 2021-06-19 13:18:38 +02:00
Sense101
cd764146aa Merge branch 'master' into puzzle 2021-06-14 13:42:35 +01:00
tobspr
a4b122a91c Preparations for 1.4.0 2021-06-04 11:56:05 +02:00
tobspr
291614cb3c Support for building wegame specific version 2021-05-25 21:29:44 +02:00
tobspr
a3fb3c432a Fix another bug 2021-05-25 12:09:54 +02:00
tobspr
f5d03ae027 Localized puzzle dlc logo 2021-05-25 09:24:53 +02:00
tobspr
b3d1204d9c Wegame version & DLC Translation in Chinese 2021-05-25 09:19:57 +02:00
tobspr
65721e0837 Fix savegame bugs 2021-05-24 16:47:36 +02:00
tobspr
a0e1cb68aa Fix bugs found during testing 2021-05-23 20:19:43 +02:00
tobspr
42af2b63d6 Authorize via steam 2021-05-23 17:28:39 +02:00
tobspr
329cefb3c9 Authorize via steam for the puzzle api 2021-05-23 17:34:13 +02:00
tobspr
ec4d198df3 Preparations for the puzzle DLC 2021-05-23 17:03:59 +02:00
tobspr
3c3cb5924f Fix typo 2021-05-23 16:40:09 +02:00
TimerErTim
b259c7576a
Fix formatItemsPerSecond with double = true (#1148)
* Show double flag with items per second being 1

formatItemsPerSecond in utils.js does not indicate two items being processed in a building
if speed is exactly one item per second. That is now fixed.

* Fix code style to fit guidelines
2021-05-23 16:39:34 +02:00
tobspr
931c8a5821
Puzzle DLC (#1172)
* Puzzle mode (#1135)

* Add mode button to main menu

* [WIP] Add mode menu. Add factory-based gameMode creation

* Add savefile migration, serialize, deserialize

* Add hidden HUD elements, zone, and zoom, boundary constraints

* Clean up lint issues

* Add building, HUD exclusion, building exclusion, and refactor

- [WIP] Add ConstantProducer building that combines ConstantSignal
and ItemProducer functionality. Currently using temp assets.
- Add pre-placement check to the zone
- Use Rectangles for zone and boundary
- Simplify zone drawing
- Account for exclusion in savegame data
- [WIP] Add puzzle play and edit buttons in puzzle mode menu

* [WIP] Add building, component, and systems for producing and
accepting user-specified items and checking goal criteria

* Add ingame puzzle mode UI elements

- Add minimal menus in puzzle mode for back, next navigation
- Add lower menu for changing zone dimenensions

Co-authored-by: Greg Considine <gconsidine@users.noreply.github.com>

* Performance optimizations (#1154)

* 1.3.1 preparations

* Minor fixes, update translations

* Fix achievements not working

* Lots of belt optimizations, ~15% performance boost

* Puzzle mode, part 1

* Puzzle mode, part 2

* Fix missing import

* Puzzle mode, part 3

* Fix typo

* Puzzle mode, part 4

* Puzzle Mode fixes: Correct zone restrictions and more (#1155)

* Hide Puzzle Editor Controls in regular game mode, fix typo

* Disallow shrinking zone if there are buildings

* Fix multi-tile buildings for shrinking

* Puzzle mode, Refactor hud

* Puzzle mode

* Fixed typo in latest puzzle commit (#1156)

* Allow completing puzzles

* Puzzle mode, almost done

* Bump version to 1.4.0

* Fixes

* [puzzle] Prevent pipette cheats (miners, emitters) (#1158)

* Puzzle mode, almost done

* Allow clearing belts with 'B'

* Multiple users for the puzzle dlc

* Bump api key

* Minor adjustments

* Update

* Minor fixes

* Fix throughput

* Fix belts

* Minor puzzle adjustments

* New difficulty

* Minor puzzle improvements

* Fix belt path

* Update translations

* Added a button to return to the menu after a puzzle is completed (#1170)

* added another button to return to the menu

* improved menu return

* fixed continue button to not go back to menu

* [Puzzle] Added ability to lock buildings in the puzzle editor! (#1164)

* initial test

* tried to get it to work

* added icon

* added test exclusion

* reverted css

* completed flow for building locking

* added lock option

* finalized look and changed locked building to same sprite

* removed unused art

* added clearing every goal acceptor on lock to prevent creating impossible puzzles

* heavily improved validation and prevented autocompletion

* validation only checks every 100 ticks to improve performance

* validation only checks every 100 ticks to improve performance

* removed clearing goal acceptors as it isn't needed because of validation

* Add soundtrack, puzzle dlc fixes

Co-authored-by: Greg Considine <gconsidine@users.noreply.github.com>
Co-authored-by: dengr1065 <dengr1065@gmail.com>
Co-authored-by: Sense101 <67970865+Sense101@users.noreply.github.com>
2021-05-23 16:32:05 +02:00