James R
e30d4f954b
Revert netvars after demo finishes playback
...
(Demos do not call CL_Reset BTW.)
2021-07-08 14:37:03 -07:00
SMS Alfredo
cb619fad5d
Rebase on !1307
2021-07-07 19:57:28 -05:00
SMS Alfredo
4f6450f5a8
Merge branch 'next' into youvebeenblocked
2021-07-07 17:35:17 -05:00
James R
b4fa98d2fb
Refactor hudlib hooks to hooklib
...
HUD hooks now meet the standard of hooklib. HUD registry
magic numbers are gone.
HUD hooks may also be added using addHook.
addHook('HUD', fn[, type])
hud.add still exists, but the intention is to remove it
eventually.
2021-07-07 00:23:51 -07:00
James R
ae57b6ca86
MORE MACROS
...
I just can't stop myself!
2021-07-07 00:21:08 -07:00
James R
331329306c
Refactor hook ref allocation
2021-07-06 20:27:00 -07:00
James R
a75d4a1c36
Automatically count hook values
2021-07-06 18:42:08 -07:00
James R
14c5d2c916
Warn if Lua attempted access NOLUA consvar
...
And quote variable name.
2021-07-05 18:39:12 -07:00
James R
18cbc1e370
Fix aliases bypass COM_SAFE
2021-07-05 18:31:04 -07:00
LJ Sonic
0482eacb7c
Load add-ons in the order in which the -file and -folder arguments are specified
2021-07-03 19:58:59 +02:00
James R
e24fe29114
Merge remote-tracking branch 'origin/master' into next
2021-07-02 15:55:36 -07:00
James R
3d19d5386b
Merge branch 'appveyor-fix-2' into 'master'
...
Take advantage of new Makefile in appveyor.yml
See merge request STJr/SRB2!1561
2021-07-02 18:51:29 -04:00
Shane Ellis
afa8466b30
comment cleanup
2021-06-30 01:38:04 -04:00
Shane Ellis
94441d6eee
comment cleanup
2021-06-30 01:36:28 -04:00
Shane Ellis
ee765d1043
comment cleanup
2021-06-30 01:34:21 -04:00
Shane Ellis
dad361721f
comment cleanup
2021-06-30 01:32:24 -04:00
James R
db919accd2
Appveyor: suppress real time file names
2021-06-29 20:01:14 -07:00
James R
44b82dea58
Appveyor: remove redundant CFLAGS
...
Also changed -Wno-error=implicit-fallthrough to
-Wno-implicit-fallthrough. For some reason Appveyor's
version of GCC is triggering these warnings despite the
comments, so just shut it up.
2021-06-29 19:55:14 -07:00
James R
faee657572
Appveyor: update for new Makefile
2021-06-29 19:51:15 -07:00
James R
f79e0ee540
Appveyor: remove 64-bit target
2021-06-29 19:51:15 -07:00
James R
22ab611daa
Makefile: do not automatically set WINDOWSHELL
...
According to this answer--
https://stackoverflow.com/a/45952425
--Make will always prefer a unix shell, even on Windows,
if one can be found in Path. So we can't check PATH to
determine if it's a Windows shell... this is just too much
bother.
2021-06-29 16:23:27 -07:00
James R
abdf5c101c
Makefile: report SHELL
2021-06-29 16:22:46 -07:00
James R
17e31f21ff
Merge branch 'master' into next
2021-06-29 14:42:53 -07:00
James R
6c03f9b5b3
fuck
2021-06-29 14:42:40 -07:00
CobaltBW
4f04097066
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into addplayer
2021-06-29 14:32:46 -07:00
CobaltBW
c3fa9bea0f
ri# mified: src/tazx# mofied: src/tazx# modified: src/tazx# modified: src/tazxc
2021-06-29 14:07:49 -07:00
James R
215edeb395
Merge branch 'master' into next
2021-06-29 13:58:48 -07:00
James R
c1ecfa306f
Makefile: 'dep' not 'deps'
2021-06-29 13:58:38 -07:00
Tatsuru
b597508c55
Merge branch 'key-hooks-no-return' into 'next'
...
Use return value of KeyDown and KeyUp hooks
See merge request STJr/SRB2!1559
2021-06-29 11:42:26 -04:00
James R
7d01bd38d8
Fix return value of Lua key hooks not being used
2021-06-29 01:49:53 -07:00
James R
90763d42e1
Shuffle LUA_HookKey
2021-06-29 01:49:45 -07:00
flarn2006
a5cd764772
move MT_BOXSPARKLE in the list
2021-06-26 15:42:41 -04:00
flarn2006
22272732f0
Exclude MT_BOXSPARKLE from Mario blocks
2021-06-26 14:59:56 -04:00
LJ Sonic
4af3b860fd
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into folder-next
2021-06-25 00:30:30 +02:00
James R
753522fbb6
Merge remote-tracking branch 'origin/master' into next
2021-06-24 14:14:17 -07:00
James R
1721b5b060
Merge branch 'makefile-patches-1' into 'master'
...
Some issues with the Makefile
See merge request STJr/SRB2!1553
2021-06-24 16:30:11 -04:00
James R
ed85e994a4
Remove misplaced parentheses
2021-06-22 15:49:59 -07:00
James R
c3ad5de912
Makefile: let variables be defined on Make line
...
If a variable is defined as in 'make CC=gcc-10', then that
definition overrides anything other definition in the
Makefile.
2021-06-22 15:47:48 -07:00
James R
5f4d7e3c5b
Makefile: fail if old build directories exist
...
After a checkout from before revision, old directories
such as bin/Linux64 only remain if untracked files exist
within. This may be confusing to the user. They may even
use an outdated executable if it is one of those untracked
files.
2021-06-22 15:14:42 -07:00
LJ Sonic
c319f46462
Merge branch 'hooklib-refactor' into 'next'
...
Hooklib refactor
See merge request STJr/SRB2!1307
2021-06-22 09:52:12 -04:00
GoldenTails
389cea2bc1
You probably don't want to memorise the formula to convert arccos to arcsin so
2021-06-22 01:38:37 -05:00
James R
d5146945a6
Makefile: don't automatically set WINDOWSHELL unless PATH matches Windows norms
...
This is for MSYS2, which requires unix shell commands.
2021-06-21 16:10:13 -07:00
James R
2d7a8c3c57
Makefile: use shell commands to read in Sourcefile
...
File function is not supported < Make 4.2.
2021-06-21 14:51:42 -07:00
James R
fa7a674113
Merge remote-tracking branch 'origin/master' into next
2021-06-19 19:39:15 -07:00
James R
c1aca51fc3
Fix basic warnings
2021-06-19 18:32:56 -07:00
Shane Ellis
09f445f227
Merge branch 'next' into 'addplayer'
...
# Conflicts:
# src/g_game.c
2021-06-19 20:20:45 -04:00
LJ Sonic
e3a5da3f6f
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into HEAD
...
# Conflicts:
# src/lua_hook.h
# src/lua_hooklib.c
2021-06-19 20:49:12 +02:00
LJ Sonic
28f4418132
Merge branch 'lua-inputs' into 'next'
...
Let Lua access key presses, mouse properties, and joystick properties
See merge request STJr/SRB2!1436
2021-06-19 10:40:23 -04:00
LJ Sonic
cfa48574be
Merge branch 'next' into 'lua-inputs'
...
# Conflicts:
# src/lua_script.c
2021-06-19 10:34:48 -04:00
sphere
357b64129c
Merge branch 'robo-hood-nojump' into 'next'
...
Restore toggle for Robo-Hood to not jump away from nearby players.
See merge request STJr/SRB2!1548
2021-06-18 10:00:42 -04:00
