Mascali
/
shapez.io
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 0918399070
         Merge pull request #274 from K3rcus/patch-2 tobspr 2020-06-23 08:39:07 +0200
  • dcd28dc3d7
         Merge pull request #273 from otougas/patch-1 tobspr 2020-06-23 08:38:39 +0200
  • 9bd2aac525
         Merge pull request #272 from rostaklein/patch-1 tobspr 2020-06-23 08:37:50 +0200
  • 5c25e9d924
         Merge pull request #265 from Ryoncai/patch-4 tobspr 2020-06-23 08:37:28 +0200
  • a53a69096e
         Update Spanish translation K3rcus 2020-06-23 03:33:48 +0200
  • 97b33ddcd0
         ixed typo in norwegian translation otougas 2020-06-22 20:31:42 -0400
  • bfc123a75d
         Update base-nl.yaml Wessel 2020-06-22 22:47:35 +0200
  • d541f451bf
         Filled in missing Czech translations rostaklein 2020-06-22 22:43:12 +0200
  • 85f38c8a6d Minor translation update tobspr 2020-06-22 19:58:51 +0200
  • 5a6a0c60f8
         Merge pull request #269 from DerFeldspatz/patch-9 tobspr 2020-06-22 19:57:58 +0200
  • c25775f82a
         Update base-de.yaml DerFeldspatz 2020-06-22 19:12:58 +0200
  • c23e05904d
         Update base-de.yaml DerFeldspatz 2020-06-22 18:33:50 +0200
  • b6d54f0f0c
         Merge pull request #267 from PascalGrosse/master tobspr 2020-06-22 18:03:36 +0200
  • 13bee840e0
         Merge pull request #266 from Killgaru/Lang_ru tobspr 2020-06-22 18:03:15 +0200
  • 878ba9e616
         Update base-nl.yaml Wessel 2020-06-22 17:33:43 +0200
  • 1be4a75776
         Update base-nl.yaml Wessel 2020-06-22 17:33:10 +0200
  • 6c877fbe3f
         Update base-nl.yaml Wessel 2020-06-22 17:31:43 +0200
  • ecaa2a83d7
         Update base-nl.yaml Wessel 2020-06-22 17:31:15 +0200
  • 6b87cd1142 Updated french translation Pascal Grossé 2020-06-22 17:25:12 +0200
  • 697e8e71ae
         Russian translation updated Killgaru 2020-06-22 18:24:50 +0300
  • 23b17467ea
         Update base-nl.yaml Wessel 2020-06-22 17:18:37 +0200
  • 360309485b
         Merge pull request #12 from tobspr/master Killgaru 2020-06-22 18:12:12 +0300
  • c21eb473f7
         Merge pull request #264 from Killgaru/Lang_ru tobspr 2020-06-22 17:11:48 +0200
  • 267ebab372
         Merge pull request #263 from Baxxster/patch-8 tobspr 2020-06-22 17:11:35 +0200
  • 8bdb7e32b0
         Updated Norwegian Translations Glenn Martin Jensen 2020-06-22 17:09:18 +0200
  • 390f296b60
         Russian translation updated Killgaru 2020-06-22 18:08:15 +0300
  • 59960aafec Update translations to latest version tobspr 2020-06-22 17:05:53 +0200
  • b2726c5108
         Merge pull request #262 from Baxxster/patch-7 tobspr 2020-06-22 17:00:32 +0200
  • 733f084d3a
         Merge pull request #260 from DerFeldspatz/patch-7 tobspr 2020-06-22 16:59:57 +0200
  • 3be0266d20
         Updated Norwegian Translations Glenn Martin Jensen 2020-06-22 16:43:30 +0200
  • 0a7ca996c9
         Merge pull request #11 from tobspr/master Killgaru 2020-06-22 17:35:44 +0300
  • 00ad1a0a5b
         Update base-de.yaml DerFeldspatz 2020-06-22 16:11:25 +0200
  • 0f9e6445d2 Set release date tobspr 2020-06-22 16:06:27 +0200
  • 526f12abd8
         Merge pull request #259 from mini-bomba/polish-the-polish-10 tobspr 2020-06-22 15:56:02 +0200
  • 4bf5adb89c
         Add new lang-keys for colourblind mode (base-pl) mini-bomba 2020-06-22 15:46:36 +0200
  • 57504bc301
         New keys and minor changes (aka. polishing) mini-bomba 2020-06-22 15:38:16 +0200
  • 56f7e8b7f6 Enable swedish translation tobspr 2020-06-22 15:37:03 +0200
  • 9a12ce79e9
         Merge pull request #256 from Itamea/master tobspr 2020-06-22 15:35:18 +0200
  • 71e729095a
         Merge pull request #258 from PascalGrosse/master tobspr 2020-06-22 15:35:06 +0200
  • cd0b43d4ff Fix placement mode staying active tobspr 2020-06-22 15:34:36 +0200
  • 0b95f3b208 Fix crash tobspr 2020-06-22 15:26:49 +0200
  • d5b9a5b562 Main menu dark mode fixes tobspr 2020-06-22 15:25:08 +0200
  • 28b2dc008c Add more links to main menu tobspr 2020-06-22 15:21:47 +0200
  • d227ac0e93
         Merge pull request #10 from tobspr/master Killgaru 2020-06-22 16:06:18 +0300
  • 43a11716cc Merge branch 'master' of https://github.com/tobspr/shapez.io Pascal Grossé 2020-06-22 14:54:10 +0200
  • e9581c653f Fix main menu rendering tobspr 2020-06-22 14:55:43 +0200
  • ebcc52374e Merge branch 'master' of https://github.com/tobspr/shapez.io Pascal Grossé 2020-06-22 14:53:56 +0200
  • 829d1e1790 French translation is up to date Pascal Grossé 2020-06-22 14:53:02 +0200
  • c5613f6eee Regression tobspr 2020-06-22 14:46:33 +0200
  • 231a3c81f4 Fix typo tobspr 2020-06-22 14:44:47 +0200
  • 116de7a166 Update Killgaru 2020-06-22 15:43:58 +0300
  • 9a67115ba7 Color blind mode tobspr 2020-06-22 14:32:24 +0200
  • d2b98eabf3 Merge branch 'master' of https://github.com/tobspr/shapez.io Itamea 2020-06-22 13:46:32 +0200
  • 375b581c28
         Merge pull request #9 from tobspr/master Killgaru 2020-06-22 14:18:08 +0300
  • f204189fdb Refactor smart underground belt logic tobspr 2020-06-22 12:48:35 +0200
  • d452234c72 Fix keybinding for pipette showing while pasting blueprints tobspr 2020-06-22 12:38:14 +0200
  • ce07211df8
         Merge pull request #1 from tobspr/master Gerdon Abbink 2020-06-22 12:37:22 +0200
  • e5d4fad64b Update changelog, minor adjustments tobspr 2020-06-22 12:36:02 +0200
  • 3dca35ded4
         Merge pull request #159 from hexagonhexagon/better-mouse-drag tobspr 2020-06-22 12:34:34 +0200
  • e1bbe2de17 Prevent all default keybindings, closes #254 tobspr 2020-06-22 12:33:28 +0200
  • e90088753d Fix russian translation, closes #252 tobspr 2020-06-22 12:31:12 +0200
  • bda66a9535 Update translations tobspr 2020-06-22 12:15:44 +0200
  • 2a7058c384 Update translations tobspr 2020-06-22 12:10:22 +0200
  • cfed1631aa Increase maximum concurrent ui sounds tobspr 2020-06-22 12:10:17 +0200
  • a8b37792e4 Allow configuring autosave interval tobspr 2020-06-22 12:09:02 +0200
  • 46a5bdb76c Make changes requested by tobspr. hexagonhexagon 2020-06-22 02:19:52 -0400
  • dd97c9ab80
         Merge pull request #246 from jimmyshadow1/master tobspr 2020-06-22 08:18:56 +0200
  • d793817170 The camera will not have extra velocity when the camera is held still. hexagonhexagon 2020-06-14 19:00:38 -0400
  • 8381100317
         Merge pull request #162 from hexagonhexagon/fix-blueprint-bug tobspr 2020-06-22 08:05:17 +0200
  • a14b7c49ba
         Merge pull request #245 from hexagonhexagon/disable-warnings tobspr 2020-06-22 08:01:11 +0200
  • ec6c306885
         Merge pull request #237 from EganWolf/patch-1 tobspr 2020-06-22 07:56:03 +0200
  • c018f61c20 Merge branch 'master' of https://github.com/jimmyshadow1/shapez.io Jimmy 2020-06-21 20:42:27 -0500
  • ffc4e78784 updated the tier 2 underground belt tutorial icon Jimmy 2020-06-21 20:42:01 -0500
  • 98cb5d3ee6
         Delete underground_belt-tier2.png jimmyshadow1 2020-06-21 20:26:54 -0500
  • 95b1901f49
         updated underground belt tier 2 icon jimmyshadow1 2020-06-21 20:12:15 -0500
  • bf3aad6499
         Add files via upload jimmyshadow1 2020-06-21 20:09:43 -0500
  • 8b6ad43ce0 Change "Confirm Mass Delete" to "Delete area", change "Destroy" keybind overlay to "Delete". hexagonhexagon 2020-06-21 19:18:24 -0400
  • 5d601a94be Add setting to disable cut/delete dialogs. hexagonhexagon 2020-06-21 19:11:20 -0400
  • bef7d823cd Cut/Delete dialogs can be interacted with by Esc/Enter. hexagonhexagon 2020-06-21 18:53:49 -0400
  • 73d796a714 Merge branch 'master' of https://github.com/tobspr/shapez.io Itamea 2020-06-22 00:51:35 +0200
  • 9117d556c2 Started Translation to Swedish Itamea 2020-06-22 00:51:24 +0200
  • 54653cf28e Make edge case where building is replaceable but unremovable an assertAlways. hexagonhexagon 2020-06-21 18:11:55 -0400
  • c7e0703c45 Fix bug where belts in blueprints don't orient correctly. hexagonhexagon 2020-06-14 22:02:01 -0400
  • e6f8d5d3ca
         Merge branch 'master' into patch-1 EganWolf 2020-06-21 23:46:51 +0200
  • 969b7a74d4 Fix belt planner shortcut being shown always tobspr 2020-06-21 23:01:42 +0200
  • 5e83c4642b Reduce sound volume tobspr 2020-06-21 22:56:38 +0200
  • e660fd2caf Update changelog tobspr 2020-06-21 22:54:50 +0200
  • 597eefe968 Deselect blueprint on pipette tobspr 2020-06-21 22:51:42 +0200
  • d907dbb191 Improve pipette tobspr 2020-06-21 22:29:23 +0200
  • 5b2df00cc7 Fix pipetting belts tobspr 2020-06-21 22:05:41 +0200
  • ba52edf7a4 Fixes for the pipette tobspr 2020-06-21 21:59:35 +0200
  • 76b619e4e7 Allow deselecting with pipette tobspr 2020-06-21 21:46:20 +0200
  • 0b31ad0c7b Pipette tobspr 2020-06-21 21:44:53 +0200
  • 38114ff3f6 Fix right click to delete not working tobspr 2020-06-21 21:22:33 +0200
  • 2ca5dc9715 Fix hub marker being hidden by building info panel tobspr 2020-06-21 21:05:51 +0200
  • 0b8f7cdf65 update artwork tobspr 2020-06-21 20:54:48 +0200
  • 47b3ed5cbf Add option to render info boxes compact tobspr 2020-06-21 20:47:37 +0200
  • 1f136ba892 Minor fixes for dark mode tobspr 2020-06-21 20:27:39 +0200
  • d198fcad4f
         Merge pull request #197 from dengr1065/dark-theme-is-cool tobspr 2020-06-21 20:19:01 +0200
  • d1fe231bcb Remove unused keybindings tobspr 2020-06-21 20:17:03 +0200