Commit Graph

7006 Commits

Author SHA1 Message Date
nhmall
e3b0badbdf Merge branch 'NetHack-3.6.0' 2018-05-15 06:42:13 -04:00
nhmall
504f0a4510 integrate aklys feature introduced in 3.6.1 into 3.6.x display 2018-05-15 06:41:06 -04:00
nhmall
95aa480850 Merge branch 'NetHack-3.6.0' 2018-05-15 06:37:16 -04:00
nhmall
5d410a3457 remove entry from fixes37.0 cherry picked into minor dev branch
this display-support for a 3.6.1 feature was originally committed
to master but it might as well accompany the 3.6 line changes
that are already there.
2018-05-15 06:32:54 -04:00
nhmall
64a771da4b add prototype
(cherry picked from commit 438cfd3815)
2018-05-15 06:31:22 -04:00
nhmall
cc1d43fad4 integrate aklys feature introduced in 3.6.1 into display
(cherry picked from commit 3fe8325f14)
2018-05-15 06:29:40 -04:00
nhmall
8ee62a9757 Merge branch 'NetHack-3.6.0' 2018-05-15 01:30:59 -04:00
nhmall
340ff13a1d Merge branch 'win-minor' into NetHack-3.6.0 2018-05-15 01:30:31 -04:00
nhmall
80218a7855 boundary bit 2018-05-15 01:29:36 -04:00
nhmall
e058df508e Merge branch 'NetHack-3.6.0' 2018-05-15 01:21:54 -04:00
nhmall
aaddab5450 catch up on fixes36.2 updates 2018-05-15 01:10:32 -04:00
nhmall
f36c3ae1ab Merge branch 'win-minor' into NetHack-3.6.0 2018-05-15 00:27:11 -04:00
nhmall
589bdb4e2d Merge branch 'win-tty-status' into win-minor 2018-05-15 00:26:26 -04:00
nhmall
26654ef079 a few cut-and-paste errors 2018-05-14 22:25:25 -04:00
nhmall
2e8b69d5ff some tty per field rendering and optimization 2018-05-14 21:13:37 -04:00
nhmall
fba7c06fd6 put back the functionality of commandline --debug:immediateflips overwritten recently 2018-05-14 21:09:01 -04:00
Bart House
1f877dbca1 Additional changes to xputc_core() and early_raw_print() to manage
the cursor position correctly.  This is needed to handle raw printing
correctly.  Added check for when we might be running off the bottom
of the screen when handling msmsg().  Added runtime checks to keep
cursor always within bounds.
2018-05-13 20:46:43 -07:00
Bart House
53c7cb8c78 Changes to xputc_core to handle cursor correctly. 2018-05-13 18:54:20 -07:00
nhmall
860b9c35c1 testing build with STATUS_HILITES 2018-05-13 21:24:14 -04:00
nhmall
2b8ac8af9e missing stubs for NetHackW.exe 2018-05-13 16:42:11 -04:00
Bart House
0afd2570cb Removing temporary debugging code and fixing compiler warnings. 2018-05-13 13:29:13 -07:00
Bart House
3dbbd188d9 Fixing typo. 2018-05-13 12:49:52 -07:00
nhmall
0d23e7b44d Merge branch 'tty-status' into win-tty-status 2018-05-13 15:21:46 -04:00
nhmall
3b2f7e86e0 more status updates
- prevent an overflow
- add make_things_fit()
2018-05-13 15:19:39 -04:00
Bart House
650d5230ec Fix memory leak. See bug 1169. 2018-05-12 19:45:16 -07:00
PatR
473dffac63 Revert "fix #H7140 - list MSGTYPE values shows empty strings"
This reverts commit 39057ec754.

To be checked in to NetHack-3.6.0 first and subsequently merged back
here.
2018-05-12 18:53:21 -07:00
PatR
f89968a973 fix #H7140 - list MSGTYPE values shows empty strings
The 'O' menu's 'list' for MSGTYPE settings showed truncated versions
of really long message strings but didn't show anything except the
hide/stop/norep setting for ordinary length ones.  3.6.0 showed the
latter correctly but suffered buffer overflow for the former; the
fix for that had a typo/thinko in it.
2018-05-12 18:50:51 -07:00
PatR
a1f78732c5 Revert "fix "a Vlad the Impaler""
This reverts commit 6a056bbe77.

To be committed to NetHack-3.6.0 first and subsequently merged
back here.
2018-05-12 18:48:32 -07:00
PatR
45c59857f7 fix "a Vlad the Impaler"
Killing Vlad while he was in bat/fog cloud/wolf form gave poorly
worded feedback when he reverted to vampire form.
2018-05-12 18:47:34 -07:00
Bart House
039687cf5f Fix for bug 324 (aka H4216). We now will use nhraykey by default if the
players keyboard layout is non-english.  nhraykey properly handles
non-english input.  We also now support changing altkeyhandler in game.
2018-05-12 18:06:23 -07:00
Bart House
1d31a49661 Some nttty.c clean-up. 2018-05-12 15:58:44 -07:00
Bart House
3467b9f087 Added ntassert() mechanism for Windows based port use. 2018-05-12 13:59:06 -07:00
nhmall
99474c864f Merge branch 'tty-status' into win-tty-status 2018-05-12 14:44:12 -04:00
nhmall
149fc5a4dd empty field suppression caught condition values unintentionally 2018-05-12 14:42:19 -04:00
nhmall
3598fcc929 more status handling updates
Suppress unneeded spaces from a couple of fields
	BL_LEVELDESC	- trailing spaces.
	BL_CAP		- it only contains a space
2018-05-12 14:10:52 -04:00
PatR
6a056bbe77 fix "a Vlad the Impaler"
Killing Vlad while he was in bat/fog cloud/wolf form gave poorly
worded feedback when he reverted to vampire form.
2018-05-12 06:41:57 -07:00
nhmall
9a87064cca some build fixes for compile issues reported 2018-05-12 06:57:34 -04:00
PatR
39057ec754 fix #H7140 - list MSGTYPE values shows empty strings
The 'O' menu's 'list' for MSGTYPE settings showed truncated versions
of really long message strings but didn't show anything except the
hide/stop/norep setting for ordinary length ones.  3.6.0 showed the
latter correctly but suffered buffer overflow for the former; the
fix for that had a typo/thinko in it.
2018-05-12 01:05:29 -07:00
nhmall
ba057ef3de condition shrinkage when required 2018-05-12 02:18:42 -04:00
nhmall
a3ba46d732 remove some debug code 2018-05-12 01:10:43 -04:00
nhmall
d0e508241b missing return value 2018-05-12 01:07:54 -04:00
nhmall
dd04f5fcb5 more tty-status updates 2018-05-12 01:04:57 -04:00
nhmall
2dbb7c70c9 Merge branch 'NetHack-3.6.0' 2018-05-10 20:30:43 -04:00
nhmall
04c85aa59d update files.c with testinglog 2018-05-10 18:54:58 -04:00
nhmall
8c2dc7bb1c add some logging to debug 2018-05-10 18:48:02 -04:00
nhmall
702154529f provide some debug developer controls - part 1 2018-05-10 10:05:29 -04:00
nhmall
1a19e449c7 Revert "some cross platform testing"
This reverts commit 3d1e086648.
2018-05-09 18:51:49 -04:00
nhmall
4dd535cbd2 cross platform testing 2018-05-09 18:47:19 -04:00
nhmall
3d1e086648 some cross platform testing 2018-05-09 18:31:18 -04:00
nhmall
7988bdff1d Merge branch 'barthouse-bugH7132' into NetHack-3.6.0 2018-05-09 18:07:52 -04:00