Commit graph

2985 commits

Author SHA1 Message Date
Steel Titanium
73dc40a0b1 Fix saving progress on vanilia 2018-12-26 15:47:12 -05:00
Digiku
a473896d2d Merge branch 'large-room-msvc-fix' into 'next'
Fix -ANGLE_180 because MSVC complains

See merge request STJr/SRB2!432
2018-12-25 01:15:02 -05:00
mazmazz
91abcd66b7 Fix -ANGLE_180 because MSVC complains
-ANGLE_180 evaluates equal to ANGLE_180.
2018-12-25 01:14:05 -05:00
Digiku
ab017edd6e Merge branch '2122-version' into 'next'
Update code versions to 2.1.22

See merge request STJr/SRB2!402
2018-12-25 00:45:14 -05:00
mazmazz
7fe19c2f09 Merge branch 'ctf-enemy-flag-sound' into 2122-version 2018-12-25 00:27:08 -05:00
mazmazz
818438d5d0 Merge remote-tracking branch 'public-gl/master' into 2122-version 2018-12-25 00:19:45 -05:00
mazmazz
610d43cc84 Merge remote-tracking branch 'public-gl/next' into 2122-version 2018-12-25 00:19:42 -05:00
Digiku
d9fdeaaa75 Merge branch 'undo-old-side-discolor-fix' into 'master'
Undo old side discolor fix

See merge request STJr/SRB2!431
2018-12-25 00:14:41 -05:00
mazmazz
8586643467 Merge remote-tracking branch 'public-gl/master' into undo-old-side-discolor-fix 2018-12-25 00:09:24 -05:00
Digiku
9c11d58bae Merge branch 'nights-pgup-control' into 'next'
Support Look Up/Down keys for NiGHTS movement

See merge request STJr/SRB2!430
2018-12-24 23:53:35 -05:00
mazmazz
3e712b57c5 Support Look Up/Down keys for NiGHTS movement 2018-12-24 23:48:03 -05:00
mazmazz
a7ac8179f5 Revert "Merge branch 'side-discolor-fix' into 'master'"
This reverts commit f81144d7b1, reversing
changes made to c24d860eea.
2018-12-24 20:58:26 -05:00
mazmazz
de0943352a Revert default console backcolor to green; changed from CHAT commit 2018-12-24 20:57:11 -05:00
Digiku
90e673a487 Merge branch 'float-compare-colormap-fix' into 'master'
Fix float comparison for colormap maskamt

See merge request STJr/SRB2!428
2018-12-24 20:55:06 -05:00
mazmazz
59ac969594 Define EPSILONs only if not already defined
Fixes OSX buildbot
2018-12-24 20:36:28 -05:00
mazmazz
52b6810ee1 Remove log message 2018-12-24 20:33:59 -05:00
mazmazz
7c3dcd2bf9 Use DBL_EPSILON for colormap comparison 2018-12-24 20:22:10 -05:00
Alam Ed Arias
fa5ff9c0cf Merge branch 'master' into next 2018-12-24 20:15:45 -05:00
mazmazz
732b9a66ca Fix float comparison for colormap maskamt 2018-12-24 19:58:05 -05:00
Alam Ed Arias
008fecbba7 TravisCI: GCC 8.x needs to pass 2018-12-24 19:10:29 -05:00
mazmazz
34964a07a8 Fix gcc 8 compile by using strcpy instead of memcpy for PM 2018-12-24 18:51:11 -05:00
Digiku
f81144d7b1 Merge branch 'side-discolor-fix' into 'master'
Fix colormap bleeding onto sides [by Jimita]

See merge request STJr/SRB2!427
2018-12-24 17:33:34 -05:00
mazmazz
e40deb5443 Merge remote-tracking branch 'public-gl/master' into 2122-version 2018-12-24 17:31:03 -05:00
mazmazz
59cc9dbecf Merge remote-tracking branch 'public-gl/next' into 2122-version 2018-12-24 17:30:59 -05:00
Jimita
23b27f5566 cleanup 2018-12-24 17:21:33 -05:00
Digiku
c24d860eea Merge branch 'sdl-autograb' into 'master'
SDL:Auto grab input

Closes #46

See merge request STJr/SRB2!416
2018-12-24 17:04:27 -05:00
Digiku
7067d47c41 Merge branch 'polyobject-crush-fix-waypoint' into 'next'
Polyobject crush fix by waypoints [by TehRealSalt]

