ifhub/inform7
1
0
Fork 0
mirror of https://github.com/ganelson/inform.git synced 2024-07-08 18:14:21 +03:00
Code Issues Projects Releases Wiki Activity
1372 commits 2 branches 3 tags 159 MiB
Commit graph

1372 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Chimento 9d14021b6b Bless output of indoc tests for Windows app 
The ideal output didn't reflect the recent changes to the JavaScript paste
code. I'm assuming that the current output is correct as-is.

Maybe it makes less sense to have separate tests for Windows and Mac now,
since the HTML is now identical. But the CSS still differs, so I've kept
them for now.
 2022-04-30 13:16:36 -07:00
Philip Chimento b2f1029e5b Add newline to JavaScript paste code 
This seems to have been removed accidentally in 56800ab7 - it made a
discrepancy in the osx_app output where there shouldn't have been any
change.
 2022-04-30 13:16:36 -07:00
Graham Nelson fa3380fc97 Removed platform-dependent tests which expected root(-1) to be -NaN rather than NaN 2022-04-30 16:40:56 +01:00
Graham Nelson 8498d15914 To remove compiler warning 2022-04-30 15:46:06 +01:00
Graham Nelson 0a66e63a99 Minor visual fixes 2022-04-30 14:12:52 +01:00
Graham Nelson 663f4502a2
Merge pull request #15 from DavidKinder/master 
Remove Windows-specific workarounds from HTML generation
 2022-04-30 12:15:10 +01:00
Graham Nelson 4aab7a92c5 Merge branch 'master' of https://github.com/ganelson/inform 2022-04-30 12:09:17 +01:00
Graham Nelson 10512016f5 Minor misprints corrected (with thanks to BorisTheBrave) 2022-04-30 12:05:12 +01:00
Graham Nelson 5c45e29e84 Fixed makescript to build Standard Rules and Basic Inform incrementally again 2022-04-30 12:04:24 +01:00
Graham Nelson 2714fc7ffb
Merge pull request #14 from danieltalsky/fix-typo-quoted-comma 
Remove mistakenly-placed quoted comma
 2022-04-30 11:43:25 +01:00
David Kinder 5e421866bb Remove hard-coded fonts in RTP template HTML, replace with existing substitution sequence *4 2022-04-30 10:35:18 +01:00
David Kinder 6472eac80b Remove Windows-specific HTML_MAP_FONT_SIZE use 2022-04-30 10:20:36 +01:00
David Kinder 14f08b07f0 Use same Javascript on all platforms for paste buttons in HTML 2022-04-30 08:02:55 +01:00
David Kinder 081c3b45c4 Remove Windows specific Javascript changes from inblorb output 2022-04-30 07:39:18 +01:00
David Kinder 56800ab736 Remove indoc javascript_paste_method, always use the MacOS/Linux method on Windows 2022-04-30 06:27:37 +01:00
Daniel Talsky 40709cdf2a
Remove mistakenly-placed quoted comma 2022-04-29 18:15:46 -05:00
David Kinder 0185571ae6 Remove Windows specific CSS tweaks and use same Javascript paste logic as other platforms 2022-04-29 14:32:12 +01:00
Graham Nelson bfe5a878c5
Merge pull request #8 from BorisTheBrave/patch-1 
Update comment in Phrase Definitions.w
 2022-04-29 08:15:07 +01:00
Graham Nelson 4d75354f31
Merge pull request #7 from g051051/patch-1 
Update Imperative Module.w
 2022-04-29 08:14:44 +01:00
Graham Nelson 25899a03b2
Merge pull request #10 from Trainzack/patch-1 
Remove private repository disclaimers
 2022-04-29 08:14:15 +01:00
Eli A Zupke 4d9ef0868f
Remove private repository disclaimers 
This removes a couple of disclaimers warning of functionality that does not yet work because this repository is private. As this repository has been made public, these disclaimers no longer serve a purpose.
 2022-04-28 20:42:12 -07:00
BorisTheBrave 8d0fbdcb02
Update comment in Phrase Definitions.w 
Trivial typo fix.
 2022-04-28 23:26:47 +01:00
