Bart House
|
97ca83fd02
|
Merge branch 'master' into NetHack-3.7
# Conflicts:
# src/pline.c
# sys/winnt/windmain.c
# win/tty/topl.c
# win/win32/scripts/fuzzer/longtest.bat
# win/win32/scripts/fuzzer/restore.bat
# win/win32/scripts/fuzzer/runtill.bat
|
2019-07-14 23:50:54 -07:00 |
|
Bart House
|
cd1b650fb7
|
Merge branch 'NetHack-3.6'
# Conflicts:
# DEVEL/Developer.txt
# include/config.h
# include/decl.h
# include/display.h
# include/extern.h
# include/global.h
# include/hack.h
# include/patchlevel.h
# src/display.c
# src/dothrow.c
# src/makemon.c
# src/monst.c
# src/objnam.c
# src/sp_lev.c
# src/wield.c
# src/zap.c
# sys/share/pmatchregex.c
# sys/winnt/Makefile.msc
|
2019-07-14 23:36:56 -07:00 |
|
Bart House
|
a607ea2b7f
|
Revert "When fuzzing, use the number of moves as a proxy for the hour."
This reverts commit f75deae0bc.
|
2019-07-14 21:29:41 -07:00 |
|
Bart House
|
5870cb6a92
|
Revert "Added experimental feature NEW_KEYBOARD_HIT."
This reverts commit bc65112ce0.
|
2019-07-14 21:28:55 -07:00 |
|
Bart House
|
e83fcd0353
|
Revert "Improved readability of topline state management."
This reverts commit 08a1910867.
|
2019-07-14 21:28:40 -07:00 |
|
Bart House
|
05d77d91b8
|
Revert "Moved declaration of topline state to wintty.h."
This reverts commit 7bb41c797f.
|
2019-07-14 21:28:03 -07:00 |
|
Bart House
|
733e760638
|
Revert "Remove the remapping of snprintf to _snprintf when compiling with MSC."
This reverts commit 9801635f56.
|
2019-07-14 21:18:03 -07:00 |
|
Bart House
|
44d84c3163
|
Revert "Modified nhassert_failed to call impossoible."
This reverts commit 3e4a0759a3.
|
2019-07-14 21:17:39 -07:00 |
|
Bart House
|
a598428fc9
|
Revert "Fixed bug with inmore and toplin state management."
This reverts commit 0f57f0e48c.
|
2019-07-14 21:17:19 -07:00 |
|
Bart House
|
988d474d42
|
Revert "Added assertions to check toplin state."
This reverts commit 1db45c8016.
|
2019-07-14 21:16:59 -07:00 |
|
Bart House
|
04f4ac94ca
|
Revert "Comment out nhassert() calls."
This reverts commit 45a9c5eb14.
|
2019-07-14 21:16:27 -07:00 |
|
Bart House
|
fe9fc4cac1
|
Revert "Added nhassert to core."
This reverts commit 0ca299acb3.
|
2019-07-14 21:15:54 -07:00 |
|
Bart House
|
a90f9d4365
|
Revert "Fixed sign/unsigned comparisions."
This reverts commit 0e8e5aac93.
|
2019-07-14 21:15:31 -07:00 |
|
Bart House
|
177bd39646
|
Revert "Tweaks to nhassert implementation. Change to warnings on MSC build."
This reverts commit 2f3da35c68.
|
2019-07-14 21:15:01 -07:00 |
|
Bart House
|
ec05e1ec70
|
Revert "Fix compiler warnings."
This reverts commit 90f5aa91b7.
|
2019-07-14 21:13:43 -07:00 |
|
Bart House
|
2df1b179ca
|
Revert "Removing assertion that does not hold under all scenarios."
This reverts commit c44ad5645d.
|
2019-07-14 21:13:18 -07:00 |
|
Bart House
|
f7c956c35a
|
Revert "Adding ptr_array data structure."
This reverts commit e665d3b850.
|
2019-07-14 21:12:59 -07:00 |
|
Bart House
|
1c5b28e7f9
|
Revert "Re-worked tty_putmsgistory and tty_getmsghistory."
This reverts commit 1d0b8b4680.
|
2019-07-14 21:12:21 -07:00 |
|
Bart House
|
9bc190d2fc
|
Revert "Add stopping in the debugger when nhassert() is hit in the windows port."
This reverts commit 5d2872dd4f.
|
2019-07-14 21:11:41 -07:00 |
|
Bart House
|
454419e6c1
|
Revert "Removed the older version of tty_putmsghistory and tty_getmsghistory."
This reverts commit aa95e20ca7.
|
2019-07-14 21:10:51 -07:00 |
|
Bart House
|
4c1c247028
|
Revert "Fuzzer improvements."
This reverts commit 435f1c4626.
|
2019-07-14 21:10:39 -07:00 |
|
Bart House
|
5d2181ced3
|
Revert "Fix build issue on linux."
This reverts commit d33160d069.
|
2019-07-14 21:10:27 -07:00 |
|
Bart House
|
0f0b6c5aab
|
Revert "Tweaks to fuzzer scripts."
This reverts commit cd375064dd.
|
2019-07-14 21:10:07 -07:00 |
|
Bart House
|
3adaa79858
|
Revert "Revert type change of lit which would break code."
This reverts commit cc1219b5a8.
|
2019-07-14 21:09:38 -07:00 |
|
Bart House
|
a66fed3d5a
|
Revert "Move fuzzer_start, fuzzer_stop and fuzzer_log to pline.c"
This reverts commit d9da488c35.
|
2019-07-14 21:09:29 -07:00 |
|
Bart House
|
340ec01caf
|
Revert "Remove dead code."
This reverts commit 5428d73287.
|
2019-07-14 21:09:16 -07:00 |
|
Bart House
|
a4317b738a
|
Revert "Fix typo in formatting string."
This reverts commit fa5c499268.
|
2019-07-14 21:09:07 -07:00 |
|
nhmall
|
e933882eb8
|
fixes entry
|
2019-07-14 18:20:17 -04:00 |
|
nhmall
|
bd9709ad77
|
remove STATIC_DCL, STATIC_OVL, STATIC_VAR, STATIC_PTR
|
2019-07-14 18:15:49 -04:00 |
|
Bart House
|
6a75dc5dcf
|
Fix build break in pline.c
|
2019-07-14 14:49:31 -07:00 |
|
Bart House
|
ed5450a1a9
|
Merge branch 'master' into NetHack-3.7
|
2019-07-14 14:41:52 -07:00 |
|
Bart House
|
883745a3c4
|
Merge branch 'NetHack-3.6'
# Conflicts:
# include/extern.h
# src/allmain.c
# win/tty/topl.c
|
2019-07-14 14:41:11 -07:00 |
|
nhmall
|
865b301f0d
|
another STATIC_VAR bit in sys/msdos
|
2019-07-14 17:34:47 -04:00 |
|
nhmall
|
6688053802
|
remove STATIC_DCL, STATIC_OVL, STATIC_VAR, STATIC_PTR from win/tty
|
2019-07-14 17:33:44 -04:00 |
|
Bart House
|
fa5c499268
|
Fix typo in formatting string.
|
2019-07-14 14:31:30 -07:00 |
|
Bart House
|
5428d73287
|
Remove dead code.
|
2019-07-14 14:31:00 -07:00 |
|
Bart House
|
d9da488c35
|
Move fuzzer_start, fuzzer_stop and fuzzer_log to pline.c
|
2019-07-14 14:30:38 -07:00 |
|
nhmall
|
a0c38bd76c
|
remove STATIC_DCL, STATIC_OVL, STATIC_VAR, STATIC_PTR from sys/winnt
|
2019-07-14 17:30:26 -04:00 |
|
nhmall
|
8c20c52ecf
|
remove STATIC_DCL, STATIC_OVL, STATIC_VAR, STATIC_PTR from sys/share
|
2019-07-14 17:28:48 -04:00 |
|
nhmall
|
2ae6d72765
|
remove STATIC_DCL, STATIC_OVL, STATIC_VAR, STATIC_PTR from sys/msdos
|
2019-07-14 17:26:52 -04:00 |
|
nhmall
|
0d34f43830
|
remove STATIC_DCL, STATIC_OVL, STATIC_VAR, STATIC_PTR from core
|
2019-07-14 17:24:58 -04:00 |
|
Bart House
|
cc1219b5a8
|
Revert type change of lit which would break code.
Cast lit (which will be 1) to unsigned int to remove warning.
|
2019-07-14 14:02:05 -07:00 |
|
Bart House
|
b5b2f6fc74
|
Tweaks to fuzzer batch scripts.
|
2019-07-14 13:39:58 -07:00 |
|
Bart House
|
e3b5e7f95a
|
Merge branch 'master' into NetHack-3.7
|
2019-07-14 12:25:08 -07:00 |
|
Bart House
|
ca683201f6
|
Merge branch 'NetHack-3.6'
|
2019-07-14 12:24:24 -07:00 |
|
Bart House
|
cd375064dd
|
Tweaks to fuzzer scripts.
|
2019-07-14 12:13:19 -07:00 |
|
nhmall
|
1e47fe61b9
|
stale code
|
2019-07-14 12:17:47 -04:00 |
|
nhmall
|
041a9ad9c1
|
Merge branch 'master' into NetHack-3.7
|
2019-07-14 09:57:32 -04:00 |
|
nhmall
|
ec1b77ff80
|
Merge branch 'NetHack-3.6'
|
2019-07-14 09:39:24 -04:00 |
|
Bart House
|
d33160d069
|
Fix build issue on linux.
|
2019-07-14 02:00:21 -07:00 |
|