1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,349 Commits 9 Branches 6 Tags
fce1904d120329cdae5684bfc822afa159eae554
Commit Graph
2349 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Flugente fce1904d12 Fix: When starting a game, the entire map is grey. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7463 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-31 16:14:04 +00:00
Wanne 684e1d6148 Externalized Difficulty Settings 
- Removed #ifdef DIFFICULTY_SETTING. Now the new difficulty settings code is always active (by Jazz)
- Removed unused INI reading settings

These parameters were moved to the file DifficultySettings.xml.
** Ja2_Options.INI **
ENEMY_AP_BONUS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
NUM_KILLS_PER_PROGRESS_POINT_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
INITIAL_GARRISON_PERCENTAGES_NOVICE  , _EXPERIENCED, _EXPERT, _INSANE
MIN_ENEMY_GROUP_SIZE_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
UNLIMITED_POOL_OF_TROOPS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEENS_INITIAL_POOL_OF_TROOPS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
ENEMY_STARTING_ALERT_LEVEL_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
ENEMY_ALERT_DECAY_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
NUM_AWARE_BATTLES_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
BASE_DELAY_IN_MINUTES_BETWEEN_EVALUATIONS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
EVALUATION_DELAY_VARIANCE_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
GRACE_PERIOD_IN_HOURS_AFTER_SECTOR_LIBERATION_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
GRACE_PERIOD_IN_DAYS_AFTER_PATROL_DESTROYED_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
AGGRESSIVE_QUEEN_AI_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_POOL_INCREMENT_PER_DIFFICULTY_LEVEL
PERCENT_EXTRA_ELITES_EXPERIENCED , _EXPERT, _INSANE
MAX_MERC_DEATHS_EASY , _EXPERIENCED, _EXPERT, _INSANE
		
** Creatures_Settings.INI **
CREATURE_SPREAD_TIME_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_REPRODUCTION_BASE_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_REPRODUCTION_BONUS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_INIT_BONUS_SPREAD_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
CREATURE_POPULATION_MODIFIER_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
CREATURE_TOWN_AGGRESSIVENESS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_POOL_INCREMENT_PER_DIFFICULTY_LEVEL
		
** CTHConstants.ini **
BASE_DIFFICULTY_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
AIM_DIFFICULTY_NOVICE , _EXPERIENCED, _EXPERT, _INSANE


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7461 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-31 13:39:23 +00:00
Flugente a2bbeebc54 Fix: graphical glitch when equipping a twohand item 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7460 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-31 00:27:10 +00:00
Flugente 0c425491bd Fix: typo 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7458 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-30 18:04:19 +00:00
Flugente e00897b91b New Feature: a private military company allows hiring of advanced militia. For more info, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/335279#Post335279 
Does not break savegame compatibility.

Requires GameDir revision >= r2130.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7457 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-30 17:34:25 +00:00
Flugente 5fc358f70c Fix: tanks automatically uncovered spies 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7456 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-28 21:38:24 +00:00
Flugente a37cf0f8f1 - New xml: FoodOpinion.xml allows individual opinions on individual food items for each merc, the <bMoraleMod>-tag in Food.xml was removed. 
- Maximum number of food items was increased to 500 (was 128).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7454 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-28 20:12:06 +00:00
Flugente d8cdfc927c Singleshot rocket launcher explosions were always hardcoded C1-explosions, regardless of Weapon settings. As of now, the buddyitem tag can be used to specify the exploding item. (by DepressivesBrot) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7453 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-28 14:39:45 +00:00
Wanne 2bbd80892c Merged from revision: 7436 
- Changed MP Version to 3.0
- Changed default value for BASE_SIGHT_RANGE to 14 (as suggested by silversurfer)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7450 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-28 10:55:00 +00:00
Wanne 344797f6af New Feature: Added up to 15 game difficulty settings (by Jazz) 
- Externalized the difficulty setings to "TableData\DifficultySettings.xml" file
- Some INI Settings (ja2_options.ini, CTHConstants.ini and Creature_Settings.ini) moved from INI file to this xml file
- see #define DIFFICULTY_SETTING

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7447 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-28 10:30:40 +00:00
Flugente 6b728e56ac Merged revision(s) 7440-7444 from trunk/GameSource/ja2_v1.13 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7445 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-28 02:20:21 +00:00
Flugente 011caf4eaf Missing xml data could lead to mine income always being 0 if playing with strategic disease. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7443 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-28 01:32:53 +00:00
Flugente 17fab7ba83 Fix: mercs move medical equipment into their hands on non-medical assignments 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7442 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-28 01:25:02 +00:00
Flugente 3bc2ea294c Fix: the disease button was not always set back correctly 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7441 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-28 01:16:59 +00:00
Flugente f3edcd3d92 Merged revision(s) 7438-7439 from trunk/GameSource/ja2_v1.13: 
- Fix: missing buildfile entries for ModularizedTacticalAI when building a Release exe with debugInfo in VS2010
- Fix: incorrect size of an array led to variable corruption

