1
0
Fork 0
mirror of https://github.com/ganelson/inform.git synced 2024-07-03 07:24:58 +03:00
Commit graph

1548 commits

Author SHA1 Message Date
Graham Nelson 8194bee4d4 Began revisions to facilitate use of per-platform CSS 2022-05-04 23:23:12 +01:00
Graham Nelson 6ff3fd8db9 Merge branch 'master' of https://github.com/ganelson/inform 2022-05-04 08:03:09 +01:00
Graham Nelson f61aa8b6df Better finding of extensions on case-sensitive file systems 2022-05-04 08:02:34 +01:00
Zed Lopez 37d589e6b3
Merge branch 'ganelson:master' into master 2022-05-03 23:24:50 -07:00
Zed Lopez 6a75e47782 doc fix to WI 18.29: while in <room> -> while location is <room> 2022-05-03 23:23:56 -07:00
Graham Nelson 16ed0ae717
Merge pull request #25 from zedlopez/cant_eat_other_peoples_food_patch
patch to can't eat other people's food rule
2022-05-03 11:17:26 +01:00
Graham Nelson a751fed71c Made extension recognition more understanding of mixed-case names 2022-05-03 11:02:57 +01:00
Zed Lopez 6512ed0823 patch to can't eat other people's food rule 2022-05-02 21:15:11 -07:00
Graham Nelson 31c156b2b5 Fix for bracketed negative numbers in I6 assembly inclusion bug 2022-05-02 22:59:04 +01:00
Graham Nelson 8ce998ab64
Merge pull request #23 from ptomato/retrospective-fixes
Retrospective fixes
2022-05-02 18:22:42 +01:00
Graham Nelson 5593cea148 Equipped the retrospective builds with contemporary website/interpreter templates 2022-05-02 18:19:50 +01:00
Graham Nelson d1b2908d26
Merge pull request #24 from curiousdannii/parchment
Fix Parchment bug that would sometimes stall when starting
2022-05-02 09:10:41 +01:00
Dannii Willis 51f16bd0c6 Fix Parchment bug that would sometimes stall when starting 2022-05-02 11:01:52 +10:00
Philip Chimento 4b2f55e4c1 Move I6T files in 6L02 retrospective
The 6L02 compiler looks for these files in the Reserved/ subfolder of the
folder that is given with the -rules switch on the command line.
2022-05-01 16:34:03 -07:00
Philip Chimento 1ed898bd43 Alias PLATFORM_LINUX to PLATFORM_UNIX in retrospective sources
PLATFORM_LINUX is new in Inform 10.1. In the retrospective sources,
defining PLATFORM_LINUX does nothing, meaning that in the absence of a
platform definition, PLATFORM_MACOSX will take effect. Add a check for
PLATFORM_LINUX to the start of each of the ni.c sources, and treat it the
same as PLATFORM_UNIX.

(These files are generated and technically not supposed to be edited, but
the source code for old versions of Inform is now frozen, so they are not
going to be generated again.)
2022-05-01 16:26:04 -07:00
Graham Nelson 10409f1f07
Merge pull request #21 from andrewschultz/inb-d-typos
typos found in INB*/IND* directories
2022-05-01 15:58:57 +01:00
Graham Nelson 8ea67dccb2
Merge pull request #22 from andrewschultz/inter-typos-220501
inter/*/*.w typos
2022-05-01 15:56:50 +01:00
Graham Nelson d6f6682b5a
Merge pull request #20 from andrewschultz/services-typos
typos in services/*/*.w
2022-05-01 15:55:56 +01:00
Andrew 448a73d168 inter/*/*.w typos 2022-05-01 08:47:54 -05:00
Andrew 6f4fecec72 typos in services/*/*.w 2022-05-01 08:25:50 -05:00
Andrew 8e16198a02 typos found in INB*/IND* directories 2022-05-01 08:12:40 -05:00
Graham Nelson 7974df5af2 Tidied typos 2022-04-30 22:32:10 +01:00
Graham Nelson 9e9acfa961
Merge pull request #16 from andrewschultz/inform7-typos
inform7/** typos
2022-04-30 22:26:10 +01:00
Graham Nelson 09d7f8df0a
Merge pull request #18 from ptomato/linux-linker-flags
Linux linker flags
2022-04-30 22:22:26 +01:00
Philip Chimento e811fc28d2 Put linker flags at the end of the linker command line
On some systems, the libraries must come after the object files that they
reference.
2022-04-30 13:21:29 -07:00
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
Andrew 8721f499ae inform7/** typos 2022-04-30 10:00:24 -05: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