Commit graph

7088 commits

Author SHA1 Message Date
toaster
de82d338bd Remember when Lach recorded their live reaction to 2.2 so far? Do you recall what the reaction to ACZ3 was?
If you don't, the reaction was "WHAT?? Why is he here? This is GREAT but, what??" And while the reaction is on the positive end of things, it's stll clearly not advisable for our defining Big Reveal of the already huge update.

To this end: Here is a mini cutscene! https://cdn.discordapp.com/attachments/428262628893261828/626207624043429898/srb20005.gif
* He's digging through Eggman's trash.
* Clearly doesn't expect to see you!
* Ready for a fight all the same.
* You can attack him during the mini cutscene if you're impatient.
* Skipped if you give him MTF_AMBUSH.
* Requires new assets (including map) to test, but I'm not ready to make a MR yet because I have other thoughts first.

Also, since I was poking around in p_enemy.c, I fixed A_Boss1Laser's issues (not working with direct 2.1 port states and having the weird secondary attack).
2019-09-25 14:36:20 +01:00
lachwright
09c9ff0217 (Crudely) fixed camera jitter on certain FOF slopes 2019-09-25 21:15:19 +08:00
lachwright
bd1809f742 Fixed Brak's flames not animating 2019-09-25 20:32:56 +08:00
lachwright
aff47ebd1e Fixed spectators taking unwarranted damage in splitscreen 2019-09-25 17:13:03 +08:00
Lachlan Wright
319cf62980 Hopefully added the newline back? 2019-09-25 05:06:04 -04:00
Lachlan Wright
e13c16ea9d Add parentheses over change 2019-09-25 05:00:43 -04:00
lachwright
02746c0a7c Dust devil fixes 2019-09-25 16:32:06 +08:00
Lachlan Wright
d53e652028 AI players no longer take shield damage in Ultimate mode 2019-09-24 23:49:20 -04:00
Jaime Passos
a2514fb8c1 remove unused macros 2019-09-24 19:54:16 -03:00
Jaime Passos
2689fe38d9 INT32 -> boolean 2019-09-24 19:49:24 -03:00
Jaime Passos
80db38c0ce remove unused struct 2019-09-24 19:46:52 -03:00
Jaime Passos
484c673d5f better crosshair 2019-09-24 19:44:30 -03:00
Jaime Passos
54450d34e6 fix automap FRACBITS confusion 2019-09-24 19:11:52 -03:00
lachwright
67aa0cd2f6 removed outdated comment 2019-09-25 03:16:04 +08:00
lachwright
63c0c21d8e Trigonometric input capping 2019-09-25 03:12:56 +08:00
James R
cf14b6257c Automate the silly joystick menu items definition 2019-09-23 20:54:53 -07:00
James R
c5effff659 All for a cvar... 2019-09-23 20:23:40 -07:00
Steel Titanium
cecbf95002 Various of changes
Changed any instance of "joystick" in strings to "gamepad"
Renamed some cvars
Added a define for MAX_JOYSTICK
Added back the missing command line params.
2019-09-23 22:46:44 -04:00
Jaime Passos
0346c28cc0 ignore TRANSPARENTPIXEL 2019-09-23 19:20:59 -03:00
Jaime Passos
be6c8b08ea pixel alpha mistake 2019-09-23 18:27:43 -03:00
Jaime Passos
fac1a2b36e patch fixes 2019-09-23 18:25:53 -03:00
Steel Titanium
a18872652f Merge branch 'master' into internal-hotplug-stableid 2019-09-23 00:44:34 -04:00
Steel Titanium
8e50a7214c Restore code that somehow got reverted???
How did this even happen??
2019-09-22 20:30:07 -04:00
toaster
dbcb8d4090 Merge branch 'hitbox-tweaks' into 'master'
Small hitbox tweaks