See merge request STJr/SRB2!426
2018-12-24 17:01:06 -05:00
Alam Ed Arias
3942736e11 Merge branch 'master' into next 2018-12-24 16:56:29 -05:00
Digiku
e12ca787c4 Merge branch 'disablespeedadjust-fix' into 'next'
Disablespeedadjust fix

See merge request STJr/SRB2!425
2018-12-24 16:31:19 -05:00
Digiku
27d7bc7cc3 Merge branch 'bot-respawn-fix' into 'next'
Bot respawn fix

See merge request STJr/SRB2!423
2018-12-24 15:53:47 -05:00
TehRealSalt
55d300c4e2 Fix move by waypoints not checking for sector changes
It seemed weird at first, but the polyobject sector (backsector) itself DOESN'T need checked (although I still am doing it for safety). Rather, the in-level sector just needs checked.

If someone manually modifies the polyobject sector though, then this bug can still occur... but this fixes it for the most common use-case where this can happen. I'll try to tackle the rarer cases in my next commit.
2018-12-24 14:39:07 -05:00
Monster Iestyn
06e2da214e remove these unnecessary typedefs for assignments to variables that are actually already boolean to begin with, since the rhs resolves to a boolean anyway 2018-12-24 19:37:52 +00:00
Monster Iestyn
e96a345fce Fix disablespeedajdust in SOCs being set like an integer value instead of a boolean 2018-12-24 19:29:54 +00:00
Monster Iestyn
94f0eedb60 Fix bot players using the respawning code meant only for real players to use 2018-12-24 17:59:12 +00:00
mazmazz
8877d888cb Do not increment mainwads for music.dta 2018-12-23 23:54:26 -05:00
mazmazz
96dadf64a7 Play flag-returned SFX for the opposing team 2018-12-23 22:57:14 -05:00
Steel Titanium
29308db913 Merge branch 'master' into sdl-autograb 2018-12-23 22:35:44 -05:00
Steel Titanium
7bf9636d45 Merge branch 'sdl-autograb-revise' into 'sdl-autograb'
AutoGrab changes

See merge request SteelTitanium/SRB2!3
2018-12-23 22:32:51 -05:00
mazmazz
fe836e6109 Only SetWindowGrab if !disable_mouse; toggle cursor visibility 2018-12-23 22:09:16 -05:00
Steel Titanium
f1c4f3c772 Another attempt to lock the mouse 2018-12-23 18:54:15 -05:00
mazmazz
c82cd78bb7 Merge remote-tracking branch 'public-gl/2122-version' into 2122-version 2018-12-23 18:09:54 -05:00
mazmazz
915c90d9f3 Merge remote-tracking branch 'public-gl/master' into 2122-version 2018-12-23 18:09:17 -05:00
mazmazz
9c8487e8eb Merge remote-tracking branch 'public-gl/next' into 2122-version 2018-12-23 18:09:14 -05:00
Digiku
be931de113 Merge branch '2122-patch-dta-update' into '2122-version'
Changes related to 2.1.22 patch.dta update

See merge request STJr/SRB2!417
2018-12-23 18:08:38 -05:00
Digiku
15c9404f91 Merge branch 'addons-backport' into '2122-version'
Addons Menu backport to vanilla

See merge request STJr/SRB2!384
2018-12-23 18:08:06 -05:00
Digiku
2fbb5995d8 Merge branch 'menu-mpjoy-fix' into '2122-version'
Menu: Fix joystick events causing the player to move during multiplayer system menu [2122-version]

See merge request STJr/SRB2!420
2018-12-23 18:06:27 -05:00
mazmazz
39b0a16727 Revert "Revert "Merge branch 'menu-mpjoy-fix' into 'next'""
This reverts commit ee63ed22d5.
2018-12-23 18:04:01 -05:00
Digiku
1e6ff01426 Merge branch '2122-next' into 'next'
Revert "Merge branch 'menu-mpjoy-fix' into 'next'"

See merge request STJr/SRB2!419
2018-12-23 18:00:18 -05:00
mazmazz
ee63ed22d5 Revert "Merge branch 'menu-mpjoy-fix' into 'next'"
This reverts commit eaab2da100, reversing
changes made to 50710c3f10.
2018-12-23 17:57:50 -05:00
Digiku
eaab2da100 Merge branch 'menu-mpjoy-fix' into 'next'
Menu: Fix joystick events causing the player to move during multiplayer system menu

See merge request STJr/SRB2!414
2018-12-23 17:55:02 -05:00