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
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
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
JTE
54f95eb387
Revert "Change angle_t handling in Lua."
...
This partially reverts commit ef0e61fc33
.
2016-03-09 08:38:10 -05:00
Inuyasha
6aa708b5af
I don't think we need the BLUE_SPHERES define anymore...
2016-03-09 00:49:35 -08:00
Inuyasha
694220155e
Revert "MF2_PUSHED is now MFE_PUSHED, for the simple reason that it makes more sense as an eflags object flag than a flags2 object flag!"
...
This reverts commit c8c7878005
.
# Conflicts:
# src/dehacked.c
# src/p_mobj.c
# src/p_mobj.h
2016-03-08 21:30:12 -08:00
Inuyasha
e6f7b8ab26
Merge branch 'version-constants' into 'next'
...
Version constants for Lua
Pretty simple thing. Allows scripters to use VERSION, SUBVERSION, and VERSIONSTRING to check the game's version and potentially futureproof scripts. Have tested and confirmed working on my end.
See merge request !55
2016-03-03 22:33:36 -05:00
Inuyasha
a8bca89dbd
Merge branch 'backport_unslot-music' into 'next'
...
BACKPORT: removal of music slots
Relevant commits cherry-picked. Basically everything except the internal music track name switches.
See merge request !43
2016-03-03 22:31:21 -05:00
Inuyasha
7349cbdbc0
Backwards compatibility.
...
A test WAD for all possible use cases I can think of
can be found here:
https://dl.dropboxusercontent.com/u/3518218/21/secret/bc_test.wad
2016-03-03 02:54:07 -08:00
wolfy852
b0cbc8ab2a
Lua slope manipulation stuff!
...
Warning: Incomplete. Very prone to crashing and I might not have handled some things properly. Use with caution.
2016-03-02 23:47:06 -06:00
wolfy852
ab288a7d1a
Allow Lua to read VERSION, SUBVERSION, and VERSIONSTRING constants
2016-03-01 17:48:10 -06:00
Inuyasha
372002d2ad
Merge branch 'backport_state-animations' into 'next'
...
BACKPORT: FF_ANIMATE simplistic state animations
this is a lot more complex due to the need to remove the dispoffset related code as well as a lot of the redefinitions; combined with the code changes due to the sprite2 system in internal master.
~~BEFORE ACCEPTING THIS: get sryder to look at and fix any possible brokenness with OpenGL MD2s~~
See merge request !45
2016-02-29 03:04:00 -05:00
Inuyasha
f5ba192f0b
remove extraneous va() calls
2016-02-25 23:31:48 -08:00
Inuyasha
8c17dac589
The concept of "music slots" doesn't exist anymore.
...
Use whatever names you want for your music. So long as you prefix the lumps with O_ or D_, it doesn't matter anymore.
DISCLAIMER: Linedef type 413 (change music) and Lua scripting is not tested.
(cherry picked from commit 025ca413a2a01a8ec7c104748c2f510e350aa457)
# Conflicts:
# src/p_user.c
2016-02-09 02:48:33 -08:00
Inuyasha
58e685353a
Attempt 2 at special stage fades.
...
More basic in execution.
2016-02-09 02:43:24 -08:00
Inuyasha
1bdd4cf641
backport state-animations from internal master to public next
...
most other code in the branch did not come along for the ride.
2016-02-09 02:39:16 -08:00
Monster Iestyn
b043520411
NextLevel for level headers can now take the special strings "Title" "Evaluation" or "Credits" in place of their usual numbers (optionally, that is)
2016-01-03 10:29:53 -06:00
Alam Ed Arias
ac5c8f10e9
Merge remote-tracking branch 'public/lua-32bit-changes' into next
...
Conflicts:
src/lua_mobjlib.c
2015-06-18 10:22:07 -04:00
Alam Ed Arias
a03fc205b4
Merge branch 'hotfix-pltz' into 'next'
...
Re-add/fix broken platform momz mobj code.
The changes in this branch re-add the platform's momentum to players and mobjs which leave the platform (eg. by jumping) so that they move with relative velocity as expected. This behavior was unintentionally broken in SRB2 2.0, which adds a lot of artificial difficulty to certain segments of the levels, where you have to jump between high velocity moving platforms which seemingly cut your jump height to nothing.
Not only has the behavior been fixed, but it has now been enhanced to move the camera while free-falling between platforms as well, completing the illusion of full relative velocity with minimal hiccups. [Observe.](http://i.imgur.com/zmSfUyp.gifv )
See merge request !14
2015-06-18 10:04:54 -04:00
STJrInuyasha
45515df790
Make sure "word" in readlevelheader gets reset
...
... because some things (Lua. custom header entries) move it.
https://mb.srb2.org/showthread.php?t=40580
(Technically breaks netgame compatibility for Lua-heavy mods, so in next.)
2015-06-13 15:56:28 -07:00
Yukita Mayako
36cf4c1bd2
Fix comma error.
2015-06-09 19:53:35 -04:00