Commit Graph
7280 Commits
Author SHA1 Message Date
fgsfds 33cc89e8fd Merge pull request #371 from Calinou/add-crosshair-health-option
Add an option to color crosshair according to player health + shield
2024-01-28 18:39:05 +01:00
fgsfds cc6df47eed Merge pull request #372 from Calinou/crosshair-hide-when-dead
Always hide crosshair when dead
2024-01-28 18:37:50 +01:00
Hugo Locurcio 02d7efb87f Add an option to color crosshair according to player health + shield
Shield is taken into account and is added to health for the calculation,
as the vast majority of damage types are fully blocked by a shield.

3 modes are available:

- Off (default)
- On (Green): Goes through a red-yellow-green-cyan gradient,
  closer to vanilla.
- On (White): Goes through a red-yellow-white-green gradient,
  closer to games like Xonotic.

When set to either of the On modes, the crosshair color setting
is ignored but the crosshair alpha setting is still used.
2024-01-27 19:21:05 +01:00
Hugo Locurcio 1f4d9c8cdc Always hide crosshair when dead
Previously, the crosshair would show up during the death animation
if Always Show Target is enabled or if aiming just before dying.
2024-01-27 19:19:06 +01:00
fgsfds 474a6df3d4 port: add spawn with weapon mp option
unfortunately it does not fit in the save buffer and won't save
2024-01-16 01:56:30 +01:00
fgsfds 9cde121b52 port: don't call rumble function if rumble strength is 0 2024-01-15 12:58:00 +01:00
fgsfds e53f26f3eb port: fix #347
patch submitted by Ryan Dwyer

The patch allows all humans/bots to be selected regardless of team. It also adds a check to make sure a bot is not given a command to attack itself.
2024-01-15 09:47:52 +01:00
fgsfds 81313f0c4e port: ifdef around sight scale changes 2024-01-14 21:21:19 +01:00
fgsfds cf5588478b Merge pull request #332 from Calinou/add-crosshair-size-option
Add a crosshair size option
2024-01-14 21:21:03 +01:00
fgsfds d9cb850848 Merge pull request #333 from AXDOOMER/port
Always use high detail weapon models
2024-01-14 21:20:36 +01:00
fgsfds b9db86f89b port: add command line parameter to select player file 2024-01-07 22:05:31 +01:00
fgsfds 6bd3597ff6 port: fix optionsmenu.c warnings 2024-01-07 18:40:32 +01:00
fgsfds 8645d0a82a port: don't use the existing log system in crashlog in case it crashes 2024-01-07 17:07:12 +01:00
fgsfds ba52580e0c port: display module offsets in the windows crashlog 2024-01-07 16:43:20 +01:00
fgsfds d1d288b96a port: don't use cv2pdb by default if it exists 2024-01-07 16:43:02 +01:00
fgsfds 06f2283180 port: use cv2pdb on windows executables if present 2024-01-07 16:09:04 +01:00
fgsfds b1b17e21c1 port: write crash info to log file even without --log 2024-01-07 15:40:30 +01:00
fgsfds c487e423b1 port: fix blur-related crash on Intel GPUs 2024-01-03 21:55:07 +01:00
fgsfds 49f607dd79 port: fix pal and jpn builds 2023-12-30 12:19:36 +01:00
fgsfds 787758c038 port: log branch name 2023-12-28 21:48:05 +01:00
fgsfds 3c62a967a2 port: display branch name in legal screen 2023-12-26 22:58:08 +01:00
fgsfds f2a2458795 port: fix typo 2023-12-22 12:33:34 +01:00
fgsfds a7ab358b43 port: simplify sight color code a bit 2023-12-22 12:32:13 +01:00
fgsfds a82ac025da Merge pull request #300 from Bobbar/port_crosshair_alpha
Crosshair Alpha Proof of Concept
2023-12-22 12:25:36 +01:00
fgsfds 461bf8d49b Merge pull request #314 from kronflux/port
port: add "Skedar Leader" track to Soundtrack menu
2023-12-22 12:24:46 +01:00
Richard M db1d00a9b0 port: add "Skedar Leader" track
Add the "Skedar Leader" track to the Combat Simulator Soundtrack selection menu as "Skedar Warrior" as we do not currently have the ability to use the official track name
2023-12-17 11:50:16 -07:00
fgsfds 92c66c93dc port: correct HUD aspect in horizontal 2-player splitscreen too 2023-12-17 12:52:11 +01:00
fgsfds 94df3fc58c Merge pull request #309 from djdv/feat/win-max
port: add maximize window option to extended menu
2023-12-17 12:30:25 +01:00
fgsfds f2545b4e53 port: fix GE muzzleflashes on single-shot guns 2023-12-17 12:28:47 +01:00
Dominic Della Valle 0221839699 port: add maximize window option to extended menu 2023-12-16 11:56:39 -05:00
Bobby Lovell 1698f53728 Update main.c to use new UInt config for crosshair color 2023-12-16 10:20:32 -05:00
Bobby Lovell 7ac734fc81 Merge branch 'fgsfdsfgs:port' into port_crosshair_alpha 2023-12-16 10:18:34 -05:00
fgsfds 28218b26c2 port: add setting for GE muzzle flashes and disable it by default 2023-12-16 15:22:23 +01:00
fgsfds 4233e5e066 Merge pull request #293 from Nyxem64/muzzleflash
GE Muzzle flash addition
2023-12-16 15:08:22 +01:00
fgsfds cdd7d6edac port: use strto* when parsing config instead of ato*
allows hex values
2023-12-16 15:08:14 +01:00
fgsfds 581c63fc27 Merge pull request #308 from djdv/feat/win-max
port: add start window maximized flag to config
2023-12-16 15:03:04 +01:00
fgsfds dee7ab7b54 Merge pull request #306 from Bobbar/port_u32_config_support
Add config support for unsigned integers.
2023-12-16 15:02:37 +01:00
Dominic Della Valle 8c509db888 port: add start window maximized flag to config 2023-12-16 07:04:52 -05:00
Bobby Lovell 5aa799718a Add support for unsigned integers. 2023-12-15 10:17:15 -05:00
Bobby Lovell 880a7a0971 Add back line inadvertently removed in 342e186f79 2023-12-15 08:10:31 -05:00
Bobby Lovell e84d83e404 Add missing ndef. 2023-12-14 16:08:53 -05:00
Bobby Lovell 79fb976bcf Implement a simple colored box menu item type and use that for the preview. 2023-12-14 16:03:29 -05:00
Bobby Lovell 519bd95a75 Center preview text. 2023-12-14 14:49:13 -05:00
Bobby Lovell 8421140e3f Remove comment. 2023-12-14 10:31:47 -05:00
Bobby Lovell 894ea53b29 Spell out colors... 2023-12-14 10:18:43 -05:00
Bobby Lovell fb05725c34 - Implement RGBA.
- Add preview label.
2023-12-14 10:13:27 -05:00
Bobby Lovell 2a6625278a - Fix RGB defines
- Just store the colour and parse RGBA values when modifying.
2023-12-13 13:48:06 -05:00
Bobby Lovell 342e186f79 Add option to change crosshair alpha, and could provide fully custom colors. Proof of concept. 2023-12-13 13:06:48 -05:00
J cabd40f898 GE Muzzle flash addition 2023-12-11 00:49:09 +00:00
fgsfds 0a7faf2409 port: add file patching system; add patch for #286
patch submitted by Ryan Dwyer
2023-12-07 17:20:34 +01:00