Nev3r
ab06ff011e
Merge branch 'colorfret' into 'next'
...
Respect mobj->color while enemies & bosses flash (resolves #531 )
Closes #531
See merge request STJr/SRB2!1513
2021-06-01 02:31:22 -04:00
Nev3r
9e7d619a5b
Merge branch 'golden-nitpicks-use-of-base-10' into 'next'
...
Use more readable hex constants in the Software Renderer splat and floorsprite drawers.
See merge request STJr/SRB2!1442
2021-06-01 02:29:53 -04:00
sphere
4908712641
Merge branch 'go-away' into 'next'
...
Make a few messages more helpful (resolves #485 )
Closes #485
See merge request STJr/SRB2!1519
2021-05-31 16:32:42 -04:00
sphere
65350e59c9
Merge branch 'rollout-stuff' into 'next'
...
Rollout rock improvements
Closes #445 , #221 , and #532
See merge request STJr/SRB2!1401
2021-05-31 16:12:17 -04:00
sphere
33d0438033
Merge branch 'fuckeggguard' into 'next'
...
Make Armageddon Shield instantly kill Egg Guards (Closes #225 )
Closes #225
See merge request STJr/SRB2!1378
2021-05-31 09:34:14 -04:00
sphere
aec209ad2d
Merge branch 'slider' into 'next'
...
Allow sliders passage through spin gaps (resolves #576 )
Closes #576
See merge request STJr/SRB2!1520
2021-05-31 08:31:42 -04:00
sphere
ae9e0e7f08
Merge branch 'text-loops' into 'next'
...
Custom title card bruh moments
See merge request STJr/SRB2!1501
2021-05-31 08:25:43 -04:00
Nev3r
a48af30465
Merge branch 'easings' into 'next'
...
Easing functions
See merge request STJr/SRB2!1467
2021-05-31 02:34:02 -04:00
sphere
fb4b3b8130
Merge branch 'ogl-fof-wall-slope-fix2' into 'next'
...
Take slopes into account in FOF wall cutoff in HWR_ProcessSeg
Closes #192
See merge request STJr/SRB2!1361
2021-05-30 11:32:30 -04:00
Nev3r
b978bc4507
Merge branch 'sw-tilted-npo2-span-opt' into 'next'
...
NPO2 slope span optimization
See merge request STJr/SRB2!1216
2021-05-29 09:30:58 -04:00
SteelT
ad2b4b1809
Merge branch 'save-skin-names' into 'next'
...
Save skin names in save files instead of skin numbers
See merge request STJr/SRB2!1503
2021-05-28 22:05:20 -04:00
SteelT
c0f8cb29aa
Merge branch 'select-heading-no-gaps' into 'next'
...
[SUGOI] Level select no longer assumes that games will always be linear
See merge request STJr/SRB2!1492
2021-05-28 21:51:52 -04:00
SteelT
2cb920a5a6
Merge branch 'failed-level-lua' into 'next'
...
[SUGOI] Make stagefailed more useful, add linedef executor to toggle, and expose to Lua
Closes #361
See merge request STJr/SRB2!1463
2021-05-28 21:51:00 -04:00
SteelT
a72d6bba22
Merge branch 'skin-unlocks-sanity' into 'next'
...
[SUGOI] Remove skin->availability, add SECRET_SKIN
See merge request STJr/SRB2!1474
2021-05-28 21:30:16 -04:00
sphere
75938e2dfa
Merge branch 'software-slope-plane-uv-fix-attempt' into 'next'
...
Fix slope plane rotation and alignment (resolves #508 )
Closes #508
See merge request STJr/SRB2!1464
2021-05-27 16:56:16 -04:00
katsy
6286fc8b05
add sliding flag to spinheight conditions
2021-05-26 02:37:46 -04:00
katsy
a1235e144d
allow sliders passage through spin gaps
2021-05-26 01:09:56 -05:00
katsy
b2ae7c79e7
make a few messages more helpful
2021-05-24 00:00:01 -05:00
lachablock
750bdd9d60
Respect mobj->color while enemies & bosses flash, but in OpenGL
2021-05-22 23:25:36 +10:00
lachablock
4e5c3566c9
Respect mobj->color while enemies & bosses flash
2021-05-22 16:52:01 +10:00
Steel Titanium
d9395b0a73
Merge branch 'master' into next
2021-05-19 23:09:14 -04:00
Steel Titanium
5e1e587ebb
Merge branch 'rjpfonseca-bugfix-1'
2021-05-19 23:06:18 -04:00
Steel Titanium
7862a557c8
Merge branch 'bugfix-1' of https://github.com/rjpfonseca/SRB2 into rjpfonseca-bugfix-1
2021-05-19 22:57:38 -04:00
SteelT
695722269b
Merge branch 'warnings' into 'master'
...
Fix some compiler warnings
See merge request STJr/SRB2!1504
2021-05-19 22:54:48 -04:00
sphere
60bbf1d8bc
Merge branch 'fix-pit_checkthing-crash' into 'next'
...
Check against null tmpusher source before attempting to push a thing.
See merge request STJr/SRB2!1413
2021-05-19 08:12:30 -04:00
sphere
dc5572ba21
Merge branch 'trns-chunk-fix' into 'next'
...
tRNS chunk fix
See merge request STJr/SRB2!1393
2021-05-19 06:07:38 -04:00
sphere
bcd3a6b82b
Merge branch 'optimize-getpatchpixel' into 'next'
...
Optimize Picture_GetPatchPixel
See merge request STJr/SRB2!1342
2021-05-19 06:07:23 -04:00
sphere
186ef0479d
Merge branch 'death-of-musicslots2' into 'next'
...
Remove music slot compatibility
See merge request STJr/SRB2!1321
2021-05-19 05:27:31 -04:00
Jaime Ita Passos
5b86b8991c
Use floating point trigonometry
2021-05-16 21:43:52 -03:00
Jaime Ita Passos
7500d12eeb
Merge remote-tracking branch 'origin' into software-slope-plane-uv-fix-attempt
2021-05-16 20:56:53 -03:00
Steel Titanium
a2667f4dc9
Merge branch 'master' into next
2021-05-11 20:08:44 -04:00
sphere
d915da6509
Merge branch 'dashaction' into 'next'
...
Scale minimum dashmode thok speed on actionspd, not normalspeed
See merge request STJr/SRB2!1311
2021-05-10 08:45:26 -04:00
Lach
5cab285b2c
Merge branch 'make-ghosts-target-origin' into 'next'
...
Set the target of a spawned ghost to where it came from.
Closes #517
See merge request STJr/SRB2!1358
2021-05-10 08:40:41 -04:00
Lach
5fb4b34f8c
Merge branch 'steamed' into 'next'
...
Make steam apply sprung flag
See merge request STJr/SRB2!1365
2021-05-10 08:39:06 -04:00
Lach
e1843841bc
Merge branch 'lunch' into 'next'
...
Don't apply pw_justlaunched if the player didn't actually launch off a slope
See merge request STJr/SRB2!1447
2021-05-10 08:37:55 -04:00
Lach
58a070ca03
Merge branch 'no-fire-shield-palflash' into 'next'
...
No fire shield palflash (resolves #512 )
Closes #512
See merge request STJr/SRB2!1473
2021-05-10 08:37:20 -04:00
Lach
ecd59feafb
Merge branch 'rosycolormap-raspberry' into 'next'
...
Change Raspberry's chat colormap to V_ROSYMAP
See merge request STJr/SRB2!1441
2021-05-10 08:36:26 -04:00
sphere
c25ecfc35f
Merge branch 'more-slope-copying' into 'next'
...
Add more actions for slope copying
See merge request STJr/SRB2!1406
2021-05-10 07:43:03 -04:00
sphere
44f3edb218
Merge branch 'binary-multitagging' into 'next'
...
Add linedef specials for multitagging in binary maps
See merge request STJr/SRB2!1485
2021-05-10 07:42:55 -04:00
RJPFonseca
69647eb78d
Used spaces instead of tabs in Makefile.cfg
2021-05-09 19:10:53 +01:00
LJ Sonic
d0adee76b2
Merge branch 'the-year-is-2021' into 'master'
...
The year is 2021
See merge request STJr/SRB2!1500
2021-05-09 09:28:31 -04:00
James R
35244fa736
Clang: fix -Wimplicit-const-int-float-conversion
...
Some of these integers exceed the precision of float. In
that case the number is rounded. The rounding shouldn't
matter too much anyway, so just shut the compiler up.
2021-05-08 16:49:23 -07:00
James R
210c9419e4
Ignore -Wtrigraphs
2021-05-08 16:49:18 -07:00
Sally Coolatta
ec8e884a31
Removed this function
2021-05-08 12:56:33 -04:00
Sally Coolatta
5d93f86499
Merge branch 'next' into skin-unlocks-sanity
2021-05-08 12:55:46 -04:00
lachablock
d2db204058
Fix rollout rock controls in 2D mode
2021-05-08 18:34:32 +10:00
lachablock
755cf6e952
Merge remote-tracking branch 'origin/next' into rollout-stuff
2021-05-08 13:03:18 +10:00
Sally Coolatta
d136c60a3f
Add some comments, write an empty string instead of a boolean determining if the bot skin exists or not.
...
I was a little scared of doing this at first, but after a bit of thought & some testing that it'll be fine.
2021-05-07 20:13:16 -04:00
Sally Coolatta
a583027006
Remove prints
2021-05-07 19:52:29 -04:00
Sally Coolatta
dc6851dabc
Save skin name instead of skin number into save files
...
Allows you to save a game as any character, and you don't have to load the files in a specific order to access the save file.
2021-05-07 19:41:44 -04:00
