1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-12 14:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,623 Commits 9 Branches 6 Tags
latest
Commit Graph
7623 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wanne f04e986aa2 Merged from revision: 7422 
- Updated Russian GameDir files (by Savenfm, Valiant, Coppermine, Pooh, Jinaya)
- Added the 2 new missing pockets to Russian.Pockets.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7423 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-26 08:49:04 +00:00
Wanne ac5cfc9fba Merged from revision: 7418 
- Renamed save game files for all languages to "SavedGames*.sav" and the folder to "SavedGames"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7419 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-25 22:11:55 +00:00
Wanne 79ca267662 Merged from revision: 7415 
- Added 2 new Pockets
- Translated French Pockets.xml (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7416 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-25 16:49:54 +00:00
silversurfer 0b41243125 added missing Encyclopedia entries to VS2008 project 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7413 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-25 14:59:14 +00:00
Wanne 5717e2b8b8 Merged from revision: 7411 
Bugfix: Dud grenades (by cocsackie)
- Dud is not set up properly

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7412 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-25 11:01:39 +00:00
Wanne d92bf811f3 Merged from revision: 2112 
Updated INIEditorJA2.xml (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2113 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-08-25 09:48:10 +00:00
Wanne 41a8afcb01 Bugfix: Pockets.xml (by Off_Topic) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2110 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-08-25 09:36:39 +00:00
Wanne b78bd5d6d1 Pocket Fixes (by Off_Topic) 
1. Fixed Gen Misc. Pocket.
2. Removed excess pockets from newly added LBE.
3. Added silhouette of small revolver. (Just Aesthetic for R:Holster.
4. Added silhouette for rifle molle.
5. Minor changes to weight of newly added LBE.
6. Adjusted some pocket values to better suit their purpose.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2109 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-08-24 19:34:05 +00:00
silversurfer 82e1f46251 Bugfix: Explosive damage modifiers for movement were not applied to creature gas and fire leading to insane amounts of damage. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7407 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-24 11:57:51 +00:00
silversurfer 75e9ab3883 Bugfix: This should finally fix the deadlock that could happen when someone was running through a letal gas cloud and died in it. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7405 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-24 11:23:15 +00:00
Wanne ca401e3995 Merged from revision: 7404 
New Version 2.8.0
- Added support for custom resolutions (width, height)
- Added support for FRENCH INI descriptions

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2106 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-08-22 12:07:09 +00:00
Wanne 4e9ae5fa8f Merged from revision: 2103 
- Added comments to history.xml (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2104 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-08-20 19:27:45 +00:00
Wanne 27c9a9ce6b Merged from revision: 7401 
Fixes (by Buggler)
- Fixed enemies retreating to inaccessible sectors
- Fixed hardcoded interrogation sector values

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7402 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-20 04:39:30 +00:00
Wanne a89d66a4ad Merged from revision: 2101 
Externalized History Log texts (by Jazz)
- see TableData\History.xml
- added support for language specific history (German.History.xml, French.History.xml, ...)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2102 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-08-20 04:28:38 +00:00
Wanne 55291e029a Merged from revision: 7398 
Externalized History Log texts (by Jazz)
- see TableData\History.xml
- added support for language specific history (German.History.xml, French.History.xml, ...)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7400 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-20 04:27:48 +00:00
Wanne a205b41ba5 Merged from revision: 7397 
Externalized History Log texts (by Jazz)
- see TableData\History.xml
- added support for language specific history (German.History.xml, French.History.xml, ...)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7399 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-20 04:26:31 +00:00
Flugente 46b72db714 Fix: bad commit 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7395 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-17 18:58:27 +00:00
Flugente ce3369f72e Slightly improved loading times. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7394 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-17 18:55:00 +00:00
silversurfer 5cfda83df4 Bugfix for compiler errors in VS2008 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7393 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-13 15:54:54 +00:00
Wanne 9b8169cd58 Merged from revision: 7391 
- Show helicopter icon in team view mode and restored helicopter passengers indicator (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7392 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-12 17:03:45 +00:00
Flugente 864675b4d0 Disease feature is off by default. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2100 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-08-10 14:40:32 +00:00
Flugente 36e9d15edc New feature: Diseaes affect your mercenaries. They can be contracted in varíous ways and have varying effects. 
For more info, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/334918#Post334918

Requires GameDir >= r2099.

Does not break savegame compatibility.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7384 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-10 13:45:11 +00:00
Flugente 3433ec6b1c New feature: Diseaes affect your mercenaries. They can be contracted in varíous ways and have varying effects. 
For more info, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/334918#Post334918

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2099 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-08-10 13:05:18 +00:00
Flugente 2f741262b6 Adjusted aim level and gun handling values (by Strohmann) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2098 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-08-10 12:49:03 +00:00
Wanne 09244c2369 Merged from revision: 7382 
- Fixed eliminated patrol groups not being replenished (by anv)
- Fixed en route patrol reinforcements not obeying grace period settings (by Buggler) 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7383 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-09 11:07:21 +00:00
Wanne b4af6cec69 Merged from revision: 7380 
Fixes (by Buggler)
- Fixed lost items when autoplace stacks from sector inventory to vehicle inventory
- Changed autoplace items priority to stacking first; previous order: specialized pockets > stacking > other pockets
- Improved autoplace stacks logic from sector inventory
- Fixed OIV vehicle inventory figure sti not loaded

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7381 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-09 11:06:08 +00:00
Wanne 1e0738d644 Merged from revision: 7378 
- Translated _FrenchText.cpp (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7379 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-06 19:36:49 +00:00
Wanne c5edb6ee1e Merged from revision: 2096 
XML Editor can now work with the "Data" folder
- Fixed "Data\TableData\*.xml" files 
- Added missing BigItems STI files
- Added Lookup XML files for the XML Editor

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2097 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-08-05 21:46:57 +00:00
Wanne 44b243de71 Merged from revision: 2094 
- Added missing "Lookup/AmmoChoices.xml" file

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2095 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-08-05 18:49:48 +00:00
Wanne e2e689e114 Merged from revision: 7376 
- Fixed errors in language specific XML files which crashed the XML Editor
o Now all the language specific xml files are valid (I just tested them all) and the XML Editor can start without any error!

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7377 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-05 18:45:14 +00:00
Wanne 9d34110a83 Merged from revision: 2092 
- Removed <GameDir_Taiwanese_Path_1> from XMLEditorInit.xml, because TAIWANESE is not supported anymore

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2093 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-08-05 18:32:41 +00:00
Wanne d650c2c23a Merged from revision: 7373 
- Added custom game resolution (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7375 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-05 17:05:09 +00:00
Wanne b764467de1 Merged from revision: 2088 
- Added custom game resolution (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2089 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-08-05 17:04:12 +00:00
Wanne 8dabe65ba6 Merged from revision: 7372 
- Added custom game resolution (by Buggler)
- Minor additions to editor popup text (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7374 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-05 17:03:16 +00:00
Wanne b5e6353848 Merged from revision: 7370 
- Translated / reworked French.Items.xml (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7371 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-02 08:07:28 +00:00
Wanne c50f412e9a Merged from revision: 2084 
- Fixed wrong decimal value instead of int value in GunChoices_*.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2085 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-07-30 18:04:00 +00:00
Wanne 29e09f869e Merged from revision: 7368 
MapEditor: Bugfix: Changed tempstring from 30 characters to 40 characters which fixes crash in French version

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7369 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-30 17:19:47 +00:00
Flugente fdb56dda59 Fix: mercs pause too long after talking 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7367 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-28 21:02:45 +00:00
Wanne 4fea831e82 Merged from revision: 7365 
- Translated texts for Chinese version (by Jason Lejardo)
- Translated texts for French version (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7366 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-27 10:40:38 +00:00
Wanne 05fdcb5d2e Merged from revision: 7363 
- Map Editor now properly handles all available items without empty placeholders in between (by anv)
- Added item compare popup help text (by Buggler)
- Enemy icons will not be shown as 10x icons in 640x480 due to visibility issues (the rest remains as it is) (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7364 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-26 13:07:32 +00:00
Wanne 3166ffed78 Merged from revision: 2078 
- Fixed of gamestart missing settings and cleanup of Profiles folder INI settings (by Buggler)
- Deleted 'Profiles\UserProfile_UnfinishedBusiness\UB' folder

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2079 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-07-26 13:01:58 +00:00
Wanne caa8f58c0e Merged from revision: 7361 
- Translated text for French version (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7362 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-23 17:58:27 +00:00
Wanne a79be62f21 Merged from revision: 7359 
Fixes (by Buggler)
- new error message when launching game in fullscreen beyond desktop resolution
- fixed cycling previous item hotkey in cheat mode
- refactored main menu button and hotkey code

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7360 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-22 16:40:02 +00:00
silversurfer 1d3371244d New option in CTHConstants.ini: 
IRON_SIGHTS_MAX_APERTURE_USE_GRADIENT = FALSE/TRUE
When activated it will make iron sights more powerful over longer distances. This is an experimental switch. The formula might need to be tweaked.


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2077 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-07-22 09:56:41 +00:00
silversurfer 9f5aa4c227 Bugfix for crash in main menu when the player pressed 'n' for new game. 
New option in CTHConstants.ini:
IRON_SIGHTS_MAX_APERTURE_USE_GRADIENT = FALSE/TRUE
When activated it will make iron sights more powerful over longer distances. This is an experimental switch. The formula might need to be tweaked.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7358 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-22 09:55:56 +00:00
Wanne 342fe57594 Merged from revision: 7355 
- Deleted unneeded Ja2_Options.INI from Chinese Data-UB-1.13 and Data-UB-Vanilla

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7356 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-21 18:16:03 +00:00
Wanne 8a716f6061 Merged from revision: 7352 
- Changed screen resolution to 1024x768 in chinese ja2.ini (thx to Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7354 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-21 18:14:00 +00:00
Wanne 3e8ee728ff Merged from revision 7348: 
- Added Chinese specific UB GameDir files (by zwwooooo)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7353 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-21 18:13:22 +00:00
Wanne de2efce1cf Merged from revision: 2075 
- Fixed extra spaces in names and nicknames in MercProfiles.xml (by Buggler)

- Changed Ja2Options.ini settings (by Buggler & Sevenfm):
MAX_NUMBER_PLAYER_MERCS = 32
DIRT_SYSTEM = FALSE
AUTO_FAST_FORWARD_ENEMIES = 2
AUTO_FAST_FORWARD_MILITIA = 1
AUTO_FAST_FORWARD_CIVS = 1
AUTO_FAST_FORWARD_CREATURES = 1
CLOCK_SPEED_PERCENT = 120
ENEMY_CLOCK_SPEED_PERCENT = 120

- Removed unused Ja2Options.ini:
MIN_RANGE_FOR_FULL_COWERING_TARGET_PENALTY
STAMINA_HIT

- Updated ReadMe in Windows 8 Fix.zip (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2076 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-07-21 18:09:59 +00:00
Wanne d7d1cce626 Merged from revision: 7350 
Fixes (by Buggler)
- Fixed mouse region for item stack popup in strategic screen for non-standard resolutions
- Disabled Ctrl+Click for dropping item to sector inventory in combat
- Disabled Sector Inventory Stack Popup in combat
- Removed unused Ja2Options.ini: MIN_RANGE_FOR_FULL_COWERING_TARGET_PENALTY and STAMINA_HIT (by Buggler & Sevenfm)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7351 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-21 18:07:47 +00:00