See merge request STJr/SRB2Internal!341
2019-09-22 06:43:28 -04:00
sphere
42d1fa6e88 Increase emblem and token hitbox sizes. 2019-09-22 04:19:09 +02:00
sphere
c4784e71eb Tweak bubble grabbing behavior. 2019-09-22 04:05:22 +02:00
toaster
fe626b699f Merge branch 'logloaded' into 'master'
Mark new-style log names as loaded in addons menu

See merge request STJr/SRB2Internal!340
2019-09-20 13:39:08 -04:00
toaster
a6ad704d6c Mark new-style log names as loaded. 2019-09-20 17:43:41 +01:00
Alam Ed Arias
a236241b53 Merge branch 'public_next' into private 2019-09-20 12:33:34 -04:00
Alam Ed Arias
93da2cf8fe Merge branch 'master' into next 2019-09-20 12:32:32 -04:00
Alam Ed Arias
6d78290131 avoid the source code from getting the wrong EOL 2019-09-20 12:32:18 -04:00
toaster
9770b8bf22 * Resolve compiling issues with logmessages.
* Improve logfile print. (I know Steel wanted it gone entirely, but I feel like it's relevant to have it in game..?)
2019-09-20 17:22:09 +01:00
Alam Ed Arias
924b76d4ee Undo file mode change on menu files 2019-09-20 12:18:57 -04:00
toaster
d7ba804e22 Merge branch 'camerafix' into 'master'
Camera fixes

Closes #105

See merge request STJr/SRB2Internal!303
2019-09-20 11:51:30 -04:00
toaster
f9c996f8a6 Merge branch 'new_algae' into 'master'
New animated DSZ kelp (plus ACZ cacti & DSZ coral)

See merge request STJr/SRB2Internal!332
2019-09-20 11:45:46 -04:00
toaster
4d62bb4620 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into new_algae 2019-09-20 16:45:06 +01:00
toaster
9c7d8d8990 Merge branch 'playerfixes' into 'master'
Some Player fixes and enhancements

Closes #216, #219, #222, and #224

See merge request STJr/SRB2Internal!334
2019-09-20 11:39:32 -04:00
toaster
931f872467 Merge branch 'betterdirs' into 'master'
Better directory structure

See merge request STJr/SRB2Internal!321
2019-09-20 11:36:56 -04:00
toaster
db71626518 Merge branch 'nmus-pk3' into 'master'
Support W_VerifyFile on PK3

See merge request STJr/SRB2Internal!328
2019-09-20 11:35:22 -04:00
toaster
456dd745fc Merge branch 'timerfix' into 'master'
Timerres fix

Closes #213

See merge request STJr/SRB2Internal!338
2019-09-20 11:34:50 -04:00
toaster
ee17e7b56e Merge branch 'camerafix-menu' into 'camerafix'
Camera Options submenu

See merge request STJr/SRB2Internal!337
2019-09-20 11:34:26 -04:00
toaster
1b71ba2efa Merge branch 'flats-png-macro-fix-please-just-work-already' into 'master'
Use byteptr.h macros in flats png

See merge request STJr/SRB2Internal!339
2019-09-20 11:34:10 -04:00
lachwright
ffdf562a4f test?? 2019-09-20 12:07:57 +08:00
Alam Arias
39e44be6f4 Merge remote-tracking branch 'private/master' into flats-png-macro-fix-please-just-work-already 2019-09-19 21:43:57 -04:00
Alam Arias
296409d93e platersprite_t is not the same as unsigned 2019-09-19 21:42:59 -04:00
Jaime Passos
d9777c59e0 Merge remote-tracking branch 'origin/master' into flats-png-macro-fix-please-just-work-already 2019-09-19 22:41:45 -03:00
Jaime Passos
0ab7573ec7 use byteptr.h macros 2019-09-19 22:40:23 -03:00
sphere
a1df108f28 Small DSZ coral tweaks. 2019-09-20 00:51:44 +02:00
lachwright
01074c47d6 Improved orbital camera in Software; cam_adjust cvars changed to on by default 2019-09-20 02:02:17 +08:00
toaster
571daa256a Always pretend cv_playersforexit is 4 in co-op special stages. 2019-09-19 18:44:55 +01:00