1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,637 Commits 9 Branches 6 Tags
98c1e6a1f529104f2984c3192da76472ce7a53be
Commit Graph
7637 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Flugente 8fb494ff53 new disabilities: 
- 'deaf' reduces hearing ability
- 'shortsighted' reduces sight range

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6049 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-02 00:15:51 +00:00
Flugente 265fd3bc61 Fix: EPC inventory cannot be accessed, and Nails does not allow to take his vest 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6048 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-01 21:23:55 +00:00
Flugente 6cbcc995de replaced a few hardcoded numbers with enums/ini setting 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6047 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-01 17:03:31 +00:00
Flugente e508e91cff Fix: when accessing a teammember's inventory, circumstances could cause teammembers to attack the merc accessing 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6046 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-01 14:58:51 +00:00
Wanne cde29c1388 - MP: Removed wrong "#ifdef INTERRUPT_MP_DEADLOCK_FIX" 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6045 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-01 10:42:55 +00:00
Wanne fe4c6d7e8f - MP: Re-enabled the "share same FOV for friendly players" (in COOP and Team-DM), because it seems to work fine :) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6044 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-01 10:28:33 +00:00
Wanne 0c99913cc1 - MP: Disabled (set to FALSE) the NO_STANDING_ANIM_ADJUSTMENT_IN_COMBAT (ja2_options.ini entry) in a MP game, because it leads to problems on the pure client 
o If ON, the ALWAYS tries to scroll to the AI soldier which is in running stance and therefore you are unable to do anyting and cannot play

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6043 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-01 10:09:59 +00:00
Flugente 60674b63da Changes (all by anv): 
- added voicesets for It, Bernie and Ears
- added battle sounds for Elroy (previously overlooked somehow)
- added some hate talk to Spike, Boss, Leech, Rusty and Sidney
- fixed wrong ammo in Weasel's equipment
- added some cheap knives to Mouse's and Elroy's kits, so they can make use of their new traits right away
- unlocked extra banter dialogue for some mercs (quote 45)
- added new gargantuan MercOpinions.xml, containing 255 opinion records per merc. Most new ones are 0 by default, I changed those for buddies and foes to 25/-25.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1661 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-30 22:26:20 +00:00
Flugente 2455c2c467 changed hardcoded numbers to enums in preparation for total merc number increase 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6042 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-30 21:31:04 +00:00
Wanne 82dec9404c - MP: Moved the FOV (friendly players share same field of view) to a define ENABLE_MP_FRIENDLY_PLAYERS_SHARE_SAME_FOV (currently disabled) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6041 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-30 16:26:49 +00:00
Wanne 22a18ec262 - MP: Disabled the Enemy numbers count in the turnbar (because it shows different numbers on the clients) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6040 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-30 16:14:27 +00:00
Wanne 3f13f630b0 - Enabled ZOMBIES in builddefines.h 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6039 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-30 16:13:29 +00:00
Flugente 86a6a5481c added a few hints 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1660 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-29 23:07:21 +00:00
Flugente 205aa6a852 added soundset for Stella (by merc05) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1659 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-29 23:02:52 +00:00
Flugente c29d55a1f3 Fix: no stealing on oneself 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6038 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-29 22:46:15 +00:00
Wanne 3e157ecfb4 - MP: Moved the update of the turnbar on interrupt to the INTERRUPT_MP_DEADLOCK_FIX define (disabled for now) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6037 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-29 19:58:17 +00:00
Wanne 4456539663 - MP: Put the interrupt fix code in a define "INTERRUPT_MP_DEADLOCK_FIX 
o It seems the fix does not work 100% and if the fix code is enabled the ALT + E feature does not work correctly (for now, disabled the fix)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6036 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-29 19:45:32 +00:00