Fix: error in Disease calculation


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7440 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-28 00:31:45 +00:00
Wanne 5e8ba14f42 Merged from revision: 7434 
Updated Game Option popup text on tweaked hotkeys (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7435 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-27 07:31:39 +00:00
Wanne dd4935efae Merged from revision: 7431 
Multiplayer Bugfix: Sector starting edge (N, E, S, W, Center) was wrong initialized

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7432 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-26 20:07:03 +00:00
Wanne 73ce03a240 Merged from revision: 7429 
Tweaked hotkeys (by Buggler & Sevenfm)
- 'Alt + R' for reloading merc weapon (new)
- 'X' for alternate hotkey for 'P', Prone
- 'Ctrl+Alt+W' for toggling Wireframes (remapped)
- 'W' for alternate hotkey for 'L', Look
- 'Ctrl+Alt+G' for toggling Artificial Merc Light (remapped)
- 'G' for toggling formation movement (remapped)
- 'Ctrl+Alt+I' for toggling Glow Items (remapped)
- 'Ctrl+T' for forced turn mode (remapped)
- 'Ctrl+Alt+Shift+T' for test capture in cheat mode (remapped)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7430 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-26 11:14:50 +00:00
Wanne b54ffadd08 Merged from revision: 7425 
Updated _RussianText.cpp (by Sevenfm, Valiant, Coppermine, Pooh, Jinaya)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7426 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-26 09:27:34 +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
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
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 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 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 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
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 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 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 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 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 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
Wanne f086611d21 Merged from revision: 7344 
Fixes (by Buggler)
- Centered strategic screen in non-standard resolutions
- Fixed message log disappearing when clicking map border buttons
- Minor fix for increased MAX_BUILDINGS limit 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7345 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-19 13:48:27 +00:00
Wanne 615c561dc1 Merged from revision: 7342 
Fixes (by Buggler)
- Fixed roof issues for explored rooms in big maps not properly saved
- Increased MAX_CLIMBSPOTS_PER_BUILDING and MAX_BUILDINGS to 255

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7343 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-17 21:04:02 +00:00
Flugente 05cb329230 - Fix: Tanks take damage even when crushing down simple wooden fence. (by anv) 
- dynamic opinion events no longer happen for non-player or vehicular characters
- renamed a flag

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7340 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-15 21:00:59 +00:00
Wanne 64bd7f3f07 Merged from revision: 7338 
- Translated _ChineseText.cpp (by Jason Lejardo)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7339 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-15 20:03:02 +00:00
Flugente 24a78e5dc3 If <BloodiedItem> is set on a blade, the blade weapon wil be replaced with th specified item when a person is hit with it. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7337 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-14 20:55:26 +00:00
Wanne 696e9ccdff Merged from revision: 7335 
Updates (by Buggler)
- Mercs, militia & enemies are now shown with 10x icons on strategic screen
- Changed militia icon order display in strategic map; elite first 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7336 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-14 19:38:20 +00:00
Wanne 3628b26e69 Merged from revision: 7331 
- Fixed wrong translated French text (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7332 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-12 19:33:39 +00:00