Zippy_Zolton
|
6bfccec3c3
|
oops
|
2020-11-30 12:05:45 -06:00 |
|
Zippy_Zolton
|
8c836971de
|
overhaul
|
2020-11-30 12:04:35 -06:00 |
|
Zippy_Zolton
|
556dd3bfca
|
P_GivePlayerRings
|
2020-11-29 17:39:54 -06:00 |
|
Zippy_Zolton
|
96ff6d002d
|
Make P_DoSuperTransformation (with giverings) add 50 rings instead of setting it
|
2020-11-29 17:16:57 -06:00 |
|
LJ Sonic
|
079df8df4d
|
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
|
ed041a88a4
|
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
|
9fe6bd7ae9
|
Merge branch 'optimise-overridden-actions' into 'fix-stacktrace'
Only call the Lua API for overridden actions
See merge request STJr/SRB2!1254
|
2020-11-29 05:27:33 -05:00 |
|
Nev3r
|
17955311b9
|
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
|
d6ed2f4ac8
|
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
|
17092cc5b0
|
Replace credits with original authors
|
2020-11-23 21:42:33 -06:00 |
|
GoldenTails
|
d673604b48
|
Split dehacked.c into multiple files.
|
2020-11-23 21:42:26 -06:00 |
|
James R
|
df6a742547
|
Merge branch 'fix-dumb-checkstring-typo' into 'next'
Fix a dumb typo of luaL_checklstring i made whoops
See merge request STJr/SRB2!1266
|
2020-11-23 22:42:00 -05:00 |
|
GoldenTails
|
8a9c3c57f7
|
Fix a dumb typo of luaL_checklstring i made whoops
|
2020-11-23 21:20:17 -06:00 |
|
Jaime Ita Passos
|
eee4548d3f
|
Fix a crash
|
2020-11-23 12:53:59 -03:00 |
|
LJ Sonic
|
2e71d1be63
|
Fix PlayerCmd not handling angle and aiming correctly
|
2020-11-23 01:23:34 +01:00 |
|
James R
|
85bf84193d
|
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
|
bd82b02478
|
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
|
4f39497feb
|
Merge branch 'master' into next
|
2020-11-22 15:23:12 -08:00 |
|
James R
|
fd8a15dc37
|
Merge remote-tracking branch 'origin/what-is-a-standard-2'
|
2020-11-22 15:19:39 -08:00 |
|
James R
|
1a2c2c8471
|
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
|
490758eac2
|
Remove SHORT macros for referencing patch width/height/offsets
|
2020-11-22 20:02:47 -03:00 |
|
James R
|
d7e32e616d
|
Merge remote-tracking branch 'origin/next' into plane-sorting-fix-part-3
|
2020-11-22 14:41:42 -08:00 |
|
James R
|
78c2fa09a0
|
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
|
ce06077e72
|
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
|
e3142663aa
|
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
|
0d4fc032c5
|
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
|
1021c51614
|
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 |
|
James R
|
eb7adb0c3f
|
Merge branch 'echo-filenames' into 'master'
Echo filenames when compiling without ECHO=1
See merge request STJr/SRB2!1260
|
2020-11-22 17:11:03 -05:00 |
|
Jaime Ita Passos
|
0a4a988a33
|
Free GPU textures when adding a file
|
2020-11-22 18:23:35 -03:00 |
|
Jaime Ita Passos
|
82b11c224a
|
Improve GPU texture management.
|
2020-11-22 18:18:26 -03:00 |
|
Jaime Ita Passos
|
2170ca3a50
|
Some interface fixes
|
2020-11-22 17:22:18 -03:00 |
|
Jaime Ita Passos
|
688384c79b
|
Fix sprite textures in models
|
2020-11-22 17:10:10 -03:00 |
|
Jaime Ita Passos
|
b8a13e6006
|
Change how texture deletion works in OpenGL
|
2020-11-22 17:03:04 -03:00 |
|
Jaime Ita Passos
|
6d2742f5fb
|
Some fixes for spritestuff2
|
2020-11-22 03:47:15 -03:00 |
|
GoldenTails
|
b4c88e92d9
|
Add NOECHOFILENAMES, if people don't want logspam.
|
2020-11-21 22:21:18 -06:00 |
|
Nev3r
|
bca0fa2017
|
Merge branch 'spritestuff2' into 'next'
New sprite features
See merge request STJr/SRB2!1257
|
2020-11-21 10:51:56 -05:00 |
|
GoldenTails
|
f49136136a
|
Echo filenames when compiling without ECHO=1
|
2020-11-19 15:17:56 -06:00 |
|
Jaime Ita Passos
|
09fe7d5f1b
|
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
|
be274a4fa9
|
Merge branch 'next' into spritestuff2
|
2020-11-19 00:52:43 -03:00 |
|
James R
|
1d107b268c
|
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
|
6f315c7bb1
|
Uncap palette lump palettes & allow flashpal palettes to display during pause
|
2020-11-16 17:37:12 +11:00 |
|
lachwright
|
dd4065795a
|
Add parentheses
|
2020-11-15 15:52:55 +11:00 |
|
Louis-Antoine
|
31f5cada65
|
Delete unneeded check
|
2020-11-15 01:24:12 +01:00 |
|
James R
|
e1a8a393a3
|
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
|
01e232ac3b
|
Fix one last instance of printing address diff
|
2020-11-14 16:18:54 -08:00 |
|
Louis-Antoine
|
ff7ca5450f
|
Only call the Lua API for overridden actions
|
2020-11-15 01:15:58 +01:00 |
|
James R
|
66edde2556
|
Remove unused music type enums
|
2020-11-14 15:56:40 -08:00 |
|
Louis-Antoine
|
b44ea720d0
|
Fix typo
|
2020-11-15 00:53:46 +01:00 |
|
Louis-Antoine
|
a78097060f
|
Delete outdated comment
|
2020-11-15 00:52:51 +01:00 |
|
James R
|
0527e60928
|
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 |
|