Jaime Passos
|
de5e44cfbc
|
Merge remote-tracking branch 'upstream/master' into gl_shaders
|
2019-06-10 16:21:46 -03:00 |
|
Jaime Passos
|
1cfdd07ee0
|
gl4
|
2019-03-17 22:27:50 -03:00 |
|
mazmazz
|
6cf05a4613
|
Implement MUSICINTERFADEOUT level header
|
2019-03-15 01:05:52 -04:00 |
|
mazmazz
|
bd9e42ce6e
|
Merge branch 'public-gl-next' into public-musicplus-inter
|
2019-03-14 23:42:16 -04:00 |
|
mazmazz
|
93626c2293
|
Merge remote-tracking branch 'public-gl/next' into public-musicplus-core
|
2019-03-13 19:45:07 -04:00 |
|
Steel Titanium
|
0aa965c59f
|
How did I forget about this
|
2019-01-26 23:22:30 -05:00 |
|
TehRealSalt
|
0d1c501664
|
Update the SP menu stuff to use MAXSKINS
Co-authoered-by: Steel Titanium (steeltitanium1@gmail.com>
|
2019-01-26 00:22:05 -05:00 |
|
Steel Titanium
|
827461cc36
|
Support for per-map intermission music
|
2019-01-02 05:15:23 -05:00 |
|
mazmazz
|
b7bb570f97
|
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
|
2019-01-01 10:41:40 -05:00 |
|
mazmazz
|
c2dc5788bf
|
Merge remote-tracking branch 'public-gl/next' into 2122-version
|
2018-12-24 17:30:59 -05:00 |
|
Monster Iestyn
|
31c6b6ef77
|
remove these unnecessary typedefs for assignments to variables that are actually already boolean to begin with, since the rhs resolves to a boolean anyway
|
2018-12-24 19:37:52 +00:00 |
|
Monster Iestyn
|
936b9ecebc
|
Fix disablespeedajdust in SOCs being set like an integer value instead of a boolean
|
2018-12-24 19:29:54 +00:00 |
|
Latapostrophe
|
b7d7472a88
|
Merge branch 'next' into SRB2-CHAT
|
2018-12-23 22:53:24 +01:00 |
|
Latapostrophe
|
1b61e15b1b
|
Merge branch 'master' into SRB2-CHAT
|
2018-12-23 10:26:08 +01:00 |
|
Digiku
|
bea76aa4bf
|
Merge branch 'save-override' into 'next'
Feature: Save override for level header
See merge request STJr/SRB2!392
|
2018-12-19 13:04:41 -05:00 |
|
TehRealSalt
|
9e596d15af
|
Save override for level header
Kind of like 2.2's, but with backwards-compatability with 2.1
|
2018-12-16 20:09:59 -05:00 |
|
TehRealSalt
|
cc22ef3f05
|
Add deprecation warning to admin
|
2018-12-16 16:05:18 -05:00 |
|
Latapostrophe
|
25e6d5388c
|
merge conflict
|
2018-12-16 16:48:15 +01:00 |
|
mazmazz
|
b84470ec51
|
Fix savegamename being improperly built due to missing null char after copying timeattackfolder
|
2018-12-13 12:01:07 -05:00 |
|
Monster Iestyn
|
33c1ac33f5
|
Merge branch 'next' into 21-version
# Conflicts:
# src/d_netcmd.c
|
2018-12-02 15:45:07 +00:00 |
|
TehRealSalt
|
c70cf5908d
|
IsPlayerAdmin support, since admin was removed
# Conflicts:
# src/lua_baselib.c
|
2018-11-29 07:12:15 -06:00 |
|
Wolfy
|
b8ce51bff2
|
Multiple admins
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
|
2018-11-29 06:46:59 -06:00 |
|
Monster Iestyn
|
1b2aea81dc
|
Merge branch 'master' into next
|
2018-11-25 20:39:17 +00:00 |
|
mazmazz
|
ea7162a76a
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
Monster Iestyn
|
66900c70ee
|
Merge branch 'master' into next
|
2018-11-20 13:55:36 +00:00 |
|
Alam Ed Arias
|
4e9fc881a2
|
Fix =sizeof-pointer-memaccess: argument to ‘sizeof’ in ‘strncpy’ call is the same expression as the source; did you mean to use the size of the destination?
|
2018-11-14 16:26:46 -05:00 |
|
Alam Ed Arias
|
d14f87b8c6
|
Cleanup whitespace
|
2018-11-14 10:54:33 -05:00 |
|
Monster Iestyn
|
fced19d291
|
Merge branch 'master' into next
|
2018-11-10 19:05:33 +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
|
0bdbdd1b1e
|
Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified)
|
2018-11-08 16:26:55 +00:00 |
|
GoldenTails
|
a3bc7ddfa0
|
Add Lua Ultimate Mode global variable so people can use it.
|
2018-11-06 18:09:45 -06: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 |
|
Monster Iestyn
|
e15ed742c1
|
add ESLOPE ifdef checks around all the Lua slope support code that was there before I was involved
|
2018-10-21 16:27:54 +01:00 |
|
Monster Iestyn
|
7d4e27937d
|
Merge branch 'next' into lua-slopes
# Conflicts:
# src/lua_maplib.c
|
2018-10-20 18:31:06 +01:00 |
|
mazmazz
|
c5ea6b5efe
|
MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport
|
2018-09-18 10:22:17 -04:00 |
|
Latapostrophe
|
ad187c26f0
|
Repositionning chat & bugfixes
|
2018-07-31 15:57:19 +02:00 |
|
Latapostrophe
|
ac7c249fd2
|
SRB2chat test rework
|
2018-07-31 11:10:02 +02:00 |
|
Monster Iestyn
|
ad8c51ab8f
|
removing stupid dumb useless code fish
|
2018-02-21 22:45:51 +00:00 |
|
Monster Iestyn
|
8514251ad5
|
fix savegamename not prepending srb2home to itself for custom mods using their own gamedata files
|
2017-09-09 21:19:07 +01:00 |
|
Prisima the Fox
|
b5988e082c
|
No more magic numbers
|
2016-10-21 16:27:15 -04:00 |
|
Alam Ed Arias
|
765d68899f
|
Merge branch 'master' into next
|
2016-07-11 16:10:40 -04:00 |
|
Alam Ed Arias
|
4d6a3e3398
|
FUNCMATH fun
|
2016-06-12 16:08:48 -04:00 |
|
Alam Ed Arias
|
6271adcbe7
|
make sure !BLUA EXE works without warnings
|
2016-06-12 16:08:48 -04:00 |
|
wolfy852
|
919e3ed0e2
|
Make token available to Lua as a global variable
Reviewed by @RedEnchilada
|
2016-06-01 21:06:24 -05:00 |
|
Inuyasha
|
f07585191b
|
copyright dates/statements updated and such
(no actual SLOC changes)
|
2016-05-17 17:42:11 -07:00 |
|
Alam Arias
|
771c1ecb8a
|
Merge pull request #68 from Yukitty/revert-Lua-angles
Revert "Change angle_t handling in Lua."
|
2016-03-09 11:58:51 -05:00 |
|
Inuyasha
|
a7cb049b65
|
leave a dummy string in dehacked, nothing more.
a courtesy fuck you to gitlab for making me have to keep
the previous screwed up bullshit in this branch.
|
2016-03-09 06:23:57 -08:00 |
|
Inuyasha
|
f40cfb0271
|
Revert "MFE_DUMMY now exists to fill the slot where MFE_PUSHED was, bleh"
This reverts commit 4625118ee8 .
|
2016-03-09 06:22:40 -08:00 |
|
Monster Iestyn
|
4625118ee8
|
MFE_DUMMY now exists to fill the slot where MFE_PUSHED was, bleh
|
2016-03-09 14:03:20 +00:00 |
|