0422e40649
Add graphic for throwing items
...
Fix missing frame of clash
2017-10-24 17:19:14 +01:00
c66b10dda3
Shells and Lobbed items now use afterimages for trails
...
Fireballs use old green shell trails for trails
Updated dehacked with new states and all the changes
2017-10-24 15:25:08 +01:00
4be15a9020
Bumpy
2017-10-24 00:42:06 -04:00
10aa83e614
More minor adjustments
...
- Display the skin's realname in RA menus
- Can no longer set your skincolor to none on the RA menu
- Edited several color names to fit within 14 characters
2017-10-21 13:22:54 -04:00
5fe2f4928f
Merge remote-tracking branch 'refs/remotes/srb2public/next' into zarrotsu
...
# Conflicts:
# src/doomdef.h
# src/sdl/i_main.c
# src/sdl/i_video.c
# src/y_inter.c
2017-10-17 15:53:34 -04:00
727d55b64e
Merge remote-tracking branch 'refs/remotes/srb2public/public_flatsprite' into zarrotsu
...
# Conflicts:
# src/doomdef.h
2017-10-17 00:40:38 -04:00
366fe9fa91
Add TD shadows to Kart
...
Disclaimer: I haven't tested this and therefore am not sure whether or not it actually works. I think it does. Probably.
2017-10-11 20:54:35 -05:00
8514251ad5
fix savegamename not prepending srb2home to itself for custom mods using their own gamedata files
2017-09-09 21:19:07 +01:00
a1f2f5b675
New level tag "ZONETITLE" can be set to replace the word "ZONE" in a level. "NOZONE" overrides it and forces no display at all.
2017-09-01 13:01:59 -04:00
daf7c08427
Update dehacked lists
2017-03-08 23:42:12 +00:00
f50ecc0dcd
Most items work (netgame needs testing), will do fireballs later.
2017-02-26 17:38:24 -05:00
68d439a783
Merge branch 'upstream/next' into zarrotsu_vanillamerge
...
# Conflicts:
# src/Makefile
# src/doomdef.h
# src/hardware/hw_main.c
# src/p_mobj.c
# src/p_user.c
# src/r_segs.c
# src/sdl/i_video.c
# src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
580f909c6c
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 17:19:58 -05:00
82b0e9962e
Toaster's friction code???
2016-08-23 21:04:06 -04:00
2a74ea07ee
Chee wanted paper sprites' code, so here it is for the public to see.
...
Note: Won't compile. Need to merge in the NAMEcLcR stuff first, let me do that.
2016-08-22 22:54:30 +01:00
3a3180ce05
Redid control names, some item code, start of drift shenanigans
2016-08-20 22:15:11 -04:00
d631d0ef04
S_PLAY states, HUD stuff
2016-08-14 23:51:25 -04:00
4112d44529
Some Color code, Kart powers
2016-08-11 21:42:16 -04:00
765d68899f
Merge branch 'master' into next
2016-07-11 16:10:40 -04:00
e4a970f894
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
4d6a3e3398
FUNCMATH fun
2016-06-12 16:08:48 -04:00
6271adcbe7
make sure !BLUA EXE works without warnings
2016-06-12 16:08:48 -04:00
919e3ed0e2
Make token available to Lua as a global variable
...
Reviewed by @RedEnchilada
2016-06-01 21:06:24 -05:00
f07585191b
copyright dates/statements updated and such
...
(no actual SLOC changes)
2016-05-17 17:42:11 -07:00
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
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
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
4625118ee8
MFE_DUMMY now exists to fill the slot where MFE_PUSHED was, bleh
2016-03-09 14:03:20 +00:00
54f95eb387
Revert "Change angle_t handling in Lua."
...
This partially reverts commit ef0e61fc33
2016-03-09 08:38:10 -05:00
6aa708b5af
I don't think we need the BLUE_SPHERES define anymore...
2016-03-09 00:49:35 -08:00
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
2016-03-08 21:30:12 -08:00
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
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
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
ab288a7d1a
Allow Lua to read VERSION, SUBVERSION, and VERSIONSTRING constants
2016-03-01 17:48:10 -06:00
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
fbdb98c8b1
Menu toggles. Doesn't work yet.
2016-02-27 11:11:14 -05:00
f5ba192f0b
remove extraneous va() calls
2016-02-25 23:31:48 -08:00
ba18d968e5
Added vars to d_clisrv, renamed autoexec.cfg, added menu variables to d_netcmd.h, added powers to dehacked.c for LUA, and made sure things can actually compile correctly as-is (squished two errors).
2016-02-21 12:40:01 -05:00
9d2e9e24c3
Fixing tabs
2016-02-15 20:39:08 -05:00
69f9c10a99
16/02/15 Starting some setup
2016-02-15 11:08:54 -05:00
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
58e685353a
Attempt 2 at special stage fades.
...
More basic in execution.
2016-02-09 02:43:24 -08:00
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
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
ac5c8f10e9
Merge remote-tracking branch 'public/lua-32bit-changes' into next
...
Conflicts:
src/lua_mobjlib.c
2015-06-18 10:22:07 -04:00
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
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
36cf4c1bd2
Fix comma error.
2015-06-09 19:53:35 -04:00
fc649ce195
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into hotfix-pltz
...
Conflicts:
src/dehacked.c
src/p_mobj.h
2015-06-09 07:38:21 -04:00
Sryder13