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 |
|
Jaime Passos
|
dbb1575a6d
|
Animations, better flat management.
|
2019-05-21 15:24:26 -03:00 |
|
Jaime Passos
|
869f1e4e8d
|
Fix warnings
|
2019-05-21 11:03:53 -03:00 |
|
Jaime Passos
|
35d6da159d
|
HOLD UP
|
2019-05-21 09:50:39 -03:00 |
|
Steel Titanium
|
ce1c1d8c88
|
Forgot some references
|
2019-05-20 23:31:23 -04:00 |
|
Jaime Passos
|
714c997aac
|
Support for patches and textures to be used in place of sector flats
Still a work in progress.
|
2019-05-21 00:28:52 -03: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 |
|
mazmazz
|
f30d91ee75
|
Merge remote-tracking branch 'public-gl/md3-vanilla' into md3-vanilla
|
2019-05-08 17:59:49 -04:00 |
|
mazmazz
|
6d803decb6
|
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
|
2019-05-08 17:56:05 -04:00 |
|
Monster Iestyn
|
f0e16cad32
|
Merge branch 'master' into next
|
2019-05-08 16:31:05 +01:00 |
|
Monster Iestyn
|
8ea9d0e95c
|
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 |
|
wolfy852
|
8f05d75926
|
Don't skip frames when connecting or paused
|
2019-05-08 09:39:45 -05:00 |
|
wolfs
|
e394f41c52
|
Merge branch 'public-musicplus-tagfix' into 'next'
Fix music load lag by reverting tag changes
See merge request STJr/SRB2!486
|
2019-05-07 22:42:13 -04:00 |
|
Monster Iestyn
|
360a6ff89a
|
Merge branch 'public_flatsprite' into 'public_flatsprite'
Merge in next and don't billboard papersprites in GL
See merge request STJr/SRB2!488
|
2019-05-06 15:34:35 -04:00 |
|
Sryder
|
b304b268c8
|
No sprite billboarding on papersprites
|
2019-05-06 20:24:26 +01:00 |
|
Sryder
|
1f1d67cd7e
|
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite
# Conflicts:
# src/p_user.c
|
2019-05-06 20:20:57 +01:00 |
|
Monster Iestyn
|
406c3619d7
|
Merge branch 'master' into next
|
2019-05-06 19:38:53 +01:00 |
|
Nev3r
|
aab2f55aec
|
Merge branch 'banip-command' into 'next'
Ban IP command
See merge request STJr/SRB2!460
|
2019-05-06 13:09:14 -04:00 |
|
Nev3r
|
ae25e8ea07
|
Merge branch 'console-wait-fix' into 'master'
Don't count down wait timer when executing a command line
See merge request STJr/SRB2!483
|
2019-05-06 12:56:07 -04:00 |
|
Nev3r
|
8b8e165d19
|
Merge branch 'opengl-sprite-billboarding' into 'master'
OpenGL Sprite Billboarding
See merge request STJr/SRB2!485
|
2019-05-06 12:45:53 -04:00 |
|
Sryder
|
8273534967
|
Add a cvar for sprite billboarding, off by default.
|
2019-05-06 16:57:32 +01:00 |
|
Monster Iestyn
|
ea951eef78
|
fix an inconsistency I introduced between counting the waypoints and finding them again
|
2019-05-05 21:16:44 +01:00 |
|
Monster Iestyn
|
ee0c4b42a6
|
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-05 21:03:15 +01:00 |
|
Monster Iestyn
|
b9611c3a81
|
Hardcoded the cork's stun-you-even-while-flashing behaviour
|
2019-05-05 19:16:30 +01:00 |
|
Monster Iestyn
|
b0087616c7
|
Hardcoded the boss's TouchSpecial hook.
Also cleaned up this part of P_TouchSpecialThing a bit while I'm here
|
2019-05-05 18:22:19 +01:00 |
|
Monster Iestyn
|
373d12cb82
|
Hardcode "slapstick"
|
2019-05-05 17:36:55 +01:00 |
|
Monster Iestyn
|
f7fbf40437
|
Hardcoded MT_FSGNA's MobjThinker hook function
|
2019-05-05 16:42:50 +01:00 |
|