g051051 3b600c7c3a
Update Imperative Module.w 
Trivial typo fix.
 2022-04-28 15:33:02 -04:00
Graham Nelson c4bc6cd4ca
Merge pull request #6 from ptomato/indoc-instructions 
Add Flatpak integration target to indoc instructions
 2022-04-28 19:12:34 +01:00
Philip Chimento 6db2d3e27c Add Flatpak integration target to indoc instructions 
I found that when building a Flatpak package where the build of each
component is siloed from the others, I need to copy the integration files
into some shared location. Ideally this would be governed by a setting in
make-integration-settings.mk, but for now, add a separate target to indoc
which I will select with INDOCOPTS in my integration settings.
 2022-04-28 10:43:00 -07:00
Graham Nelson 3ea9ce725f Second attempt to reconcile links 2022-04-28 17:37:28 +01:00
Graham Nelson c5dc0ad99a Merge branch 'master' of https://github.com/ganelson/inform 2022-04-28 17:20:57 +01:00
Graham Nelson e3ca7dd3c1 Possible fix for navigation link issue between inform and inweb/intest 2022-04-28 17:20:06 +01:00
Graham Nelson d29888c491
Merge pull request #5 from DavidKinder/master 
Changes for integrating the latest build with the Windows front-end
 2022-04-28 16:48:01 +01:00
Graham Nelson b125b36f31 Advanced build to 10.1.0-beta 2022-04-28 16:45:17 +01:00
Graham Nelson e866952c2a Licence date added 2022-04-28 15:50:20 +01:00
Graham Nelson a8921686cb Fix two cases in linguistics-test 2022-04-28 15:37:22 +01:00
David Kinder 14bd96cda8
Merge branch 'ganelson:master' into master 2022-04-28 13:49:53 +01:00
Graham Nelson 376e9f3b57 Further ANL fiddle 2022-04-28 13:47:46 +01:00
David Kinder 827b4b2099
Merge branch 'ganelson:master' into master 2022-04-28 10:38:50 +01:00
Graham Nelson b8f4b2d9d9 Slightly more logging of ANL viability 2022-04-28 10:36:59 +01:00
Graham Nelson 21293a1910 Status update 2022-04-28 09:31:39 +01:00
David Kinder c955ae1aea
Merge branch 'ganelson:master' into master 2022-04-28 09:04:29 +01:00
Graham Nelson e4e338303e
Merge pull request #4 from ptomato/indentation 
Use correct tab indentation in makefiles
 2022-04-28 09:03:28 +01:00
David Kinder 0f8ca86249 Don't create Internal/Documentation as not used, and copy to Internal/Templates when making integration 2022-04-28 06:42:18 +01:00
Philip Chimento 1d64fdef8c Use correct tab indentation in makefiles 
By accident, I had used four spaces here.
 2022-04-27 21:17:20 -07:00
David Kinder 0f4d4ec7e4
Merge branch 'ganelson:master' into master 2022-04-28 04:43:03 +01:00
Graham Nelson 3561e47863 Tidied up some I6 references 2022-04-27 23:13:36 +01:00
Graham Nelson 89d3bbd731 Catching up the Advice folder with the current MacOS app content 2022-04-27 22:54:52 +01:00
Graham Nelson edcf9a9f6e Merge branch 'master' of https://github.com/ganelson/inform 2022-04-27 22:51:51 +01:00
Graham Nelson 7ab89871f4 Due consideration of the march of time 2022-04-27 22:51:17 +01:00
David Kinder 6d966d4cf0 Updated paths for Windows 2022-04-27 20:32:50 +01:00
David Kinder 4e5662fb4a Replace two occurrences of four spaces with a tab 2022-04-27 20:32:34 +01:00
Philip Chimento 79c722cde2 Update location where Linux app can be found, in README 2022-04-26 22:54:15 -07:00
Philip Chimento f00dd1a594 Integration settings for Linux 
I'll keep my inform7-ide checkout in the same root as inform, and it's now
named inform7-ide rather than gnome-inform7. (Later I may change this to
install directly into /usr though.)
 2022-04-26 22:54:15 -07:00