mazmazz
|
4e004571b6
|
Merge branch 'tutorial-time' into tutorial-time-firstprompt
|
2018-11-11 09:37:36 -05:00 |
|
mazmazz
|
54265477b4
|
Check reduced control set for tutorial time; change the entire tutorial control set when prompted
|
2018-11-11 09:37:19 -05:00 |
|
mazmazz
|
4d8f0ff04d
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-11 09:35:27 -05:00 |
|
mazmazz
|
36d1088d20
|
Split gclist_tutorial_check from gclist_tutorial
|
2018-11-11 09:35:15 -05:00 |
|
mazmazz
|
2ec94de082
|
Merge branch 'tutorial-time' into tutorial-time-firstprompt
|
2018-11-11 09:22:54 -05:00 |
|
mazmazz
|
0e0164cb70
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-11 09:22:06 -05:00 |
|
mazmazz
|
81b470a57e
|
num_gclist_tutorial adjustment
|
2018-11-11 09:21:54 -05:00 |
|
mazmazz
|
b60335fd57
|
Merge branch 'tutorial-time' into tutorial-time-firstprompt
|
2018-11-11 09:21:10 -05:00 |
|
mazmazz
|
bef8f2dbce
|
Tutorial control message adjustments
|
2018-11-11 09:15:43 -05:00 |
|
mazmazz
|
e009919f31
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-11 08:57:07 -05:00 |
|
mazmazz
|
99a5f7d431
|
gclist_tutorial include lookup/lookdown for conflict reasons
|
2018-11-11 08:56:40 -05:00 |
|
mazmazz
|
c4244802e2
|
gclist adjustments
|
2018-11-11 08:52:21 -05:00 |
|
mazmazz
|
179bdf4cb3
|
gclist adjustments
|
2018-11-11 08:51:51 -05:00 |
|
mazmazz
|
6d6776a4d8
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-11 08:46:06 -05:00 |
|
mazmazz
|
7bd7c001d5
|
New gclists and const modifier; added tutorialmode declarations to this branch
|
2018-11-11 08:44:08 -05:00 |
|
mazmazz
|
880a1d4681
|
G_CopyControls and G_GetControlScheme adjustment (take input list of gc's to check)
|
2018-11-11 08:21:11 -05:00 |
|
mazmazz
|
86168a1d80
|
Tutorial mode support for control switching
|
2018-11-11 08:20:08 -05:00 |
|
mazmazz
|
b222bd61c9
|
G_CopyControls and G_GetControlScheme adjustment (take input list of gc's to check)
|
2018-11-11 08:19:44 -05:00 |
|
mazmazz
|
88e52640ad
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-10 17:30:33 -05:00 |
|
mazmazz
|
762944d0a7
|
Made gamecontrol tables more portable
* G_DefineDefaultControls
* G_GetControlScheme
* G_CopyControls
* G_SaveKeySetting
* gamecontrolschemes_e
|
2018-11-10 17:26:30 -05:00 |
|
mazmazz
|
67bff00e9b
|
Branch G_Controldefault into FPS and PLATFORM
|
2018-11-10 13:28:10 -05:00 |
|
Monster Iestyn
|
89eafc59e7
|
....ow this slipup hurt me badly
|
2018-11-10 16:00:33 +00:00 |
|
Monster Iestyn
|
778a2b1dc7
|
Whoops, mucked up this part of the conflict resolving
|
2018-11-10 15:55:09 +00:00 |
|
Monster Iestyn
|
027ad8aca9
|
adding lua_maplib.c comments for new slope-related userdata types
|
2018-11-10 15:47:04 +00:00 |
|
Monster Iestyn
|
7989e9a482
|
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
|
c44b742112
|
Merge branch 'master' into next
|
2018-11-10 14:27:27 +00:00 |
|
Monster Iestyn
|
24bc2a04fa
|
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
|
8e507f6e36
|
Merge branch 'readme-update' into 'master'
Update readme
See merge request STJr/SRB2!313
|
2018-11-10 08:39:02 -05:00 |
|
Monster Iestyn
|
3a926cff5a
|
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
|
59417ecd4a
|
WIP: First-time tutorial prompt
|
2018-11-10 02:30:21 -05:00 |
|
mazmazz
|
d406809ee8
|
Hide Tutorial menu option if no tutorialmap
|
2018-11-10 01:17:11 -05:00 |
|
Steel Titanium
|
8d714f8522
|
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into readme-update
|
2018-11-09 18:24:42 -05:00 |
|
Monster Iestyn
|
5532882303
|
Merge branch 'master' into next
|
2018-11-09 23:18:14 +00:00 |
|
Alam Arias
|
cdf6ef7cc5
|
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
|
25bbfe0610
|
Update readme
|
2018-11-09 16:01:29 -05:00 |
|
Monster Iestyn
|
ebb27b1c3c
|
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
|
32a2c6dc3c
|
Merge branch 'master' into next
|
2018-11-09 16:09:49 +00:00 |
|
Monster Iestyn
|
74f221d73f
|
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
|
c1a4a62d87
|
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
|
7d31440ca6
|
WHY DID I FORGET THIS
|
2018-11-08 21:22:45 +00:00 |
|
Monster Iestyn
|
150fe29988
|
Merge branch 'no-hasslope' into 'next'
No hasslope
See merge request STJr/SRB2!312
|
2018-11-08 16:20:28 -05:00 |
|
Monster Iestyn
|
8440664c2f
|
Remove hasslope, per colette's warning about it potentially causing desyncs
|
2018-11-08 21:13:58 +00:00 |
|
Monster Iestyn
|
1200793a94
|
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
|
5f7c333625
|
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
|
68305c3b18
|
Merge branch 'master' into next
|
2018-11-08 20:50:58 +00:00 |
|
Monster Iestyn
|
8c2a163f5d
|
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
|
899452e9bc
|
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
|
2c73512a23
|
Merge branch 'master' into remote_view_fixes
|
2018-11-07 17:57:49 -02:00 |
|
GoldenTails
|
71f97a4a92
|
Add Lua Ultimate Mode global variable so people can use it.
|
2018-11-06 18:09:45 -06:00 |
|
MPC
|
eef8119123
|
Minor remote viewpoint bugfixes.
|
2018-11-05 20:40:51 -02:00 |
|