TehRealSalt
a1be15134e
Maybe fixed
2018-02-10 16:28:45 -05:00
TehRealSalt
e4b1bd3365
Minor fixes, mostly mobjscale and spectators
2018-02-10 16:19:22 -05:00
TehRealSalt
495ee25f18
Chaotix sound effects, new music names
2018-02-10 16:01:09 -05:00
TehRealSalt
eab1120950
New invincibility effect, grow/shrink stuff
...
Whenever grow/shrink effects get made, I'll remove the Mario-style
stuttered growth and whatever else needs doing beyond that
2018-02-10 01:19:33 -05:00
TehRealSalt
b83dd75a99
Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
2018-02-09 21:16:10 -05:00
TehRealSalt
2a563d6f25
Faster
2018-02-09 21:14:14 -05:00
Monster Iestyn
02862511ae
Fix SOC/Lua loading messages to display full names or even display at all (for PK3s at least), and otherwise some cleanup of existing code for the messages.
...
Also, I moved lua_lumploading on/offing to LUA_LoadFile.
2018-02-09 22:43:08 +00:00
TehRealSalt
c542e0453c
Slight adjustment
2018-02-09 16:04:52 -05:00
Monster Iestyn
7243355923
Make sure both software and OpenGL ignore patches that are completely out of a multi-patch texture's bounds.
...
This fixes OpenGL in particular crashing because of such a weird situation.
2018-02-09 17:23:35 +00:00
TehRealSalt
74ccda156b
Merge remote-tracking branch 'refs/remotes/origin/master' into democracy
2018-02-08 21:24:56 -05:00
TehRealSalt
184ec0340b
Added axis support
2018-02-08 21:24:44 -05:00
Sryder13
864f55b57b
Some warning fixes
2018-02-09 00:58:10 +00:00
TehRealSalt
80ba8792bd
P != M
2018-02-08 18:14:56 -05:00
TehRealSalt
496eac9705
Minor adjustments in hopes that I fixed the resynch bomb on gametype switch?
2018-02-08 17:13:06 -05:00
Monster Iestyn
fb6c96de00
Merge branch 'stopleakingnames' into 'master'
...
Stop leaking names via metadata.
See merge request STJr/SRB2!223
2018-02-08 16:14:15 -05:00
Monster Iestyn
de8b6e2c96
Merge branch 'master' into hardcoding-time-again
2018-02-08 20:33:17 +00:00
Monster Iestyn
46704455bb
Merge branch 'master' into file-loading-cleanup
2018-02-08 20:32:59 +00:00
Monster Iestyn
78d3ddcb34
Merge branch 'public_next'
2018-02-08 20:31:53 +00:00
Monster Iestyn
6f491daa94
Merge branch 'playdemo-custom-home-fix' into 'next'
...
Fix for "playdemo" not working with custom home paths
See merge request STJr/SRB2!221
2018-02-08 15:29:39 -05:00
Monster Iestyn
a550ff6692
Merge branch 'lua-archive-crash-hotfixes' into 'next'
...
Hotfix for "LUA PANIC" crash when joining a netgame
See merge request STJr/SRB2!222
2018-02-08 15:29:20 -05:00
Monster Iestyn
8a9bbb9a2b
Merge branch 'general-sky-fixes' into 'master'
...
General sky fixes
See merge request STJr/SRB2Internal!132
2018-02-08 13:41:57 -05:00
Sryder13
2a8d91c79f
The main explosion particles bounce off the floor too
2018-02-08 15:46:07 +00:00
TehRealSalt
a299222db7
Guess what.
...
A typo. :V
2018-02-08 00:53:25 -05:00
TehRealSalt
ef0770edda
/me tears away a piece of drywall
...
What's revealed is that democracy is actually made *entirely* out of
extremely minor 1 character long typos eating away at the structural
integrity of the building, and then the crack starts oozing green slime,
and then a creepy hand comes out and grabs you
2018-02-08 00:45:59 -05:00
TehRealSalt
c32591e767
Minor fixes
2018-02-07 22:45:40 -05:00
TehRealSalt
782a5d7fd9
Merge remote-tracking branch 'refs/remotes/origin/master' into democracy
2018-02-07 22:34:33 -05:00
TehRealSalt
acc4b0bb76
Belp
...
- Minimap heads that aren't yours are transparent
- Minimap has a visibility slider
- Bomb stuff renamed to Mine
2018-02-07 22:33:27 -05:00
Monster Iestyn
2692d6f9dc
optimised R_ExpandPlane too
2018-02-07 18:11:32 +00:00
Monster Iestyn
5533c97c69
Fixed sky-sky thok barriers showing HOM (turns out the floor and ceiling share the same plane, so I've modified the code to account for this)
...
Additionally, place some optimisations in both software and OpenGL; in particular one has been added for when all of back and front sector (floor and ceiling) is sky: since everything is "open" anyway, we can simply the usual checks involved.
2018-02-07 17:46:01 +00:00
Steel Titanium
361bd92b4a
Smoother MD2 interpolation
2018-02-06 14:50:08 -05:00
TehRealSalt
d6d0a38a23
Merge remote-tracking branch 'refs/remotes/origin/flair' into sonicitems
...
# Conflicts:
# src/k_kart.c
# src/k_kart.h
# src/p_enemy.c
2018-02-05 21:08:01 -05:00
TehRealSalt
c1dab359e0
Forgotten
2018-02-05 20:23:09 -05:00
TehRealSalt
648c7e6af6
Colored boom
...
Not tested *yet*
2018-02-05 20:10:20 -05:00
TehRealSalt
fdf70ebbc5
Merge remote-tracking branch 'refs/remotes/origin/master' into flair
2018-02-05 19:56:49 -05:00
TehRealSalt
3e6761c3a1
Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
2018-02-05 19:43:32 -05:00
TehRealSalt
48f7a894c1
Fix more conflicts that I forgot
2018-02-05 19:40:26 -05:00
Sryder13
ba07bb7a54
Fix the explosion smoke ring (and warning)
2018-02-06 00:23:10 +00:00
TehRealSalt
bfe58a819a
Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
...
# Conflicts:
# src/dehacked.c
# src/hardware/hw_main.c
# src/info.c
# src/info.h
# src/k_kart.c
# src/p_enemy.c
# src/p_user.c
# src/r_things.c
2018-02-05 19:08:49 -05:00
TehRealSalt
806dba97ae
So much
...
- Renamed fucking everything
- Threw out all of the item code because it looks at me funny
2018-02-05 18:55:52 -05:00
Sryder13
b1b3cf52cc
New bomb explosion effect
2018-02-05 22:53:31 +00:00
Sryder13
fb87601d52
Some explosion stuff
...
Sphere spawns at centre and quickly grows before stopping
While sphere grows players get flung up
Fix some issues with battle mode stuff stopping bobombs from working
2018-02-05 19:24:54 +00:00
Sryder13
ea384ce4a2
Draw Minimap at regular size
...
Also positioned the minimap completely at the side of the screen as they're 5% scaled anyway
2018-02-05 03:59:36 +00:00
Sryder13
64bebe246d
Merge branch 'minimapfix' into flair
2018-02-05 03:28:09 +00:00
Sryder13
303ea2dbbc
Pure white and pure black shouldn't change on star colormap
2018-02-05 02:53:55 +00:00
Sryder13
58a6d59a5c
Star colour support for MD2s
2018-02-05 02:11:17 +00:00
Sryder13
fe89ce941b
Star colormap is decided to be used per mobj with mobj->colorize
...
Star creates afterimages that are colorized and fullbright
Star makes the player fullbright
2018-02-05 00:00:36 +00:00
Sryder13
be079b2fe6
Merge branch 'master' of http://git.magicalgirl.moe/KartKrew/Kart.git into gameplay-tweaks
...
# Conflicts:
# src/g_game.c
2018-02-04 20:39:53 +00:00
TehRealSalt
62192316ba
Everything
...
Been a while since I synced :V
2018-02-03 23:47:47 -05:00
Monster Iestyn
17bedfbd87
Correct backwards skies for OpenGL too
2018-02-03 21:39:36 +00:00
Monster Iestyn
e95987f4ae
Added proper support for upside-down thok barriers, in both renderers
...
Thankfully it was really just a copy+paste of the code I already tinkered with for the normal ceiling sky based thok barriers, but tweaked for floors instead
2018-02-03 19:48:18 +00:00
