Steel Titanium
|
2069f2be56
|
Update readme.md
|
2019-06-11 19:11:42 -04:00 |
|
Steel Titanium
|
58bb05be00
|
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
|
e7e3b0ef38
|
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
|
bfa7325295
|
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
|
f5d883bd12
|
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
|
ea08ba3fba
|
Merge branch 'master' into next
|
2019-06-07 18:07:32 -04:00 |
|
Alam Ed Arias
|
83b8a98df4
|
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
|
c0c1e5416f
|
Merge branch 'next' into 2.1.24-prep
|
2019-06-07 18:02:09 -04:00 |
|
Alam Ed Arias
|
3edf73f181
|
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
|
3c08ee1313
|
Merge branch 'master' into travis-deployer
# Conflicts:
# .travis.yml
|
2019-06-07 16:56:19 -04:00 |
|
Steel Titanium
|
e1d025cd2b
|
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
|
eb99ad0437
|
Merge branch 'more-limits' into 2.1.24-prep
|
2019-06-07 11:28:43 -04:00 |
|
Monster Iestyn
|
6f6d912fa6
|
Update version to 2.1.24
|
2019-06-07 15:48:33 +01:00 |
|
Nev3r
|
3ceaae9573
|
Merge branch 'revert-1d401d84' 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
|
0fd3668111
|
Revert "Merge branch '144-scrolltweaks' into 'master'"
This reverts merge request !213
|
2019-06-04 17:34:59 +00:00 |
|
Steel Titanium
|
81dec89aeb
|
Merge branch 'next' into public-musicplus-libopenmpt
|
2019-06-03 15:36:50 -04:00 |
|
Steel Titanium
|
d4dac52766
|
Upped freeslots limit
|
2019-06-03 15:23:48 -04:00 |
|
Monster Iestyn
|
68585dbc70
|
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
|
b7f75246e4
|
Merge branch 'master' into checksight-fixes
# Conflicts:
# src/p_sight.c
|
2019-06-02 18:13:02 +01:00 |
|
Monster Iestyn
|
9e6fd595da
|
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
|
571c5b89b5
|
Whoops, forgot to make P_CheckSight support slopes for same-sector FOF plane checking.
|
2019-05-27 21:18:02 +01:00 |
|
Monster Iestyn
|
abfdac15a8
|
Fixed P_CheckSight to support slopes, both for normal planes and FOF planes
(Untested)
|
2019-05-27 20:36:35 +01:00 |
|
Monster Iestyn
|
ad4006712e
|
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
|
dc273d3f23
|
Merge branch 'next' into jimita-flashpals-on-screenshots
|
2019-05-25 19:37:17 -04:00 |
|
Steel Titanium
|
09e600c07d
|
Add missing PPA source
|
2019-05-25 16:20:16 -04:00 |
|
Steel Titanium
|
c8a5597492
|
Update libopenmpt to 0.4.4
|
2019-05-23 22:05:28 -04:00 |
|
Monster Iestyn
|
677801f5ff
|
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
|
e60b0b1a80
|
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
|
7d0509f1cb
|
Merge branch 'master' into acz-boss-hardcode
|
2019-05-23 20:38:25 +01:00 |
|
Monster Iestyn
|
742b11c0ff
|
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
|
ce1c1d8c88
|
Forgot some references
|
2019-05-20 23:31:23 -04:00 |
|
Steel Titanium
|
bf3d5f4188
|
circleci: Fix compiling error
|
2019-05-20 23:22:23 -04:00 |
|
Steel Titanium
|
e00af6ffec
|
Properly close the if
|
2019-05-20 22:17:38 -04:00 |
|
Steel Titanium
|
e280d1d83f
|
Move to before_install
|
2019-05-20 22:00:28 -04:00 |
|
Steel Titanium
|
ce87ed97fb
|
travis: remove sudo from command
|
2019-05-20 21:56:43 -04:00 |
|
Steel Titanium
|
9b174b9d02
|
travis: Add gpg key for git-lfs on linux
|
2019-05-20 21:54:29 -04:00 |
|
Steel Titanium
|
91767a7740
|
Merge branch 'master' into public-musicplus-libopenmpt
|
2019-05-20 21:33:10 -04:00 |
|
Monster Iestyn
|
ec0719f74f
|
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
|
572328a4fa
|
Merge branch 'public_flatsprite'
|
2019-05-16 16:00:24 +01:00 |
|
Monster Iestyn
|
66bc287688
|
Merge branch 'public_next'
|
2019-05-16 15:58:17 +01:00 |
|
Monster Iestyn
|
600a373739
|
Merge branch 'master' into next
|
2019-05-13 16:07:30 +01:00 |
|
Monster Iestyn
|
2a9019c15e
|
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
|
addf2bb3c4
|
Fix NONET build
|
2019-05-13 01:51:36 -04:00 |
|
Steel Titanium
|
8a14427420
|
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
|
06961a8f5e
|
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
|
cad65ad5e9
|
Properly fix crash due to duplicated lines.
|
2019-05-13 00:23:43 -04:00 |
|
Steel Titanium
|
4e0cc2505a
|
Revert "Check that lumps are okay"
This reverts commit 7ac0a8b4d2.
|
2019-05-13 00:20:39 -04:00 |
|
Steel Titanium
|
b34aa86403
|
Hardcode some ACZ things
|
2019-05-11 22:56:23 -04:00 |
|
James R
|
7ac0a8b4d2
|
Check that lumps are okay
|
2019-05-08 20:30:19 -04:00 |
|
Monster Iestyn
|
f0e16cad32
|
Merge branch 'master' into next
|
2019-05-08 16:31:05 +01:00 |
|