Commit graph

12892 commits

Author SHA1 Message Date
Tatsuru
8d65ce81c7 Legacy moment 2020-09-13 14:30:02 -03:00
Tatsuru
454682df70 Use the sector's actual soundorg (how did it even work) 2020-09-13 13:54:43 -03:00
Tatsuru
782e559adf Check for sector_t userdata as well 2020-09-13 12:33:18 -03:00
SteelT
90302330ed Merge branch 'make-float-strings-great-again' into 'next'
Can we just do this please? Thanks.

See merge request STJr/SRB2!1142
2020-09-11 11:47:04 -04:00
SteelT
9f09e32520 Merge branch 'remove-bt_use-deprecation' into 'next'
Remove BT_USE and PF_USEDOWN warning

See merge request STJr/SRB2!1138
2020-09-10 16:06:20 -04:00
SteelT
a033f482be Merge branch 'pictureformats' into 'next'
PNG conversion refactoring

See merge request STJr/SRB2!675
2020-09-10 15:58:18 -04:00
SteelT
c2e6c0c0ad Merge branch 'png-conversion-fixes' into 'pictureformats'
Optimize PNG conversion

See merge request STJr/SRB2!1143
2020-09-10 15:47:58 -04:00
Jaime Passos
0750d273a6 Attempt to use the PNG image's palette, if it is present 2020-09-10 03:16:21 -03:00
Jaime Passos
4e437076c1 Use color look-up table for PNG conversion 2020-09-10 02:10:31 -03:00
Jaime Passos
f24647dc4d Change method of color look-up table generation 2020-09-10 01:43:46 -03:00
GoldenTails
c61eeb9238 Can we just do this please? Thanks. 2020-09-09 22:19:14 -05:00
Monster Iestyn
097986b1d9 added polyobj_t to userdataType list
(also added slope_t, vector2_t and vector3_t since they were all missing from here)
2020-09-09 21:24:07 +01:00
Monster Iestyn
78f7998618 Added polyobj.vertices and polyobj.lines to Lua 2020-09-09 21:15:02 +01:00
Monster Iestyn
4ce161f9c3 Added the functions Polyobj_moveXY and Polyobj_rotate to Lua as polyobj.moveXY and polyobj.rotate 2020-09-09 19:38:56 +01:00
Monster Iestyn
f86dad2979 Added new functions as variables of polyobj_t:
* po.pointInside(po, x, y) as a wrapper for P_PointInsidePolyobj
* po.mobjTouching(po, mo) as a wrapper for P_MobjTouchingPolyobj
* po.mobjInside(po, mo) as a wrapper for P_MobjInsidePolyobj

