Sally Coolatta
72d77f7fb5
Invincibility updates
...
- You flash white while in invincibility
- Invincibility is not rainbow UNTIL you go above the initial timer.
- Increased visibility of the shield effect around invincible players.
- Invincibility sparkles have trailing afterimages.
- Disabled invincibility speed lines; they now use the normal speedlines but grey/rainbow. (The code/sprites will be used for something later.)
- Using invincibility adds time, instead of setting it.
- Player hitbox is finally bigger, to actually match the shadow size.
2022-05-08 03:43:53 -04:00
Shane Ellis
4ef77365a4
Add VERSIONSTRING_RC to DEVELOP builds for compiler compatibility
2022-03-18 18:37:20 +00:00
toaster
bf6b9c6fed
Remove music slot compatibility
...
# Conflicts:
# src/deh_lua.c
# src/lua_baselib.c
2022-03-18 13:54:03 +00:00
Sally Coolatta
a750fdd810
Invincibility wasn't using K_RainbowColor anymore, what the function was designed for...
2022-02-16 23:01:07 -05:00
James R
b30ffea49a
Hash name lookup for textures and lumps
2022-01-22 03:18:06 -08:00
Sally Coolatta
9d7ec0ab8f
Merge SRB2 next
...
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
2021-02-27 05:18:36 -05:00
James R
41f1b3b97c
Kill SEENAMES
2020-12-12 02:11:23 -08:00
Sally Coolatta
0dc0ff8e6f
More finalized Chaos Emerald visuals
2020-11-15 15:11:13 -05:00
Sally Coolatta
2509d5a29c
Merge branch 'the-scary-22-merge' into battle-rethink
2020-10-24 21:39:32 -04:00
Sally Coolatta
9b6aa946ea
Merge remote-tracking branch 'srb2/master' into the-scary-22-merge
2020-10-24 19:28:06 -04:00
Sally Coolatta
fda698a290
Merge master
2020-10-24 18:34:07 -04:00
Sally Coolatta
0969ca1af9
Karma bombs rework
...
- Fixed the bugs with them in our last netgame
- Karma bombs are no longer slippery or have stat changes
- Karma bombs cannot pick up spheres. Their remaining spheres before they died are removed 1 per tic.
- Karma bombs are out of the game permanently when touching the overtime barrier
- When successfully hurting another player, instead of getting 0.5 bumpers, they steal ALL of the opponent's bumpers, effectively swapping places with them. One bumper is lost in the process, meaning bumpers are slowly flitered out the more people need to come back.
- Removed karma items/eggboxes... hopefully this is temporary and we can bring them back later, but currently we don't have a design for how they should work under the new rules :x. They are still in the code behind the `OTHERKARMAMODES` define
- Bumpers & comeback timer are now player_t variables instead of kartstuff shit
- eliminated boolean on player_t for checking when a player touched the barrier
2020-10-24 11:27:42 -04:00
Jaime Passos
b84a7ebd53
Remove FLOORSPLATS define
2020-10-19 17:33:16 -03:00
Jaime Passos
b4b4738c94
Changes to sprite rendering:
...
- Added render flags (see r_defs.h)
- Implemented floor splats
- Drop shadow sprite rendering through render flags
2020-10-12 00:13:22 -03:00
Jaime Passos
b44837324f
Merge branch 'next' into patch-stuff-again-2
2020-10-10 17:01:10 -03:00
Steel Titanium
ca6689c8a0
Fix quotes appearing in product version string
2020-09-25 18:55:37 -04:00
Sally Coolatta
b5fcd74ef9
Merge master
...
Slopes in a few maps are really broken ... think it's anchors, I'm gonna leave that to jart :V
2020-09-25 12:00:50 -04:00
James R
922f6aa9f8
Scale volume cvars by half, 200% max and 50% default
2020-09-25 02:23:44 -07:00
James R
c9e3281b99
Merge remote-tracking branch 'origin/master' into tinnitus
2020-09-25 01:57:08 -07:00
James R
e5009348f8
Fix fov on vertical perspective (fixes jittery view morph!!)
2020-09-24 16:48:56 -07:00
James R
ef108cbb36
Merge remote-tracking branch 'pub/next'
2020-09-20 14:07:54 -07:00
James R
99115d9e76
Update update alert message
2020-09-11 20:12:31 -07:00
James R
a7d7933c5a
Disable update alert if this is a prerelease
2020-09-01 16:22:29 -07:00
James R
1922a78a3b
Define BETAVERSION as a suffix to the version string
2020-09-01 15:38:27 -07:00
James R
d78befc713
Merge branch 'master' into next
2020-08-31 16:10:05 -07:00
James R
7cbc9add07
Kill NOHS
...
(cherry picked from commit a79316b375
2020-08-31 16:06:40 -07:00
James R
b66b0bf648
Update versions to 1.3
2020-08-30 19:06:31 -07:00
James R
754347987d
Fix stupid NONET
...
(cherry picked from commit 679bfa21edec6b652def93082da5586e6c755678)
2020-08-29 18:19:39 -07:00
James R
e6c914c7b2
Fix stupid NONET
2020-08-29 17:51:59 -07:00
James R
d31fb748b2
Do not do master server things when NOCURL
...
(cherry picked from commit b681b6e9e6
2020-08-29 17:45:28 -07:00
James R
a79316b375
Kill NOHS
2020-08-24 17:58:39 -07:00
Sally Coolatta
36c5abf611
Fix version string
2020-08-23 04:44:05 -04:00
FlykeSpice
2424418390
Remove ESLOPE #ifdef(backport from srb2 2.2)
2020-08-20 13:02:13 -04:00
James R
b681b6e9e6
Do not do master server things when NOCURL
2020-08-16 21:42:58 -07:00
Sally Coolatta
5a6263c36b
Make it past p_mobj
2020-08-14 20:48:06 -04:00
Sally Coolatta
e14f4a5842
Merge g_demo.c, remove OLD22DEMOCOMPAT
2020-08-10 12:14:23 -04:00
lachwright
908bd42dc4
Merge doomdef.h
2020-08-10 12:06:20 +08:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04:00
Jaime Passos
f6a5acc6f3
Remove LUA_PATCH_SAFETY
2020-08-08 14:56:04 -03:00
James R
72e225f8c9
Rename digmusicvolume to musicvolume, default soundvolume and musicvolume to 100%
2020-08-07 12:43:59 -07:00
James R
9077a4ff03
Kill MIDI
2020-08-07 12:39:08 -07:00
James R
374d032a6b
Clean up stuff, make volume work again
2020-08-07 12:29:37 -07:00
James R
7adf2159f6
Reduce songs and sounds to 1/4 volume, add a musicdef option for volume
2020-08-06 21:24:41 -07:00
Sally Coolatta
59eb714bef
Merge doomdef.h
2020-08-06 17:42:29 -04:00
Sally Coolatta
cdb0310982
Merge info.c/h
2020-08-06 17:38:29 -04:00
SteelT
6d850b51d9
Handle doomdef.h a bit
2020-08-04 01:06:15 -04:00
Steel Titanium
62c85ea4a5
WIP: Remove support for DOS
...
WIP because I don't know if this wording is right for the error.
2020-07-25 18:55:51 -04:00
James R
3a34fa8561
Merge remote-tracking branch 'origin/master' into next
2020-07-12 17:11:22 -07:00
James R
d06eb9dc5f
Merge branch 'netid-take-2' into 'next'
...
Use ordered id for netvars instead of shitty hash
See merge request STJr/SRB2!1010
2020-07-11 02:00:06 -04:00
James R
f4989f36bd
Fix a lot of stuff related to the version automation
2020-07-10 22:39:46 -07:00
