1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,621 Commits 9 Branches 6 Tags
latest
Commit Graph
7621 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
kitty624 a4d65edb05 Fix Items.xml classindex 
classindex of Flashlight(s) and RifleGrenadeDevive changed to match their entry in weapons.xml
 2025-01-24 22:06:01 +01:00
Marco Antonio J. Costaandmajcosta ebd2e25e0f Fix a wrong #ifdef to runtime check conversion 
I didn't get this right the first time, non-Chinese text was looking
funny in dialog boxes
 2025-01-09 21:37:19 -03:00
Marco Antonio J. Costaandmajcosta 997b49a96e Use the same enums for IntroType as Ja2 2025-01-09 21:34:20 -03:00
Marco Antonio J. Costaandmajcosta ff8376d625 Keep UB specific enum value for all builds 
but at the end, not beginning as to not make a mess

along with an intro.lua change in gamedir/Data-UB/Scripts this gets rid of a nasty preprocessor conditional in a header file
 2025-01-09 21:34:07 -03:00
Asdow 5db8e811bb Revert "Update Silhouette.xml" 
This reverts commit 104fa35d07.
 2025-01-08 11:02:45 +02:00
Asdow 104fa35d07 Update Silhouette.xml 2025-01-08 00:44:00 +02:00
Asdow 709c454bda Update ExplosionType.xml 2025-01-08 00:44:00 +02:00
Marco Antonio J. Costaandmajcosta 7aa0e18352 Revert "make sure these steps run" 
This reverts commit 1976dee738.

Revert "yet another fix for the github actions"

This reverts commit 552951795c.

Revert "make sure CI to assemble release on 'v*' tag push or manually"

This reverts commit 8897769f0d.
 2025-01-07 16:51:30 -03:00