I can confirm that ":" syntax works with all the above, e.g. po:mobjInside(mo)
2020-09-09 18:09:32 +01:00
Monster Iestyn
5f91833701 lua_maplib.c changes now that polyobj_t is supported:
* added line.polyobj for line_t
* added subsector.polyList iteration function, for iterating polyobjs in a subsector
* added seg.polyseg for seg_t, in case we ever reenable support for segs/nodes
2020-09-09 17:31:44 +01:00
Monster Iestyn
89e989d6b1 added "sector" as a Lua-exclusive shortcut to polyobj->lines[0]->backsector in polyobj_t 2020-09-09 17:06:36 +01:00
Monster Iestyn
e6136eb113 lua_blockmaplib.c: added "polyobjs" option to searchBlockmap function
also updated my copyright years in this file B)
2020-09-09 16:56:48 +01:00
Monster Iestyn
625aeb1560 lua_script.c fixes:
* make sure polyobj_t userdata is invalidated at level load
* add support for syncing polyobj_t Lua variables in netgames
2020-09-09 16:09:08 +01:00
Monster Iestyn
5fc58de94f * added access to translucency and triggertag in polyobj_t
* added POF_ flags to INT_CONST in dehacked.c
2020-09-08 22:10:11 +01:00
Monster Iestyn
33c96ab1aa * added access to id, parent, angle, damage, thrust, flags in polyobj_t
* #polyobj now returns the index id for the polyobj in PolyObjects
* Polyobj_GetForNum is implemented in Lua as PolyObjects.GetForNum()
2020-09-08 21:42:51 +01:00
Monster Iestyn
60b49b5ecd Fix STJr copyright years, this file was obviously only created today, not 4 years ago! 2020-09-08 18:56:00 +01:00
Monster Iestyn
0bc7eb32e9 make sure to include fastcmp.h, whoops 2020-09-08 18:55:16 +01:00
Monster Iestyn
05fe86ffdc * started functions for accessing/editing META_POLYOBJ (bare minimum atm)
* added the "PolyObjects" array as a global var, with index and len functions, as well as its own iterate function
2020-09-08 18:29:10 +01:00
Monster Iestyn
d5beae9738 Begin work on adding access to polyobjects in Lua:
* create new file lua_polyobjlib.c
* made a stub LUA_PolyObjLib function
* added META_POLYOBJ to lua_libs.h
* updated makefile, CMake and MSVC project files for lua_polyobjlib.c
2020-09-08 18:08:08 +01:00
Bartu Ä°nce
4be96e3ae4 Merge branch 'chain-attraction-homing' of https://git.magicalgirl.moe/ZipperQR/SRB2 into chain-attraction-homing
# Conflicts:
#	src/p_user.c
2020-09-08 03:08:35 +03:00
Bartu Ä°nce
7e9bc0d103 no message 2020-09-08 03:03:48 +03:00
Jaime Passos
dcaad758f4 Improved memory management for patches 2020-09-07 02:23:07 -03:00
lachwright
efc82ffa74 Set additional UDMF parameters on objectplaced mapthings to defaults 2020-09-07 13:08:22 +09:30
lachwright
b805e10058 Let analog control schemes control objectplace like standard control schemes 2020-09-06 19:03:17 +09:30
lachwright
d7ab41a90b Objectplace improvements:
- movement speeds are scaled with player scale
- spawned objects are scaled with player scale
- command accepts argument for thing num to set
2020-09-06 17:28:34 +09:30
James R
ca9cf25423 Fix netid overflow check 2020-09-05 23:23:54 -07:00
GoldenTails
8ae5f3030f Remove BT_USE and PF_USEDOWN warning
someone entertained the idea of maybe removing it, so might as well put this merge request up to see if people want it
2020-09-06 00:30:05 -05:00
James R
4959aa5614 Merge branch 'credits-227' into 'next'
Update credits

See merge request STJr/SRB2!1136
2020-09-06 01:20:50 -04:00
James R
30057e9268 Start netid at 1 to avoid CV_FindNetVar returning a regular cvar for netid 0 2020-09-05 22:03:14 -07:00
James R
9a1099ec17 Update SuperPhanto's name with real name per request 2020-09-02 17:59:53 -07:00
James R
7bec06856f Add SuperPhanto to the art credits 2020-09-01 18:51:47 -07:00
James R
c7c9ae3847 Disable update alert if this is a prerelease 2020-09-01 16:22:29 -07:00
James R
4b7d16283d Update version to 2.2.7 RC1 2020-09-01 15:38:51 -07:00
James R
72437ae357 Define BETAVERSION as a suffix to the version string 2020-09-01 15:38:27 -07:00
James R
045a5d3dd1 Update patch.pk3 asset hash 2020-09-01 15:26:13 -07:00
SteelT
9393efc9cc Merge branch 'replace-purefat' into 'next'
New STJR Intro and related changes (resolves #202)

Closes #202

See merge request STJr/SRB2!1132
2020-09-01 15:00:48 -04:00
Steel Titanium
db6bd42eb1 Allow the game to continue even if the STARTUP lump is somehow missing 2020-09-01 14:46:03 -04:00
Steel Titanium
4509cd3798 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into replace-purefat 2020-09-01 13:54:27 -04:00
GoldenTails
4173b15c8e Expose V_GetStringColormap to Lua via v.getStringColormap(). 2020-09-01 10:47:02 -05:00
James R
b2226e95d6 Merge branch 'master' into next 2020-08-31 16:10:05 -07:00
James R
e593610862 Fix NOHW compiling 2020-08-31 16:09:41 -07:00
James R
6c2370f894 Kill NOHS
(cherry picked from commit 3437b0690a3f4278e3ecc657102a126a3e2f3d13)
2020-08-31 16:06:40 -07:00
James R
2aab765b36 Fix NOGME compiling
(cherry picked from commit 0d57ba1d02c5bde2ab22a71d21a95849b21e9539)
2020-08-31 16:04:09 -07:00
Steel Titanium
9a1d6e0db9 Fix some build errors
(cherry picked from commit cb9004e4cfa94251ab0d31f19fee187fc4e9abcc)
2020-08-29 18:08:41 -07:00