stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-22 10:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
6143 commits 172 branches 41 tags 280 MiB
Commit graph

6143 commits

This branch
This branch
All branches
Author SHA1 Message Date
Digiku
26f956acea 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
73a67fc9f5 Merge branch 'ctf-enemy-flag-sound' into 2122-version 2018-12-25 00:27:08 -05:00
mazmazz
842bcfc8a0 Merge remote-tracking branch 'public-gl/master' into 2122-version 2018-12-25 00:19:45 -05:00
mazmazz
a626660564 Merge remote-tracking branch 'public-gl/next' into 2122-version 2018-12-25 00:19:42 -05:00
Digiku
a5b3f0397f 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
0b81debf94 Merge remote-tracking branch 'public-gl/master' into undo-old-side-discolor-fix 2018-12-25 00:09:24 -05:00
Digiku
1d474626f4 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
82a40f0dba Support Look Up/Down keys for NiGHTS movement 2018-12-24 23:48:03 -05:00
mazmazz
b7edc7f870 Revert "Merge branch 'side-discolor-fix' into 'master'" 
This reverts commit e721a3d882, reversing
changes made to 4656a0d02c.
 2018-12-24 20:58:26 -05:00
mazmazz
bfc501a271 Revert default console backcolor to green; changed from CHAT commit 2018-12-24 20:57:11 -05:00
Digiku
cb42702e6b 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
10a3e3fec9 Define EPSILONs only if not already defined 
Fixes OSX buildbot
 2018-12-24 20:36:28 -05:00
mazmazz
c65f44e805 Remove log message 2018-12-24 20:33:59 -05:00
mazmazz
e9e5128754 Use DBL_EPSILON for colormap comparison 2018-12-24 20:22:10 -05:00
Alam Ed Arias
4651eddc36 Merge branch 'master' into next 2018-12-24 20:15:45 -05:00
mazmazz
58728ec358 Fix float comparison for colormap maskamt 2018-12-24 19:58:05 -05:00
Alam Ed Arias
89133160ec TravisCI: GCC 8.x needs to pass 2018-12-24 19:10:29 -05:00
mazmazz
32697ddf61 Fix gcc 8 compile by using strcpy instead of memcpy for PM 2018-12-24 18:51:11 -05:00
Digiku
e721a3d882 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
7fc79f0b88 Merge remote-tracking branch 'public-gl/master' into 2122-version 2018-12-24 17:31:03 -05:00
mazmazz
c2dc5788bf Merge remote-tracking branch 'public-gl/next' into 2122-version 2018-12-24 17:30:59 -05:00
Jimita
4c6334f459 cleanup 2018-12-24 17:21:33 -05:00
Digiku
4656a0d02c 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
f06fd4149d 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
c8f4d125b4 Merge branch 'master' into next 2018-12-24 16:56:29 -05:00
Digiku
be9a04e489 Merge branch 'disablespeedadjust-fix' into 'next' 
Disablespeedadjust fix

See merge request STJr/SRB2!425
 2018-12-24 16:31:19 -05:00
Digiku
2e6f382ec3 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
878b1b2d16 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
31c6b6ef77 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
936b9ecebc Fix disablespeedajdust in SOCs being set like an integer value instead of a boolean 2018-12-24 19:29:54 +00:00
Monster Iestyn
01588ea967 Fix bot players using the respawning code meant only for real players to use 2018-12-24 17:59:12 +00:00
Nev3r
caaacf3f76 Fixed the shield spawn/special hook cases on the hook add switch. 
They basically work now.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2018-12-24 17:31:00 +01:00
Digiku
47a810decb Merge branch 'EOL' into 'master' 
fix EOL on src/p_enemy.c

See merge request STJr/SRB2Internal!208
 2018-12-24 01:33:03 -05:00
mazmazz
e708f750a0 Remove inline from ST_drawWeaponSelect() to fix 32-bit compile 
large-function-growth limit reached
 2018-12-24 01:26:22 -05:00
mazmazz
ac9cb59de9 Do not increment mainwads for music.dta 2018-12-23 23:54:26 -05:00
mazmazz
9d1bc3063f Play flag-returned SFX for the opposing team 2018-12-23 22:57:14 -05:00
Steel Titanium
cb13ace77e Merge branch 'master' into sdl-autograb 2018-12-23 22:35:44 -05:00
Steel Titanium
8044e2a7f6 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
ed410575d6 Only SetWindowGrab if !disable_mouse; toggle cursor visibility 2018-12-23 22:09:16 -05:00
Steel Titanium
46d1a866d8 Another attempt to lock the mouse 2018-12-23 18:54:15 -05:00
mazmazz
cb01ebebed Merge remote-tracking branch 'public-gl/2122-version' into 2122-version 2018-12-23 18:09:54 -05:00
mazmazz
83a6f5d6ae Merge remote-tracking branch 'public-gl/master' into 2122-version 2018-12-23 18:09:17 -05:00
mazmazz
c0a0c5ac5d Merge remote-tracking branch 'public-gl/next' into 2122-version 2018-12-23 18:09:14 -05:00
Digiku
d72e3fe71c 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
8d56c2f486 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
fa36b8f5a2 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
2b8cdc0381 Revert "Revert "Merge branch 'menu-mpjoy-fix' into 'next'"" 
This reverts commit c0c05043e6.
 2018-12-23 18:04:01 -05:00
Digiku
140152c2e7 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
c0c05043e6 Revert "Merge branch 'menu-mpjoy-fix' into 'next'" 
This reverts commit b5d4bb3530, reversing
changes made to 2d675750cf.
 2018-12-23 17:57:50 -05:00
Digiku
b5d4bb3530 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