1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,604 Commits 9 Branches 6 Tags
master
Commit Graph
7604 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Flugente 0821babe4d SHOW_HEALTHBARSOVERHEAD allows hiding the health and fatigue bars over your selected mercs 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1678 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-24 16:58:23 +00:00
Flugente 64e4677ba7 SHOW_HEALTHBARSOVERHEAD allows hiding the health and fatigue bars over your selected mercs 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6098 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-24 16:57:52 +00:00
Flugente 10a0c07822 Fix: scope modes take Aimlevel modifiers on scopes/sights into account 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6095 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-24 15:52:05 +00:00
Flugente 45659c18a3 made sure that faulty xmls don't lead to three major traits 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6094 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-24 15:10:27 +00:00
Flugente 2bf92c7301 Vehicle data is no longer saved and loaded into savegames, as it was externalised to xml a long time ago 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6093 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-24 14:25:47 +00:00
Wanne 2aa1ac3ea1 - Updated Chinese xml files (by zwwooooo) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6091 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-21 22:29:40 +00:00
Wanne 42e8c48cac - VS 2010 Bugfix: Fixed LINKING error when compiling MapEditor version 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6090 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-20 20:12:10 +00:00
Wanne dce7152770 - Chinese translations (by zwwooooo) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6089 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-19 18:55:23 +00:00
Wanne befe76b049 - Fixed 'Unsettled bills' for MercID > 170 on game restart (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6088 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-19 10:31:34 +00:00
Flugente bd5233db0f Fix: use xml vehicle names 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6085 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-17 23:20:13 +00:00
Flugente 27f18605d9 sope modes no longer uses fixed magnifications, and no longer differs per team 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6084 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-17 20:14:02 +00:00
Flugente 22bd1956f1 Fix: status bar of attached grenades was shown incorrectly 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6083 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-17 18:05:18 +00:00
Flugente 1b00117b7e when using alternate weapon holding under NCTH, still apply projection factor from non-scope/sight attachments 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6079 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-15 23:04:09 +00:00
Flugente c090d20e6e Clarified ini settings. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1677 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-15 21:06:05 +00:00
Flugente cefa9cfcc1 Fix: when using scope modes with NCTH, non-internal projection factor from lasers was ignored. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6078 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-14 21:11:24 +00:00
Wanne ba97ece129 - Re-added missing TOPTION_ZOMBIES to Ja2_Settings.INI 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1676 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-13 21:22:59 +00:00
Wanne e365ac9f1b - Bugfix: Fixed missing "," in _GermanText.cpp which resulted in wrong text (on the M.E.R.C website) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6076 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-13 21:18:08 +00:00
Wanne f7989a1fca - Fixed MERC hiring bug when reached max allowed mercs due to optional gear feature (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6075 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-13 20:24:21 +00:00
Wanne 03e4f0d700 - Added data for "It", "Bernie", "Pops", "Wally" and "Eli" (German Version) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6074 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-13 20:03:12 +00:00
Wanne 7b142dd704 - Added new JA/DG Mercs to M.E.R.C: Pops, Wally, Eli (by Anv) 
o Added speech for those mercs
o Updated Jimmy's Portraits


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1675 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-13 19:42:32 +00:00
Wanne 2407705ea2 INI Adjustments (by Buggler) 
- Added RandomStats & RandomSalary options to INIEditorJA2Options.xml
- More detailed description for RandomStats settings
- Set faster laptop transition & website loading in Ja2_Options.ini for 1.13 & UB

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1674 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-11 16:58:49 +00:00
Wanne 71ca610b45 - Fixed RandomStats default values in GameSettings.cpp (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6073 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-11 16:57:31 +00:00
Flugente 44d9b88042 once again, forgot to add a file... 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6072 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-11 13:22:18 +00:00
Flugente 525ff5b1c6 per default, random stats are off 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1673 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-10 23:32:15 +00:00
Flugente ee416f72bc new feature: soldier profiles allows defining individual names/bodytypes/hair/skin/traits of soldiers and militia. The game will choose randomly from this pool. 
WARNING: GameDir revision >= 1672 is required.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6071 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-10 23:30:42 +00:00
Flugente 3fde30a988 new feature: soldier profiles allows defining individual names/bodytypes/hair/skin/traits of soldiers and militia. The game will choose randomly from this pool. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1672 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-10 23:14:57 +00:00
Wanne e8d07c0656 Improved Random Stats Feature (by Buggler) 
- Added random starting salaries in Ja2_options.ini
- Added more options for random stats & tweaked existing formula

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1671 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-10 20:37:53 +00:00
Wanne 576866b63e Improved Random Stats Feature (by Buggler) 
- Added random starting salaries in Ja2_options.ini
- Added more options for random stats & tweaked existing formula


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6070 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-10 20:36:15 +00:00
Flugente c0372cccd1 speed up handling of personal light 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6068 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-07 00:05:24 +00:00
Flugente 59646b9dcd - Fix: crash when switching to bayonet while aimed 
- Fix: batteries were drained for inactive flashlights

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6067 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-06 23:35:17 +00:00
Wanne ccc6bea3be - Added page numbers in MERC files (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6066 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-06 20:40:49 +00:00
Flugente 04a92b0599 new feature: fixed bayonets (still in need of animation) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1670 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-05 21:26:40 +00:00
Flugente 1c74ca4bf1 new feature: fixed bayonets (still in need of animation) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6065 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-05 20:56:00 +00:00
Flugente 9d2da7e440 Fix: VS2008 & VS2005 compatibility 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-05 14:16:36 +00:00
Wanne 0078b01d9b - Sorted Training Attribute strings to be same order as stats display (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6062 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-04 15:08:25 +00:00
Wanne aeb7c7a46d - Minor fixes (by anv & merc05) 
o Hector has bad MouthY coordinate (should be two numbers higher)
o Stella has Fox as a hated merc (should be Hurl)
o Reaper has Shadow as a buddy merc
o Reaper has Blood as "learn to like"
o Changed some GenderQuotes 
o fixing Larry's alumni page text

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1669 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-04 15:04:29 +00:00
Wanne bd8923e6bd - Added soundset for "Hector" (by merc05) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1668 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-04 14:36:55 +00:00
Flugente fadd849359 new feature: dynamic flashlights allows usable flashlights 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6061 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-03 23:31:28 +00:00
Flugente ea79346cf3 new feature: dynamic flashlights allows useable flashlights 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1667 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-03 23:29:01 +00:00
Wanne 78ef37e487 - Added random stats for Bernie and It (by Thor) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1666 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-03 07:43:24 +00:00
Flugente 3bc5ff75cc significantly cleaned up includes (by IoP) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6056 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-02 22:42:08 +00:00
Wanne a0a0490771 - Added ini property to control how long (in seconds) the load screen should be visible before disposal: Default: 2 seconds 
o This is needed, so we can read the new loadscreen hints text
o Property name: ADDITIONAL_DELAY_UNTIL_LOADSCREEN_DISPOSAL

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6055 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-02 21:05:31 +00:00
Wanne bf4a059226 - Added missing items (1633, 1634) 
- Added new *.LoadScreenHints

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6054 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-02 21:02:59 +00:00
Wanne 8bd19f0b01 - Added ini property to control how long (in seconds) the load screen should be visible before disposal: Default: 2 seconds 
o This is needed, so we can read the new loadscreen hints text
o Property name: ADDITIONAL_DELAY_UNTIL_LOADSCREEN_DISPOSAL

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1665 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-02 20:50:03 +00:00
Wanne 3083ac66b3 - Bugfix: LoadScreenHints 
o Added support for language specific (German, Russian, ...) LoadScreenHints (*.LoadScreenHints.xml)
o Added support for long (multi line) load screen hints (there will be an automatic line break in long load screen hints text)
o Reset load screen hint text to 0 (no display), because otherwise the old load screen will also be shown underneath the correct new one which resulted in an unreadable text mess

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6053 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-02 19:50:21 +00:00
Wanne 15696994a0 - Bugfix: LoadScreenHints 
o Loadscreen hints were not shown in a Release Build
o Centered Loadscreen hints text in all resolutions
o TODO: If loadscreen hints are ON (in the ini), the loadscreen should not close automatically, but should stay on screen until the user presses a key(e.g: Space). So the user has time to read the hint -> @Flugente: Do you have any other idea?

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6052 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-02 18:23:02 +00:00
Wanne e8f8e8ae5b - Added slower <bEvolution> rates, growth slowdown will be more pronounced on higher stat values. (3 - 0.75x; 4 - 0.5x; 5 - 0.25x) (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6051 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-02 17:12:43 +00:00
Wanne 5ac8c86872 - Updated LoadScreenHints.xml 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1664 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-02 17:01:30 +00:00
Wanne 3bb4f3ebad - Added reworked "Bernie" faces (now he looks older) (by anv) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1663 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-02 16:55:31 +00:00
Flugente 63bfdab9f0 - changed disabilities for Sam, Kaboom and Needle 
- externalised rocket rifle gridno

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1662 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-02 00:29:17 +00:00