mazmazz
|
3be9981231
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-11 09:22:06 -05:00 |
|
mazmazz
|
fd83e1ed5c
|
num_gclist_tutorial adjustment
|
2018-11-11 09:21:54 -05:00 |
|
mazmazz
|
54f04fa5cf
|
Tutorial control message adjustments
|
2018-11-11 09:15:43 -05:00 |
|
mazmazz
|
ea9f499936
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-11 08:57:07 -05:00 |
|
mazmazz
|
181d13fe73
|
gclist_tutorial include lookup/lookdown for conflict reasons
|
2018-11-11 08:56:40 -05:00 |
|
mazmazz
|
80b19ff566
|
gclist adjustments
|
2018-11-11 08:52:21 -05:00 |
|
mazmazz
|
9ff27ebbae
|
gclist adjustments
|
2018-11-11 08:51:51 -05:00 |
|
mazmazz
|
6be583eac6
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-11 08:46:06 -05:00 |
|
mazmazz
|
3f72e1bacf
|
New gclists and const modifier; added tutorialmode declarations to this branch
|
2018-11-11 08:44:08 -05:00 |
|
mazmazz
|
9f1c40f881
|
G_CopyControls and G_GetControlScheme adjustment (take input list of gc's to check)
|
2018-11-11 08:21:11 -05:00 |
|
mazmazz
|
85bcf6d389
|
Tutorial mode support for control switching
|
2018-11-11 08:20:08 -05:00 |
|
mazmazz
|
75fc91644b
|
G_CopyControls and G_GetControlScheme adjustment (take input list of gc's to check)
|
2018-11-11 08:19:44 -05:00 |
|
mazmazz
|
1e00381075
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-10 17:30:33 -05:00 |
|
mazmazz
|
775b34e3f2
|
Made gamecontrol tables more portable
* G_DefineDefaultControls
* G_GetControlScheme
* G_CopyControls
* G_SaveKeySetting
* gamecontrolschemes_e
|
2018-11-10 17:26:30 -05:00 |
|
mazmazz
|
727ca143b5
|
Branch G_Controldefault into FPS and PLATFORM
|
2018-11-10 13:28:10 -05:00 |
|
Monster Iestyn
|
896de73c60
|
....ow this slipup hurt me badly
|
2018-11-10 16:00:33 +00:00 |
|
Monster Iestyn
|
d456a5362c
|
Whoops, mucked up this part of the conflict resolving
|
2018-11-10 15:55:09 +00:00 |
|
Monster Iestyn
|
a8291c122a
|
adding lua_maplib.c comments for new slope-related userdata types
|
2018-11-10 15:47:04 +00:00 |
|
Monster Iestyn
|
268bde3fdf
|
Merge branch 'public_next'
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
# src/dehacked.c
# src/g_game.h
# src/hardware/hw_draw.c
# src/hardware/hw_main.c
# src/lua_baselib.c
# src/lua_hook.h
# src/lua_hooklib.c
# src/lua_hudlib.c
# src/lua_libs.h
# src/lua_maplib.c
# src/lua_script.c
# src/m_misc.h
# src/p_mobj.c
# src/s_sound.c
# src/sdl12/mixer_sound.c
# src/w_wad.c
|
2018-11-10 15:41:57 +00:00 |
|
Monster Iestyn
|
31301660cd
|
Merge branch 'master' into next
|
2018-11-10 14:27:27 +00:00 |
|
Monster Iestyn
|
925a56ad98
|
Merge branch 'opengl-improvements-backport' into 'master'
Opengl improvements backport
See merge request STJr/SRB2!304
|
2018-11-10 09:25:18 -05:00 |
|
Monster Iestyn
|
de6cb124cb
|
Merge branch 'readme-update' into 'master'
Update readme
See merge request STJr/SRB2!313
|
2018-11-10 08:39:02 -05:00 |
|
Monster Iestyn
|
e01c7ae743
|
Merge branch 'copyright-info-update' into 'master'
Update copyright info
See merge request STJr/SRB2!309
|
2018-11-10 08:33:09 -05:00 |
|
mazmazz
|
a542006ae8
|
Hide Tutorial menu option if no tutorialmap
|
2018-11-10 01:17:11 -05:00 |
|
Steel Titanium
|
038dfb4aff
|
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into readme-update
|
2018-11-09 18:24:42 -05:00 |
|
Monster Iestyn
|
4b8232d777
|
Merge branch 'master' into next
|
2018-11-09 23:18:14 +00:00 |
|
Alam Arias
|
1c22c6a1f9
|
Merge pull request #320 from monster-psychic-cat/remote_view_fixes
Minor remote viewpoint bugfixes.
|
2018-11-09 16:09:20 -05:00 |
|
Steel Titanium
|
e937d1bacb
|
Update readme
|
2018-11-09 16:01:29 -05:00 |
|
Monster Iestyn
|
b3befae143
|
Merge branch 'public-op-nightsbumper-fix' into 'next'
Objectplace: Fix NiGHTS bumper angle being reset when WRITETHINGS
See merge request STJr/SRB2!299
|
2018-11-09 12:11:11 -05:00 |
|
Monster Iestyn
|
17223aa520
|
Merge branch 'master' into next
|
2018-11-09 16:09:49 +00:00 |
|
Monster Iestyn
|
f974bb96ac
|
Merge branch 'music-clean' into 'master'
Some code cleanup.
See merge request STJr/SRB2!298
|
2018-11-09 10:58:57 -05:00 |
|
Monster Iestyn
|
df28e2b2a6
|
Merge branch 'no-hasslope' into next
yes I'm an idiot for rushing things like this
|
2018-11-08 21:25:51 +00:00 |
|
Monster Iestyn
|
98fd9f8e42
|
WHY DID I FORGET THIS
|
2018-11-08 21:22:45 +00:00 |
|
Monster Iestyn
|
316cf27a7a
|
Merge branch 'no-hasslope' into 'next'
No hasslope
See merge request STJr/SRB2!312
|
2018-11-08 16:20:28 -05:00 |
|
Monster Iestyn
|
82c738ea4b
|
Remove hasslope, per colette's warning about it potentially causing desyncs
|
2018-11-08 21:13:58 +00:00 |
|
Monster Iestyn
|
d8f3a20e65
|
Merge branch 'Playerquit_hook' into 'next'
"PlayerQuit" Lua Hook
See merge request STJr/SRB2!127
|
2018-11-08 15:53:35 -05:00 |
|
Monster Iestyn
|
a9cfd6a781
|
Merge branch 'lua-slopes' into 'next'
Lua support for slopes
See merge request STJr/SRB2!307
|
2018-11-08 15:52:44 -05:00 |
|
Monster Iestyn
|
91113cb79c
|
Merge branch 'master' into next
|
2018-11-08 20:50:58 +00:00 |
|
Monster Iestyn
|
7cc5caf69c
|
Merge branch 'winsock-error-handling-fixes' into 'master'
Winsock error handling fixes
See merge request STJr/SRB2!303
|
2018-11-08 15:49:35 -05:00 |
|
Alam Arias
|
b8c4d7ddff
|
Merge pull request #321 from GoldenTails/next-add-a-lua-variable-to-ultimate-mode-so-people-can-check-it
Add Lua Ultimate Mode global variable so people can use it.
|
2018-11-07 17:53:20 -05:00 |
|
TCLScrufflet
|
1602904011
|
Merge branch 'master' into remote_view_fixes
|
2018-11-07 17:57:49 -02:00 |
|
GoldenTails
|
a3bc7ddfa0
|
Add Lua Ultimate Mode global variable so people can use it.
|
2018-11-06 18:09:45 -06:00 |
|
MPC
|
1cc8619c9e
|
Minor remote viewpoint bugfixes.
|
2018-11-05 20:40:51 -02:00 |
|
mazmazz
|
eec3f630cf
|
Merge remote-tracking branch 'origin/master' into tutorial-time
|
2018-11-03 10:58:11 -04:00 |
|
mazmazz
|
15020ae01d
|
Removed TextPrompt-specific code for text-prompt branch
|
2018-11-03 10:57:43 -04:00 |
|
Monster Iestyn
|
02b14959cc
|
Merge branch 'master' into next
|
2018-11-03 12:29:04 +00:00 |
|
Monster Iestyn
|
924c3164b0
|
Merge branch 'soc-sanitising-the-sequel' into 'next'
SOC sanitising the sequel!
See merge request STJr/SRB2!308
|
2018-11-03 08:18:16 -04:00 |
|
Monster Iestyn
|
86ad6de35b
|
Merge branch 'file-loading-hotfix' into 'master'
File loading hotfix
See merge request STJr/SRB2!310
|
2018-11-02 19:03:59 -04:00 |
|
Monster Iestyn
|
0f37411e2b
|
Make sure handles of files opened by W_LoadWadFile are closed if we abort loading the files for whatever reason.
ESPECIALLY if the file is already loaded in SRB2, that's just silly.
|
2018-11-02 20:48:12 +00:00 |
|
Monster Iestyn
|
7b268d15b1
|
Merge branch 'lua-hudlib-addition' into 'next'
Lua: hud.enabled and v.getLocalTransFlag()
See merge request STJr/SRB2!306
|
2018-11-02 14:29:02 -04:00 |
|