Sally Coolatta
9b6aa946ea
Merge remote-tracking branch 'srb2/master' into the-scary-22-merge
2020-10-24 19:28:06 -04:00
Sally Coolatta
15cfafaeba
Merge remote-tracking branch 'public/master' into the-scary-22-merge
2020-10-24 18:38:27 -04:00
Sally Coolatta
fda698a290
Merge master
2020-10-24 18:34:07 -04:00
James R
cded5a9416
Merge branch 'cmake-multithreading' into 'master'
...
Add multithreading option for CMake
See merge request STJr/SRB2!1204
2020-10-23 16:42:32 -04:00
GoldenTails
e7b3e2598d
Add i_threads.h too
2020-10-20 15:58:34 -05:00
GoldenTails
0fb69e75e1
Add multithreading option for CMake
2020-10-20 15:44:01 -05:00
Sal
08dc784c17
Merge branch 'the-big-step-up' into 'the-scary-22-merge'
...
Fix steep slope jank
See merge request KartKrew/Kart!318
2020-10-18 01:20:19 -04:00
Sal
bceffa9c2f
Merge branch 'the-big-large-slope-physics' into 'the-scary-22-merge'
...
The big large slope physics
See merge request KartKrew/Kart!320
2020-10-18 01:16:24 -04:00
James R
1a49edbf24
Make it easier to go up a slope if using a sneaker
2020-10-17 21:50:26 -07:00
James R
fdb77175c5
More buttered slope speed
2020-10-17 21:47:04 -07:00
James R
99c1f8dba5
Move higher
2020-10-15 15:53:44 -07:00
James R
4569d9650a
Move drop reset in air to P_CheckPosition
...
Fixes respawning over slopes after crossing a drop.
2020-10-15 15:51:31 -07:00
James R
9fb7ba77e4
Midtexture step up/down
2020-10-15 14:47:10 -07:00
James R
0bf00aad35
Condense variables, rename 'diff' to 'step'
2020-10-15 14:23:02 -07:00
James R
1db22403bb
Guard with mobj??
2020-10-15 04:30:48 -07:00
James R
75b3fffc04
AAAAAAAAAAA
2020-10-15 04:23:28 -07:00
James R
9723283055
FOF step down
2020-10-15 03:33:37 -07:00
James R
894860b9bc
Step up fake floors
2020-10-15 02:58:29 -07:00
James R
3a4a687da0
Use height difference between front and backside of line when stepping down
...
This should fix the janky falling off steep slopes and let you cling to them.
Because when falling off a sector the edge of the player must not intersect
the edge of the higher sector, it is trickier than step up. The height
difference at the line must be stored to be useful.
2020-10-14 21:10:02 -07:00
James R
1347157e21
Merge branch 'fix-gzip-makefile-failure' into 'master'
...
Fix gzip failing to compress SRB2's objdump on non-Windows.
See merge request STJr/SRB2!1191
2020-10-14 03:11:26 -04:00
James R
dab116a0bd
CODE
2020-10-13 21:44:48 -07:00
James R
0d116b39c5
Compare height for step up on edge of sector
...
This is for slopes. When moving across a slope the height changes. Therefore
compare the height at the edge where slopes meet so only a wall will block the
player, and not a very steep slope.
2020-10-13 20:27:36 -07:00
GoldenTails
e97a5d6087
Fix gzip failing to compress SRB2's objdump on non-Windows.
2020-10-12 16:59:47 -05:00
James R
ffeb48ab4d
Merge branch 'update-228' into 'next'
...
2.2.8 prep
See merge request STJr/SRB2!1170
2020-10-03 01:45:06 -04:00
James R
b54bb3b596
Update appveyor.yml version
2020-10-02 18:05:12 -07:00
James R
bb98bea911
Merge branch 'picfmt-pngfix' into 'next'
...
Fix uninitialized variable issue in patches with missing grAb chunks
See merge request STJr/SRB2!1171
2020-10-02 20:24:10 -04:00
James R
98be08db0b
Merge branch 'fartification' into 'next'
...
Prevent Canarivore gas from teleporting up walls
See merge request STJr/SRB2!1154
2020-10-02 20:23:36 -04:00
James R
94415facfe
Merge branch 'windows-console-go-brrr' into 'next'
...
Fix #178
Closes #178
See merge request STJr/SRB2!1112
2020-10-02 20:23:20 -04:00
James R
8152c0c32a
Merge branch 'remove-renderer-notice' into 'next'
...
Remove "The OpenGL renderer is incomplete" notice (closes #281 )
Closes #281
See merge request STJr/SRB2!1169
2020-10-02 20:22:38 -04:00
James R
2768e4008f
Merge branch 'load-graphics-after-startuppwads' into 'next'
...
Fix graphics replacements not taking effect via -file
See merge request STJr/SRB2!1168
2020-10-02 20:22:11 -04:00
Jaime Passos
f75aa6cd18
Use leftoffset and topoffset, not loffs and toffs
2020-10-02 20:40:42 -03:00
James R
92cd4fd8ba
Update Srb2win.rc
2020-10-02 16:11:39 -07:00
James R
7b812a8e27
Update version to 2.2.8
2020-10-02 16:10:21 -07:00
James R
41a0fd52c1
Update patch.pk3
2020-10-02 16:07:15 -07:00
Jaime Passos
9ad15fd556
Fix PNG issue in OpenGL + optimize PNG sprite loading
2020-10-02 19:48:13 -03:00
James R
e42eb9aba8
Revert "Warn when going to OpenGL from the menu"
...
This reverts commit 3883d44bb55c1b3baf18
2020-10-02 15:37:23 -07:00
SteelT
542f1cc470
Merge branch 'the-scary-22-merge' of https://git.do.srb2.org/KartKrew/Kart into the-scary-22-merge
2020-10-02 15:31:12 -04:00
SteelT
5bfebef1e9
Fix models texture PNG path when attempting to load fallback models
2020-10-02 15:25:12 -04:00
James R
3dad7ca226
Move HU_LoadGraphics after startuppwads are loaded
...
This is needed for graphics replacements to take effect.
2020-10-02 11:54:58 -07:00
James R
e7c493904a
Merge branch 'netids-break-again-fuck-this' into 'next'
...
Fix net ids broken AGAIN (closes #310 )
Closes #310
See merge request STJr/SRB2!1166
2020-10-01 23:13:05 -04:00
James R
9adbb7dfa3
Fix off by one
2020-10-01 16:55:17 -07:00
James R
d612fb5c99
Add wads from the -file parameter after netvars are registered
...
This is so netvars registered by any lua scripts will load in the correct order.
2020-10-01 16:50:31 -07:00
sphere
d4fdf8ee16
Remove "RC3"
2020-09-30 20:25:55 +02:00
sphere
c81d5ffd7c
Merge branch 'credits-changes' into 'next'
...
Credits changes
See merge request STJr/SRB2!1161
2020-09-30 13:25:39 -04:00
lachwright
6fa06c4523
Update ICNS icon for macOS
...
Replaced some of the lower resolution variants with some smoother downscales. The 16x16 one is even Sonic's 1-up icon from the game!
2020-10-01 02:47:24 +10:00
Sally Coolatta
884eb3d515
Error icon for when a map is missing its signpost
2020-09-30 06:00:13 -04:00
sphere
5e876fc805
Fix Arrietty's name being misspelled.
2020-09-29 18:06:50 +02:00
sphere
e00753e427
Game design is a team effort.
2020-09-29 17:23:44 +02:00
sphere
c020257d1d
Merge Programming and Programming Assistance, and some other tweaks.
2020-09-28 15:54:10 +02:00
sphere
5a1b87689b
These people deserve to be in the credits proper, also formatting fixes.
2020-09-28 14:48:55 +02:00
