Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
141 commits
Select commit Hold shift + click to select a range
cc0036b
Fixed scope on variables leaked to global scope
Jan 22, 2022
fc0d449
Modified copyState to make a deep copy of the rules property
Jan 30, 2022
15f6b88
Changed tokenIndex for level messages to -4 to match messages elsewhere
Feb 1, 2022
5581466
Changed standalone base files to use stripped URL as name of homepage…
Feb 13, 2022
6051f68
Merge pull request #803 from BentSm/standalone-fix
increpare Feb 21, 2022
b5cfc63
Merge branch 'master' of https://github.com/increpare/PuzzleScript
increpare Feb 21, 2022
3ddd299
Merge pull request #799 from BentSm/misc-fixes
increpare Feb 21, 2022
81c21a7
Merge branch 'master' of https://github.com/increpare/PuzzleScript
increpare Feb 21, 2022
a6e6b1a
changing bannedGroup back to being local object rather than member of…
increpare Feb 21, 2022
37d9529
fixes #804
increpare Feb 21, 2022
3cf4c5c
fixes #810, #805 (includes unit test modifications)
increpare Feb 21, 2022
24308fa
oops acidentally added some WIP code about something
increpare Feb 21, 2022
f34cc8e
fixes #809, fixes #812
increpare Feb 21, 2022
fefcdb9
fixes #814
increpare Feb 21, 2022
c55da29
downgrading 5x5 error to warning because it was flagging an existing …
increpare Feb 21, 2022
86e2f3a
fixes #808, fixes #816, fixes #815
increpare Feb 21, 2022
ca0ca83
fixing a test case (cf #815 problem with dead rule elimination)
increpare Feb 21, 2022
585a9f7
some code culling as a result of #807
increpare Feb 21, 2022
65fad75
fixes #817, and some forgotten culling from #807
increpare Feb 21, 2022
1d2a904
fixes #820, fixes #819
increpare Feb 22, 2022
7227fb6
fixes #776
increpare Feb 22, 2022
7fc2f05
fixes #814
increpare Feb 22, 2022
8129a92
fixes #811, fixes #823, fixes #822, fixes #822, fixes #824
increpare Feb 22, 2022
09704eb
fixes #826
increpare Feb 22, 2022
0b65fca
fixes #830
increpare Feb 22, 2022
4d9d524
fixes #833
increpare Feb 23, 2022
6ed95f3
fixes #832 - added lots of unit tests based on games lying around on…
increpare Feb 23, 2022
9552c7c
fixes #838
increpare Feb 23, 2022
7d9dad4
fixes #834
increpare Feb 23, 2022
f28205e
fixes #775
increpare Feb 23, 2022
a7cd153
fixes #840
increpare Feb 23, 2022
af4a4d7
fixes #780
increpare Feb 23, 2022
654393d
work on #841
increpare Feb 23, 2022
8cbffb0
tidy up compile.js formatting
increpare Feb 23, 2022
8645061
tweak to standalone.html to make it compatible still with the source …
increpare Feb 23, 2022
d76bc6d
build
increpare Feb 23, 2022
a08d7b4
new unit test, censored another to make it SFW
increpare Feb 23, 2022
613ee32
fix trailing whitespace and inconsistent formatting in default project
MisshapenSmiley Feb 24, 2022
d3f7b82
ignore .DS_Store in all subdirectories
MisshapenSmiley Feb 24, 2022
619dfd7
Update editor.html
increpare Feb 24, 2022
a6e18cb
Merge pull request #845 from MisshapenSmiley/default-project-fix
increpare Feb 24, 2022
a23e124
fixes #852
increpare Feb 24, 2022
32b3c6a
fixes #850
increpare Feb 24, 2022
87c905f
fixes #849
increpare Feb 24, 2022
c5f225a
fixing erronious explanation
increpare Feb 24, 2022
1b935f7
Merge branch 'master' of https://github.com/increpare/PuzzleScript
increpare Feb 24, 2022
a2958d1
file renaming to get around case-madness Part 1 (for #853 )
increpare Feb 24, 2022
71a5b29
file renaming to get around case-madness Part 2 (fixes #853 )
increpare Feb 24, 2022
da0fd9e
fixes #855
increpare Feb 24, 2022
f70adbb
fixes #854
increpare Feb 24, 2022
0637af0
Merge branch 'master' of https://github.com/increpare/PuzzleScript
increpare Feb 25, 2022
ddde26f
fixes #829 (mostly)
increpare Feb 25, 2022
964468e
fixes #848
increpare Feb 25, 2022
a35bf83
fixes #857
increpare Feb 25, 2022
ae2f0f6
Merge pull request #847 from MisshapenSmiley/gitignore-fix
increpare Feb 25, 2022
97efac7
fixes #859
increpare Mar 3, 2022
9870191
fixes #862, fixes #843
increpare Mar 3, 2022
a5ba0eb
fixes #863
increpare Mar 4, 2022
ea69b7e
fixes #868
increpare Mar 7, 2022
dab68c4
Merge branch 'master' of https://github.com/increpare/PuzzleScript
increpare Mar 7, 2022
1fb5393
Delete codeql-analysis.yml
increpare Mar 7, 2022
355ecf4
rigidbody test (for #866)
increpare Mar 7, 2022
a63e19e
test for #866 rigid applies to movements even if the movements were a…
increpare Mar 7, 2022
679da3f
#866 rigid applies to movements even if the movements are chagned by …
increpare Mar 7, 2022
ffd0fdf
#866 rigid applies to movements even if the objects are changed to di…
increpare Mar 7, 2022
135fb61
more tests for #866
increpare Mar 7, 2022
3b93651
fixes #869, #870, #688, #864
increpare Mar 8, 2022
7d383f5
fixes #874
increpare Mar 8, 2022
3785927
fixes #875
increpare Mar 8, 2022
d1cf51b
Update tests.js
increpare Mar 8, 2022
b743526
tweaking documentation
increpare Mar 8, 2022
9da9689
fixes #881
increpare Mar 8, 2022
6705613
fixes #878
increpare Mar 8, 2022
14e933a
fixes #877, fixes #882
increpare Mar 8, 2022
8bcb966
accepting final bit of #846 and unthreading a loop because it was giv…
increpare Mar 8, 2022
4d9f330
fixes #885, fixes #886
increpare Mar 9, 2022
dc72b07
fixes #883
increpare Mar 9, 2022
35dd677
fixes #879
increpare Mar 9, 2022
d01458e
compile
increpare Mar 9, 2022
0edceb9
better checks for dimensions in flickscreen+zoomscreen
increpare Mar 9, 2022
67ceb51
fixes #873
increpare Mar 9, 2022
8102102
fixing link
increpare Mar 9, 2022
4dbe431
adding final bit from #846
increpare Mar 9, 2022
1a4304f
minor edit to rigidbodies.html
increpare Mar 9, 2022
e5eb731
fixes #872
increpare Mar 9, 2022
f73f854
minor html fix
increpare Mar 9, 2022
47ae448
fixes #880
increpare Mar 9, 2022
d4ad33d
fixes #797
increpare Mar 9, 2022
d2d7068
fixes #888
increpare Mar 9, 2022
072e9d0
fixes #887
increpare Mar 9, 2022
028f525
code spring-cleaning - changing a bunch of VARs to CONSTs
increpare Mar 9, 2022
c30a4b2
update qunit 1.12.0->1.23.1
increpare Mar 9, 2022
5eb1313
Revert "code spring-cleaning - changing a bunch of VARs to CONSTs"
increpare Mar 9, 2022
0786c77
fixes #770
increpare Mar 9, 2022
9a25b49
fixes #889, fixes #768
increpare Mar 10, 2022
132039d
fixes #891
increpare Mar 10, 2022
56b3246
build
increpare Mar 10, 2022
89c215e
Revert "update qunit 1.12.0->1.23.1"
increpare Mar 10, 2022
0b4d346
fixes #890
increpare Mar 10, 2022
5cc0d83
fixes #892
increpare Mar 10, 2022
5e85887
fixes #871
increpare Mar 10, 2022
589a1f7
fixes #893
increpare Mar 10, 2022
aa7e91b
show the level diff
increpare Mar 10, 2022
42af7b4
fixes #128
increpare Mar 10, 2022
d82482b
Create LICENSE
increpare Mar 10, 2022
07fa6e1
Merge pull request #895 from increpare/add-license-1
increpare Mar 10, 2022
6a42699
Update README.md
increpare Mar 10, 2022
30f592c
.
increpare Mar 10, 2022
3d0bc3a
tidying up examples (for #844)
increpare Mar 11, 2022
d2bfdc3
Fix non-square flickscreen/zoomscreen coordinates
hcs64 Mar 11, 2022
aeca8ea
Fix coordinates tests
hcs64 Mar 12, 2022
ef1617e
Merge pull request #898 from hcs64/master
increpare Mar 12, 2022
b510ee5
Added missing pushSoundToHistory function to debug_off.js
Mar 13, 2022
132768c
Merge pull request #899 from BentSm/sound-history-fix
increpare Mar 13, 2022
cd31159
rest of implementation for #506 with tests + mention in documentation
increpare Mar 14, 2022
9b2857a
Merge branch 'master' into doubleellipses
increpare Mar 14, 2022
68addb7
Merge pull request #900 from increpare/doubleellipses
increpare Mar 14, 2022
e47b350
fixes #903
increpare Mar 15, 2022
306bcc2
fixes #904 - by your side has a warning
increpare Mar 16, 2022
74f2fcf
caught errors get their details printed to the console (including sta…
increpare Mar 16, 2022
2b06c96
fixes #918
increpare May 6, 2022
3dcc07b
fixes #929
increpare Jul 5, 2022
c8612d8
make toolbar scrollable
increpare Jul 5, 2022
597f9c4
hide scrollbar if toolbar too narrow (related to #921 )
increpare Jul 8, 2022
12d10d2
sfw-izing a test that slipped through
increpare Jul 8, 2022
048bdb9
compile
increpare Jul 8, 2022
4472082
sandalone->standalone
increpare Jul 26, 2022
6af3adc
final bits of #846
increpare Jul 26, 2022
e08f117
lol
increpare Jul 26, 2022
60db47a
Merge commit '4d9d524223ab1148114b71b29469086e68678ae7' into tomerge
Feb 25, 2023
c6f97d3
Fix braces broken in merge, but still broken
Feb 25, 2023
47e2a22
Redo parser, compiler merge
Feb 27, 2023
d4a32b1
Merge in sound history,
Mar 1, 2023
8ffde93
Tidy up some PS+ comments
Mar 1, 2023
9060f9d
Merge commit 'a6e18cbf14d83c4693980d593a4dee40eb11bd09' into tomerge
Mar 1, 2023
6b81a37
Tweak parser PS+ comments
Mar 1, 2023
f01d20c
Merge commit 'a35bf83483c7853a025a45983412c2b84e04d2ac' into tomerge
Mar 1, 2023
db646ab
New games_dat_plus for PS+ gallery
Mar 2, 2023
a625116
Merge remote-tracking branch 'remotes/increpare/master' into tomerge
Mar 4, 2023
0552272
Fix some case sensitive issues
Mar 5, 2023
4fadf79
Merge branch 'tomerge' into develop
david-pfx Mar 6, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .build/buildnumber.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1735
1738
7 changes: 1 addition & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
bin/
.DS_Store
*/.DS_Store
*/*/.DS_Store
*/*/*/.DS_Store
*/*/*/*.DS_Store
*/*/*/*/*.DS_Store
**/.DS_Store

*.swp
src - Kopie
4 changes: 2 additions & 2 deletions DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The structure of PuzzleScript is the following:
`./compile.js` uses [node](https://nodejs.org). So first off you have to install that. Then you need to install the packages that it uses:

```
npm i inliner ncp rimraf compress-images gifsicle glob concat ycssmin terser html-minifier-terser gzipper
npm i web-resource-inliner ncp rimraf compress-images gifsicle@5.3.0 glob concat ycssmin terser html-minifier-terser gzipper
```

Then you should be able to compile the site (outputted to the `./bin/` directory) with
Expand All @@ -24,7 +24,7 @@ Then you should be able to compile the site (outputted to the `./bin/` directory
node compile.js
```

## Sandalone-exporting
## Standalone-exporting

If you load `./src/editor.html` directly, by double-clicking it or whatever, exporting won't work because the browser sandboxing prevents the `XMLHttpRequest` for `standalone_inlined.txt` from working. To get it to work you need to run a local http server - see for instance [this](http://www.linuxjournal.com/content/tech-tip-really-simple-http-server-python) for an example of how to set one up with python.

Expand Down
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2013 Stephen Lavelle

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Loading