mazmazz
|
d52f91ff7b
|
Uncomment gcs_platform
|
2018-11-12 17:16:54 -05:00 |
|
mazmazz
|
c12462e737
|
Uncomment gcs_platform defaults
|
2018-11-12 16:54:42 -05:00 |
|
mazmazz
|
42fe8b78c1
|
Add tutorialgcs variable for optional control scheme loading
|
2018-11-12 16:50:03 -05:00 |
|
mazmazz
|
36d1088d20
|
Split gclist_tutorial_check from gclist_tutorial
|
2018-11-11 09:35:15 -05:00 |
|
mazmazz
|
81b470a57e
|
num_gclist_tutorial adjustment
|
2018-11-11 09:21:54 -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
|
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
|
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 |
|
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 |
|
Monster Iestyn
|
fcee38d647
|
Merge branch 'master' into next
|
2018-11-03 12:29:04 +00:00 |
|
Monster Iestyn
|
3e4ab68264
|
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
|
3b6e8bcf09
|
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
|
a67dd8821f
|
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
|
f2623aaa90
|
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 |
|
Monster Iestyn
|
b4ef5c4060
|
Merge branch 'master' into next
|
2018-11-02 11:02:35 +00:00 |
|
Monster Iestyn
|
529f38d1e9
|
Merge branch 'patch-offsets-fix' into 'master'
Patch offsets fix
See merge request STJr/SRB2!305
|
2018-11-02 07:00:37 -04:00 |
|
Steel Titanium
|
d7a0a3c94b
|
Update copyright info on some files
|
2018-11-01 14:47:19 -04:00 |
|
Monster Iestyn
|
aa35e4206a
|
Merge branch 'master' into next
|
2018-10-31 23:10:57 +00:00 |
|
Monster Iestyn
|
c941971a0a
|
Merge branch 'mi-minor-refactoring-backport' into 'master'
MI minor refactoring
See merge request STJr/SRB2!294
|
2018-10-31 16:49:30 -04:00 |
|
Monster Iestyn
|
22734fa585
|
Merge branch 'multipatchtex-translucent-cyanpixel-fix-backport' into 'master'
Multi-patch texture support for transparency AND translucency
See merge request STJr/SRB2!293
|
2018-10-31 16:48:38 -04:00 |
|
Monster Iestyn
|
7cef400f0e
|
Fix the game crashing if you put params with no "=" for some reason in some of the SOC blocks, just stop going through the lines if that happens
|
2018-10-31 19:26:29 +00:00 |
|