James R
e0a307da15
Merge branch 'next' into hooklib-refactor
2020-12-10 03:09:24 -08:00
James R
0df5d8ff58
Oops!
2020-12-10 03:06:41 -08:00
James R
2ab71571aa
Merge branch 'high-resolution-timer-2' into next
2020-12-10 02:55:02 -08:00
James R
8d382e49fb
Big Large Lua Hooklib Refactor
...
* Hooks are no longer a mess of lua boiler plate. Helper functions reduce hooks
to, at the most basic level, only two calls.
* Lua tables (the array part) are used to index hooks. Such tables contain only
hooks of the same type.
* Hook types are defined in one place so you no longer need to sync up the enum
and name array.
2020-12-10 00:36:41 -08:00
James R
e7883f3f8e
That moment when you see HAVE_BLUA crawl back from the grave
...
This would mean MapChange hasn't been firing for demos ...since 2.2.5.
2020-12-10 00:36:14 -08:00
James R
d004515d6a
Fix double define
2020-11-30 19:04:23 -08:00
LJ Sonic
eef3028110
Merge branch 'fix-stacktrace' of https://git.do.srb2.org/STJr/SRB2.git into next
...
# Conflicts:
# src/dehacked.c
# src/dehacked.h
2020-11-29 21:54:15 +01:00
Nev3r
ecb333511b
Merge branch 'fix-playercmd' into 'next'
...
Fix PlayerCmd not handling angle and aiming correctly
See merge request STJr/SRB2!1265
2020-11-29 05:30:01 -05:00
Nev3r
bcf6823cbf
Merge branch 'dehacked-hell' into 'next'
...
Split dehacked.c into multiple files.
See merge request STJr/SRB2!1222
2020-11-29 05:18:45 -05:00
James R
4ab667c6a0
Merge branch 'spritestuff2-fixes' into 'next'
...
Some fixes for spritestuff2
See merge request STJr/SRB2!1264
2020-11-25 19:26:49 -05:00
GoldenTails
930b5ea442
Replace credits with original authors
2020-11-23 21:42:33 -06:00
GoldenTails
8fef61aa29
Split dehacked.c into multiple files.
2020-11-23 21:42:26 -06:00
GoldenTails
d806655769
Fix a dumb typo of luaL_checklstring i made whoops
2020-11-23 21:20:17 -06:00
Jaime Ita Passos
5bdee63117
Fix a crash
2020-11-23 12:53:59 -03:00
LJ Sonic
7ff6443659
Fix PlayerCmd not handling angle and aiming correctly
2020-11-23 01:23:34 +01:00
James R
8d71559afe
Merge branch 'make-some-lua-globals-rw' into 'next'
...
Make several Lua global variables writable.
See merge request STJr/SRB2!1233
2020-11-22 18:47:53 -05:00
James R
8a30576d81
Merge branch 'plane-sorting-fix-part-3' into 'next'
...
Improved sprite sorting against 3d floors
See merge request STJr/SRB2!1235
2020-11-22 18:31:23 -05:00
James R
6d9e036c7f
Merge branch 'master' into next
2020-11-22 15:23:12 -08:00
James R
b059ed40c6
Merge remote-tracking branch 'origin/what-is-a-standard-2'
2020-11-22 15:19:39 -08:00
James R
40e954779e
Resolve one last conflict in splat sorting
...
Can't use gz/gzt because there is no transformation to make those work
differently for splats.
2020-11-22 15:12:34 -08:00
Jaime Ita Passos
5293c52bca
Remove SHORT macros for referencing patch width/height/offsets
2020-11-22 20:02:47 -03:00
James R
54da9552de
Merge remote-tracking branch 'origin/next' into plane-sorting-fix-part-3
2020-11-22 14:41:42 -08:00
James R
30792e7820
Merge branch 'flame-orb' into 'next'
...
Flame Shield & Thunder Shield Adjustment (Closes #363 )
Closes #363
See merge request STJr/SRB2!1220
2020-11-22 17:31:23 -05:00
James R
92625483a4
Merge branch 'replay-height-fix' into 'next'
...
Made height/spinheight and height change values in replays more accurate
See merge request STJr/SRB2!1241
2020-11-22 17:25:41 -05:00
James R
bec85c033a
Merge branch 'replay-camera-update' into 'next'
...
Make the replay camera follow the player
See merge request STJr/SRB2!1243
2020-11-22 17:23:38 -05:00
James R
eb28532244
Merge branch 'remove-unused-music-types' into 'next'
...
Remove unused music type enums
See merge request STJr/SRB2!1253
2020-11-22 17:16:35 -05:00
James R
6d6eb79226
Merge branch 'uncap-palettes' into 'next'
...
Uncap palette lump palettes & allow flashpal palettes to display during pause
See merge request STJr/SRB2!1255
2020-11-22 17:16:21 -05:00
Jaime Ita Passos
2e21168395
Free GPU textures when adding a file
2020-11-22 18:23:35 -03:00
Jaime Ita Passos
0645c642d2
Improve GPU texture management.
2020-11-22 18:18:26 -03:00
Jaime Ita Passos
abe35fd008
Some interface fixes
2020-11-22 17:22:18 -03:00
Jaime Ita Passos
152c540c1e
Fix sprite textures in models
2020-11-22 17:10:10 -03:00
Jaime Ita Passos
9ab3acae2d
Change how texture deletion works in OpenGL
2020-11-22 17:03:04 -03:00
Jaime Ita Passos
071ec73389
Some fixes for spritestuff2
2020-11-22 03:47:15 -03:00
GoldenTails
e3c6d1cef3
Add NOECHOFILENAMES, if people don't want logspam.
2020-11-21 22:21:18 -06:00
GoldenTails
8cfa21fb20
Echo filenames when compiling without ECHO=1
2020-11-19 15:17:56 -06:00
Jaime Ita Passos
389763a550
Update R_DrawFloorSprite_NPO2_8 and R_DrawTranslucentFloorSprite_NPO2_8 to have the lastest NPO2 optimizations
2020-11-19 00:59:37 -03:00
Jaime Ita Passos
5e890ee6f8
Merge branch 'next' into spritestuff2
2020-11-19 00:52:43 -03:00
James R
85c5fa9527
Merge branch 'unfuck-icon-mac' into 'next'
...
Use SDL version of executable icon at runtime on macOS
See merge request STJr/SRB2!1250
2020-11-17 20:24:42 -05:00
lachwright
5454068843
Uncap palette lump palettes & allow flashpal palettes to display during pause
2020-11-16 17:37:12 +11:00
lachwright
26b6b33220
Add parentheses
2020-11-15 15:52:55 +11:00
Louis-Antoine
b03d2b16ed
Delete unneeded check
2020-11-15 01:24:12 +01:00
James R
50e15840fb
Merge branch 'udmf-multitag' into 'next'
...
UDMF: Multitag support
See merge request STJr/SRB2!1097
2020-11-14 19:18:14 -05:00
James R
d3199ac779
Fix one last instance of printing address diff
2020-11-14 16:18:54 -08:00
Louis-Antoine
13ba25f4fe
Only call the Lua API for overridden actions
2020-11-15 01:15:58 +01:00
James R
33193db146
Remove unused music type enums
2020-11-14 15:56:40 -08:00
Louis-Antoine
7e7de16e6b
Fix typo
2020-11-15 00:53:46 +01:00
Louis-Antoine
f0fdcfb92b
Delete outdated comment
2020-11-15 00:52:51 +01:00
James R
2a35e0d59f
Merge branch 'lua-musicfuncs' into 'next'
...
Expose more music functions to Lua
See merge request STJr/SRB2!1230
2020-11-14 18:51:22 -05:00
James R
dfeddafc03
Merge branch 'nolua2' into 'next'
...
Don't let Lua set cvars that have CV_NOLUA
See merge request STJr/SRB2!1245
2020-11-14 18:37:21 -05:00
James R
11bb835a45
Merge branch 'precip-bad-access' into 'next'
...
Fix potential crash with precipitation in OpenGL
See merge request STJr/SRB2!1249
2020-11-14 18:33:58 -05:00
