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 |
|
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 |
|
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 |
|
Monster Iestyn
|
f37a573834
|
Merge branch 'master' into next
|
2018-11-02 11:02:35 +00:00 |
|
Monster Iestyn
|
ba5f5be3bb
|
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
|
5a0cfc10f4
|
Update copyright info on some files
|
2018-11-01 14:47:19 -04:00 |
|
Monster Iestyn
|
4dd5abf534
|
Merge branch 'master' into next
|
2018-10-31 23:10:57 +00:00 |
|
Monster Iestyn
|
c450a1aee2
|
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
|
61c1b12960
|
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
|
e9ea1b47d5
|
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 |
|
Latapostrophe
|
6841458546
|
got rid of the settop as well
|
2018-10-30 22:51:05 +01:00 |
|
Latapostrophe
|
799d8d2749
|
remove gL check
|
2018-10-30 22:29:28 +01:00 |
|
Latapostrophe
|
a0495142df
|
Small hud library additions
|
2018-10-30 19:40:59 +01:00 |
|
Monster Iestyn
|
22e8dd1f9d
|
now that V_FLIP's effects are always supported in V_DrawFixedPatch, there's no need for the "flip" variable anymore
|
2018-10-30 14:22:21 +00:00 |
|
Monster Iestyn
|
2fa0896fd0
|
Fix an error I made in HWR_DrawFixedPatch
|
2018-10-30 13:44:01 +00:00 |
|
Monster Iestyn
|
b022ff02a5
|
add missing SHORTs in HWR_DrawPatch and HWR_DrawCroppedPatch as well
|
2018-10-29 13:34:54 +00:00 |
|
Monster Iestyn
|
f8fd8f8ec5
|
HWR_DrawFixedPatch: Add V_OFFSET support for V_FLIP in hardware code as well, also add missing SHORTs for gpatch fields
|
2018-10-29 13:29:16 +00:00 |
|
Monster Iestyn
|
df9c3ef3cd
|
Make V_OFFSET no thing without V_NOSCALESTART, to remove any potential glitches with using it on its own
|
2018-10-29 12:36:09 +00:00 |
|
Monster Iestyn
|
834a5e6b35
|
V_DrawFixedPatch: Tinker with the left/top offsets code so that V_OFFSET can support V_FLIP
|
2018-10-29 12:06:22 +00:00 |
|
Monster Iestyn
|
32077897b6
|
Removed all remaining traces of VID_X11 code in hw_drv.h and hw_data.h, the macro is no longer used by Linux etc versions of SRB2.
Unlike the rest of the commits in this branch (as of writing), I didn't make this commit between 1 and 2 years ago, I made it right now ;)
|
2018-10-27 19:58:51 +01:00 |
|