KittyandGitHub 5985c98a12 Fix Staring Gear Carp (#128) 2025-01-07 19:56:14 +01:00
kitty624 2b40bcd515 Fix Carp Starting Gear Carp 
- fixed doublette in tags in set Ammo
- added additional AP ammo
 2025-01-07 19:51:32 +01:00
kitty624 b821447fff Fix Starting Gear Carp 
- had two times tag big0 in set "ammo", which doesn't work
- fixed doubled tag and also added additional one
- this set will now come with ammo in Ball, AP and Glaser
 2025-01-07 19:42:26 +01:00
Marco Antonio J. Costaandmajcosta 1976dee738 make sure these steps run 
otherwise there is no 'source' working directory for the final step
 2025-01-07 14:13:46 -03:00
Marco Antonio J. Costaandmajcosta 552951795c yet another fix for the github actions 
github.ref_name isn't 'master' when a tag is pushed, but the tag name,
so it won't trigger a release build when a 'v*' tag is pushed
 2025-01-07 13:19:03 -03:00
Marco Antonio J. Costaandmajcosta 8897769f0d make sure CI to assemble release on 'v*' tag push or manually 
also put bash script through shellcheck to be more posix compliant
 2025-01-07 13:09:23 -03:00
Asdow dcf202990f Remove duplicate header includes 2025-01-05 17:08:02 +02:00
Asdow db40cd433e Move mapscreen bottom coordinates' initialization 
Fixes radar map's initial  position in strategic screen being in the top right corner.
 2025-01-05 17:08:02 +02:00
Marco Antonio J. Costaandmajcosta ac6a1504df add a space to string to prevent compilation errors in GB2312 2025-01-05 10:04:04 -03:00
Marco Antonio J. Costaandmajcosta 22e67f66fa Move wine.cpp into its own library 
avoid extra compilations that way
 2025-01-05 07:57:57 -03:00
FunkyFr3shandmajcosta fd6ffd8d69 automatically add needed dll override for Linux/macOS/Android (WINE) 2025-01-05 07:06:01 -03:00
KittyandGitHub 381e3ac471 Reintroduction of Intro and Outro video files 
past issues for video files (blackscreen on start) appear to be solved

therefore reintroducing of video files (from an unpacked Intro.slf)

using a directory instead of .slf for ease of access
 2025-01-04 19:03:04 +01:00
kitty624 2ac90a1ee5 Reintroduction of Intro and Outro video files 
- past issues for video files (blackscreen on start) appear to be solved
- therefore reintroducing of video files (from an unpacked Intro.slf)
- using a directory instead of .slf for ease of access
 2025-01-04 18:41:48 +01:00
Marco Antonio J. Costaandmajcosta f471b74f5b fix inconsistent case for a few files 
you can now build in a case-sensitive filesystem
 2025-01-04 13:14:22 -03:00
majcostaandGitHub 4a16698cdb CHINESE: actually display BobbyR amount purchased correctly at runtime (#398) 
* Revert "Move CHINESE BOBBYR_ITEMS_BOUGHT_X conditional definition to i18n"

This reverts commit ecdc8916f2.

* actually display the amount purchased correctly at runtime
 2025-01-03 21:03:09 -03:00
Asdow be95207d74 Add missing entry to Silhouttes.xml 2025-01-02 22:29:00 +02:00
KittyandGitHub 81db8f3f2a Chinese translation update (#15) from zwwooooo 
Chinese translation update(by Forum of Playbar)
- update to items.xml
- added a chinese.slf to Data
 2025-01-02 21:09:11 +01:00
Marco Antonio J. Costaandmajcosta 846abf5f1c Convert Text.h to utf-8-sig and move ChineseSpecString* there 
This time without mangling the characters
 2025-01-02 13:53:27 -03:00
Marco Antonio J. Costaandmajcosta ed73bd07ae Revert "Make Chinese specific strings compile-time instead of conditional" 
When these lines were edited, I likely opened _ChineseText.cpp in the
wrong encoding, and therefore saved it in the wrong encoding, mangling
the characters

This reverts commit cd69f5f3ae.
 2025-01-02 13:53:27 -03:00
zwwooooo f1e73808c2 Chinese translation update(by Forum of Playbar) 2025-01-02 22:37:36 +08:00
Marco Antonio J. Costaandmajcosta b908bcecb9 fix missing icon in executable 
the Ja2.rc file needs to be in the add_executable target for the icon
to appear, and that one requires WinMain.

so get rid of dummy.cpp and put sgp/sgp.cpp in there
 2025-01-02 08:02:52 -03:00
KittyandGitHub 586a91cbc8 LBE update (#125) 
LBE update
small changes to possible combos
Tactical Sling can now be used with 3-day Pack and Blackhawk Patrol Pack as well
 2025-01-02 00:01:24 +01:00
kitty624 8affe74942 LBE update 
small changes to possible combos
Tactical Sling can now be used with 3-day Pack and Blackhawk Patrol Pack as well
 2025-01-01 23:57:46 +01:00
Marco Antonio J. Costaandmajcosta a7b0091a27 use link-time optimization when creating a release 
it's a lot slower, but we don't release often
 2025-01-01 18:10:47 -03:00
Marco Antonio J. Costaandmajcosta 7aafa7aada fix the GitHub actions for VS2022's quirk too 
missed this change in 98cdffe5, fix it now
 2025-01-01 18:10:47 -03:00
HazapuzaandGitHub 0c03e4d6ad Merge branch '1dot13:master' into 1dot13-gamedir-dev 2025-01-01 02:26:47 +02:00
majcostaandGitHub 3e76e9525e Merge pull request #378 from majcosta/pr_remove_language_from_preprocessor 
Get every language preprocessor conditional into one library
 2024-12-31 18:32:50 -03:00
Marco Antonio J. Costa 959c29434e Adjust the build system 
Language is now just built once per app (still some JA2UB conditionals
going on in there) but building everything should now take eight times
less work
 2024-12-31 18:24:36 -03:00
KittyandGitHub 3b6f044b57 Merge pull request #123 from FunkyFr3sh/master 
update to cnc-ddraw 7.1
 2024-12-31 21:23:21 +01:00
Marco Antonio J. Costa e9686c0dca reformat CMakeLists.txt 2024-12-31 16:28:45 -03:00
Marco Antonio J. Costa 10037291f3 remove preprocessor from i18n Multi Language Graphic Utils.cpp 2024-12-31 16:28:44 -03:00
Marco Antonio J. Costa 9ed713f952 move Utils/Multi Language Graphic Utils.* to i18n 
has language preprocessor silliness, straight to jail
 2024-12-31 16:28:44 -03:00
Marco Antonio J. Costa cccec0ef11 straggler in Utils/Font Control.cpp 2024-12-31 16:28:44 -03:00
Marco Antonio J. Costa 4a7625cef0 Slightly clunky RUSSIAN conversion 2024-12-31 16:28:44 -03:00
Marco Antonio J. Costa 70f09471c2 just cast g_lang into lua's language code 
because magically I got the enum order right first try
 2024-12-31 16:28:44 -03:00
Marco Antonio J. Costa b15c4ef96c the really gnarly CHINESE #ifdef conversions 
these seem to be right, chinese text appears to be flowing correctly
 2024-12-31 16:28:44 -03:00
Marco Antonio J. Costa ecdc8916f2 Move CHINESE BOBBYR_ITEMS_BOUGHT_X conditional definition to i18n 
Just awful
 2024-12-31 16:28:44 -03:00
Marco Antonio J. Costa 4b563fefc8 Slightly clunkier fix for RUSSIAN conditional 2024-12-31 16:28:44 -03:00
Marco Antonio J. Costa cf0b4dfc40 Manual unrolling preprocessor stuff and added function 
This function is just for GERMAN but it has a unique name so it's no
problem.

Had to slightly change how MercID gets populated
 2024-12-31 16:28:44 -03:00
Marco Antonio J. Costa 5fb989a1fc Move Text.h over to i18n too 
Never use relative paths for #includes. Didn't touch the rest because
out of scope.
 2024-12-31 16:28:44 -03:00
Marco Antonio J. Costa 33e8c1dc39 Move all the translated strings over to i18n 
It's where all conditional language preprocessor goes
 2024-12-31 16:28:44 -03:00
Marco Antonio J. Costa 73f7812165 Slightly less straightforward CHINESE conversion in Interface Items.cpp 
A bit clunkier, had to repeat function calls because of how
preprocessor tricks don't map 1:1 with actual C++.
 2024-12-31 16:28:44 -03:00