Steel Titanium
|
8e5593c207
|
Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt
# Conflicts:
# .travis.yml
# src/m_menu.c
# src/sdl/Srb2SDL-vc10.vcxproj
# src/sdl/Srb2SDL.props
|
2019-06-11 17:48:00 -04:00 |
|
Monster Iestyn
|
67392baae0
|
Merge branch 'public_next'
# Conflicts:
# src/doomdef.h
# src/hardware/hw_draw.c
# src/m_misc.c
# src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
|
2019-06-09 20:04:08 +01:00 |
|
Steel Titanium
|
605e32004a
|
Merge branch '2.1.24-prep' into 'next'
Update version to 2.1.24
See merge request STJr/SRB2!495
|
2019-06-08 17:08:34 -04:00 |
|
Monster Iestyn
|
c21b9e632a
|
Merge branch 'next' into 2.1.24-prep
# Conflicts:
# debian-template/control
# debian/changelog
|
2019-06-07 23:18:31 +01:00 |
|
Alam Ed Arias
|
cd1c87ea71
|
Merge branch 'master' into next
|
2019-06-07 18:07:32 -04:00 |
|
Alam Ed Arias
|
d5c1fe6467
|
Merge branch 'gme-msvc' into 'master'
Add GME to MSVC 10 solution
See merge request STJr/SRB2!448
|
2019-06-07 18:06:51 -04:00 |
|
Steel Titanium
|
593fcae69a
|
Merge branch 'next' into 2.1.24-prep
|
2019-06-07 18:02:09 -04:00 |
|
Alam Ed Arias
|
0c352b856d
|
Merge branch 'travis-deployer' into 'master'
Deploy OS X and Debian packages from Travis-CI
See merge request STJr/SRB2!449
|
2019-06-07 17:57:29 -04:00 |
|
Steel Titanium
|
8d5207975d
|
Merge branch 'master' into travis-deployer
# Conflicts:
# .travis.yml
|
2019-06-07 16:56:19 -04:00 |
|
Steel Titanium
|
6c4253a680
|
Merge branch 'jimita-flashpals-on-screenshots' into 'next'
Flashpals on screenshots
See merge request STJr/SRB2!492
|
2019-06-07 16:37:59 -04:00 |
|
Steel Titanium
|
9a6330ca4d
|
Merge branch 'more-limits' into 2.1.24-prep
|
2019-06-07 11:28:43 -04:00 |
|
Monster Iestyn
|
474b70aa69
|
Update version to 2.1.24
|
2019-06-07 15:48:33 +01:00 |
|
Nev3r
|
e180ee5dfe
|
Merge branch 'revert-370e4eec' into 'master'
Revert "Merge branch '144-scrolltweaks' into 'master'"
See merge request STJr/SRB2Internal!225
|
2019-06-04 13:37:53 -04:00 |
|
Monster Iestyn
|
eb3d0bdce8
|
Revert "Merge branch '144-scrolltweaks' into 'master'"
This reverts merge request !213
|
2019-06-04 17:34:59 +00:00 |
|
Steel Titanium
|
813ccf71e5
|
Merge branch 'next' into public-musicplus-libopenmpt
|
2019-06-03 15:36:50 -04:00 |
|
Steel Titanium
|
8f19878781
|
Upped freeslots limit
|
2019-06-03 15:23:48 -04:00 |
|
Monster Iestyn
|
df62955d4d
|
Merge branch 'checksight-fixes' into 'master'
P_CheckSight fixes
See merge request STJr/SRB2Internal!223
|
2019-06-02 13:13:48 -04:00 |
|
Monster Iestyn
|
e890cb1699
|
Merge branch 'master' into checksight-fixes
# Conflicts:
# src/p_sight.c
|
2019-06-02 18:13:02 +01:00 |
|
Monster Iestyn
|
190512d8b2
|
Merge branch 'acz-boss-hardcode' into 'master'
ACZ boss hardcode
See merge request STJr/SRB2Internal!221
|
2019-06-02 13:09:38 -04:00 |
|
Monster Iestyn
|
dbdfdaf1fe
|
Whoops, forgot to make P_CheckSight support slopes for same-sector FOF plane checking.
|
2019-05-27 21:18:02 +01:00 |
|
Monster Iestyn
|
309f4a10d0
|
Fixed P_CheckSight to support slopes, both for normal planes and FOF planes
(Untested)
|
2019-05-27 20:36:35 +01:00 |
|
Monster Iestyn
|
fb6fefd186
|
fix P_CheckSight to consider FOFs that completely block the view
(this could probably be in its own branch to be tested properly, but I'm on a roll with this atm)
|
2019-05-27 19:32:05 +01:00 |
|
Steel Titanium
|
2e8aae5d6a
|
Merge branch 'next' into jimita-flashpals-on-screenshots
|
2019-05-25 19:37:17 -04:00 |
|
Steel Titanium
|
5e6a778f84
|
Add missing PPA source
|
2019-05-25 16:20:16 -04:00 |
|
Steel Titanium
|
ff040ccced
|
Update libopenmpt to 0.4.4
|
2019-05-23 22:05:28 -04:00 |
|
Monster Iestyn
|
36415b0050
|
Hardcode the bomb's explosion states, the dust object type and states, and the sprite prefixes for both
|
2019-05-23 21:51:58 +01:00 |
|
Monster Iestyn
|
a2e0c1998a
|
Update hw_light.c
(though I'm not sure why we bother, since coronas have been disabled for a decade now)
|
2019-05-23 21:08:27 +01:00 |
|
Monster Iestyn
|
3cb336bdbc
|
Merge branch 'master' into acz-boss-hardcode
|
2019-05-23 20:38:25 +01:00 |
|
Monster Iestyn
|
10430628e6
|
Hardcoded ACZ3.wad's version of A_TNTExplode under the name of A_Boss5BombExplode. After a lot of confusion and silly misunderstandings on my part (as well as a lot of mess cleaning), I've finally got there!
The states for the actual bomb explosion effect itself are yet to be hardcoded, but that I'll do tomorrow afternoon probably.
|
2019-05-21 21:51:19 +01:00 |
|
Steel Titanium
|
ea29bae39e
|
Forgot some references
|
2019-05-20 23:31:23 -04:00 |
|
Steel Titanium
|
991181afa2
|
circleci: Fix compiling error
|
2019-05-20 23:22:23 -04:00 |
|
Steel Titanium
|
3cb6a81be8
|
Properly close the if
|
2019-05-20 22:17:38 -04:00 |
|
Steel Titanium
|
46606aa351
|
Move to before_install
|
2019-05-20 22:00:28 -04:00 |
|
Steel Titanium
|
2c8adcf0eb
|
travis: remove sudo from command
|
2019-05-20 21:56:43 -04:00 |
|
Steel Titanium
|
2d6116fa33
|
travis: Add gpg key for git-lfs on linux
|
2019-05-20 21:54:29 -04:00 |
|
Steel Titanium
|
2ede6dd29f
|
Merge branch 'master' into public-musicplus-libopenmpt
|
2019-05-20 21:33:10 -04:00 |
|
Monster Iestyn
|
dc5d13da46
|
Merge branch 'steelt-acz-things-hardcode' into 'master'
Hardcode some ACZ things
See merge request STJr/SRB2Internal!220
|
2019-05-17 12:22:21 -04:00 |
|
Monster Iestyn
|
5e87ab4fa7
|
Merge branch 'public_flatsprite'
|
2019-05-16 16:00:24 +01:00 |
|
Monster Iestyn
|
04a8c9a283
|
Merge branch 'public_next'
|
2019-05-16 15:58:17 +01:00 |
|
Monster Iestyn
|
c8e3748a1c
|
Merge branch 'master' into next
|
2019-05-13 16:07:30 +01:00 |
|
Monster Iestyn
|
11cc332378
|
Merge branch 'archiveworld-sigsegv-fix' into 'next'
Fix SIGSEGV from sending lindefs/sidedefs in savegame due to duplicated lines.
See merge request STJr/SRB2!490
|
2019-05-13 07:02:48 -04:00 |
|
Alam Ed Arias
|
be13ab4830
|
Fix NONET build
|
2019-05-13 01:51:36 -04:00 |
|
Steel Titanium
|
2c4555493d
|
Merge branch 'perpetual-modifier-updates' into 'master'
Set modifiers in a non-reactive manner
See merge request STJr/SRB2!456
|
2019-05-13 00:36:06 -04:00 |
|
Steel Titanium
|
f235f45431
|
Merge branch 'no-frameskip' into 'next'
Don't skip frames when connecting or paused
See merge request STJr/SRB2!489
|
2019-05-13 00:35:11 -04:00 |
|
Steel Titanium
|
0f616a7141
|
Properly fix crash due to duplicated lines.
|
2019-05-13 00:23:43 -04:00 |
|
Steel Titanium
|
9ec6d5e653
|
Revert "Check that lumps are okay"
This reverts commit 3f4121085b.
|
2019-05-13 00:20:39 -04:00 |
|
Steel Titanium
|
ed6bd64014
|
Hardcode some ACZ things
|
2019-05-11 22:56:23 -04:00 |
|
James R
|
3f4121085b
|
Check that lumps are okay
|
2019-05-08 20:30:19 -04:00 |
|
Monster Iestyn
|
5756583612
|
Merge branch 'master' into next
|
2019-05-08 16:31:05 +01:00 |
|
Monster Iestyn
|
2b636ae614
|
Merge branch 'alias_recursion_hotfix_2' into 'master'
Alias recursion hotfix 2
See merge request STJr/SRB2!482
|
2019-05-08 11:25:15 -04:00 |
|