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,626 Commits 9 Branches 6 Tags
b147df36cc82f06197bbf597f71dfaed69120dd1
Commit Graph
7626 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Flugente 333633b782 - fixed a bug that caused bad pointers when accessing the sector inventory and then entering it 
- fixed: reinforcements can happen in turnbased again
- codechange: stacks of ammo item scan now be used to feed a gun from the inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5458 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-11 17:07:28 +00:00
Flugente 7e8b51ad34 Fixes (by DepressivesBrot): 
- fixed some text errors
- enabled 'mark remaining hostiles' for all resolution and maps

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5454 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-08 20:46:36 +00:00
Flugente e8a6d58175 fix: night vision bonus wasn#t given correctly when using scope modes 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5450 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-07 21:25:29 +00:00
Flugente 9c1b850881 new feature (by DepressivesBrot): a rough approximation of the position of the last enemy can be marked on the map 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1488 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-07 20:55:45 +00:00
Flugente 24708bcf2b Fix (by DepressivesBrot): draw AP costs were not calculated correctly 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5449 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-07 20:49:33 +00:00
Flugente 9a045be6ce - fix: lines in UDB were displayed incorrectly 
- fix: food does not decay the first time a sector is entered (to prevent pre-placed items from rotting)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5448 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-07 20:38:29 +00:00
Flugente 9c5d7f64f2 - OVERHEATING_SET_ZERO_UPON_NEW_SECTOR is not needed anymore 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1487 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-04 17:54:08 +00:00
Flugente 771d7179bf - improved cooldown/decay functions. every time a sector inventory gets loaded, its inventory gets cooled down, thus all accessible world items always have the correct values. 
- OVERHEATING_SET_ZERO_UPON_NEW_SECTOR is not used anymore

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5443 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-04 17:51:12 +00:00
Flugente cd6a07d4be Fix: drug effects from facilities did not decay over time 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5442 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-03 19:08:28 +00:00
Flugente ec468eaa8e New feature (by DepressivesBrot): Molle Items 
- individual LBE gear can be created via MOLLE items. For each LBE item, there's a definition which pockets may be changed and how much space the new pockets may take up in total.
- If there's a free pocket slot and enough space -> attach item and enable pocket.
- for further description, see Doc/Design Document- MOLLE.txt

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1486 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-02 22:31:20 +00:00
Flugente 3077e27d9f New feature (by DepressivesBrot): Molle Items 
- individual LBE gear can be created via MOLLE items. For each LBE item, there's a definition which pockets may be changed and how much space the new pockets may take up in total.
- If there's a free pocket slot and enough space -> attach item and enable pocket.
- for further description, see Doc/Design Document- MOLLE.txt

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5441 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-02 22:30:15 +00:00
Flugente 5b0d1bda8b improved item sizes for food 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1485 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-08-02 20:52:15 +00:00
Flugente 832335d904 Improvement (by Tais): Weapons in the hands or gunsling position can also give a camo bonus. Can also be negative in regard to 'shiny' equipment 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5440 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-02 20:39:01 +00:00
Flugente 9e45af8347 change: penalties for food and water are now applied separately, thereby removing an exploit 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5437 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-31 20:54:26 +00:00
Flugente 96783bdc53 - when refilling canteens, mercs will instantly drink from them again when they are thirsty, provided that there is a source of unlimited water in the sector 
- fix: mercs no longer consume food from inventory when staffing the cantina

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5435 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-30 22:24:54 +00:00
Wanne 0fad05e244 git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1483 4f8fa57e-7814-0410-bad4-adc449f26b7c 2012-07-29 21:44:44 +00:00
Wanne 1bd1d069d1 - Added readme file how to download the customer JA2 1.13 UB Mods and how you can play them with latest 1.13 UB version 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1482 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-07-29 21:43:42 +00:00
Wanne 700fe7e074 - Increased number of action items from 255 up to 501 (by Jazz) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1479 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-07-29 11:48:54 +00:00
Wanne a618bd241c - ActionItems Fix: Increased number of action items from 255 (0-254) to 501 (0-500) (by Jazz) 
o See file: ActionItems.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5425 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-29 11:47:36 +00:00
Flugente 1079ef1fa4 Fix: food items from enemies or in a map spawn as fresh 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5424 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-26 20:39:28 +00:00
Wanne e5d70dcccc New EXE Build (5423) 
o New feature: food system requires mercs to eat and drink in order to survive
- food and water levels are lowered every hour, eat food to survive
- not doing so leads to various penalties and ultimately death
- added food items for that purpose. Food can degrade over time. Rotten food poisons.
- Mercs automatically consume food if hungry/thirsty and food is in their inventories
- for more info, see http://www.bears-pit.com/board/ubbthreads.php/topics/307396/Re_Mercs_need_food_and_water_t.html#Post307396

o New feature: guns can now be fed externally
- a machinegun can be fed by another emc if he has an ammo blet in his hands
- a merc can also feed his gun with ammo belts in his inventory
- the necessary tags can be set in Items.xml in the <ItemFlag> -tag
- this feature can be turned on and off via the JA2_Options.iniReader
- for more info, see http://www.bears-pit.com/board/ubbthreads.php/topics/307574/New_feature_Externally_fed_mac.html#Post307574

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1477 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-07-25 08:24:46 +00:00
Wanne 4caae3fc6e - New EXE Build: 5423 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5423 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-25 08:21:23 +00:00
Flugente 36055d4e4f - new icon for ammo belt and ammo vest 
- mercs can refuse to eat if they do not like the food (works only once)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5422 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-25 00:05:01 +00:00
Flugente 2cef09b50b fixed bugs when handling items that are both food and drug 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5419 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-24 22:26:13 +00:00
Flugente 155ee252f3 added external feeding values for most machineguns and their ammo 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1475 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-07-23 20:15:24 +00:00
Flugente 4949893c16 New feature: guns can now be fed externally 
- added necessary face icons
- added description in ini
- as an example, the MG§ and the FN mag can now be fed externally with any 100-rnd 7.62 NATO mag. Internal feeding is possible from the LRAK vest
- for more info, see http://www.bears-pit.com/board/ubbthreads.php/topics/307574/New_feature_Externally_fed_mac.html#Post307574

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1474 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-07-23 19:33:37 +00:00
Flugente fe460b0325 New feature: guns can now be fed externally 
- a machinegun can be fed by another emc if he has an ammo blet in his hands
- a merc can also feed his gun with ammo belts in his inventory
- the necessary tags can be set in Items.xml in the <ItemFlag> -tag
- this feature can be turned on and off via the JA2_Options.iniReader
- for more info, see http://www.bears-pit.com/board/ubbthreads.php/topics/307574/New_feature_Externally_fed_mac.html#Post307574
- this feature requires the newest GameDir files, as a new face icon was added

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5415 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-23 19:31:27 +00:00
Wanne c265a63b28 - Updated Merc Inventory Popup-Code (by The_Bob) 
o externalized the hardcoded popup text code
o enable/disable the popup in the ingame option screen
-> To open the popup, left click on empty merc inventory slot while viewing sector inventory in mapscreen

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5414 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-23 14:01:08 +00:00
Wanne 2ca650e0e4 - Added a minimal version of "Food.xml" for the "Data" folder, so the game can start 
o Later, we should disable the food system in the start new game screen for the "Data" folder, like it was done for New Inventory. Then we can delete this minimal Food.xml file
- Added missing INI food properties for the "Data\Ja2_Options.INI" file

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1472 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-07-23 13:14:04 +00:00
Wanne 609047e333 - Updated VS 2005 and VS 2008 project files to include the missing referenced Food files 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5413 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-23 12:57:46 +00:00
Flugente 382fcbe14f Fix: buildfile entries were missing 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5412 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-21 17:31:26 +00:00
Flugente 57390e7da3 New feature: food system requires mercs to eat and drink in order to survive 
- added food items
- added food items to various mechants, BR and as enemy item choice
- added cantina facility
- canteens can now be refilled in sectors by pressing 'Ctrl' + '.'. Map/SectorNames.xml determines wether this is possible, and wether the water will be poisonous
- added new icons related to the food system

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1471 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-07-21 16:47:16 +00:00
Flugente f6bf6bf4aa New feature: food system requires mercs to eat and drink in order to survive 
- food and water levels are lowered every hour, eat food to survive
- not doing so leads to various penalties and ultimately death
- added food items for that purpose. Food can degrade over time. Rotten food poisons.
- Mercs automatically consume food if hungry/thirsty and food is in their inventories
- for more info, see http://www.bears-pit.com/board/ubbthreads.php/topics/307396/Re_Mercs_need_food_and_water_t.html#Post307396
- this feature requires new STI files from the GameDir trunk.

- added a bunch of filler variable to the soldier type, so hopefully savegame compatibility can be maintained easier in the future.

WARNING: This will break savegame compatibility

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5411 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-21 16:41:04 +00:00
Flugente b95d001812 - Bugfix: message said drugs were 'drunk' when they had to be 'taken' 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5405 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-18 19:32:49 +00:00
Wanne edae3a836c - Updated GameVersion to 5393 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5394 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-12 15:49:45 +00:00
Wanne 5a271cf6fb - Bugfix: Prevent game from CTD, on players end turn, when there are problems updating the light tiles for the corpses. This is an AI feature from "ddd" mod which was added in revision: 3789 
Development source trunk: https://ja2svn.dyndns.org/source/ja2/branches/Wanne/JA2%201.13%20MP

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5393 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-12 15:09:29 +00:00
Flugente 5f680b499a - Code Improvement: it is now no longer necessary for the 'Full Sandbag' item to have a specific item number. The correct number will now be searched once per game. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5391 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-11 23:06:37 +00:00
Wanne 0d550743a7 - Updated Version Number: 5387 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5388 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-11 17:27:45 +00:00
Wanne 4ff07a0e4b - Translated missing German Texts (// TODO.Translate) 
- BUGZILLA #597: Fixed spelling mistake in German Version and corrected some "bad" German translations in tool tips
 



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5387 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-11 08:28:41 +00:00
Wanne 837cb4dc43 - Replaced the old unused BOBBY_RAY_SELECTION property from ja2_sp.ini with the new ones (BOBBY_RAY_QUALITY and BOBBY_RAY_QUANTITY) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1468 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-07-10 13:49:06 +00:00
Wanne cc89500c72 - Bugfix: Bobby Ray Quality and Quantity was initialized with wrong values (not the ones from the Start new Game Screen) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5374 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-10 13:47:11 +00:00
Wanne 5c3115d743 Bugfixes (by Flugente) 
- added a flag that drastically lowers the time needed for drug evaluations
- FIX: fixed a but that could lead to iron sights be used although they were forbidden
- FIX: scopes/sights are also selectable if they do not have a magnification factor (1.0 is used)
- FIX: sector cooldown to zero didn't work as intended

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5372 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-09 08:50:26 +00:00
Wanne 66a2a41f7d - Fixed compilation error in VS 2005 build: The 'hash_map' was not found in the namespace 'std', because it moved to namespace 'stdext' 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5371 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-09 08:26:44 +00:00
Wanne 8c4b952e6c - Convert video object cache to hashmap from linked list. This will protect better against video object leaks and probably still be faster than the linked list. (by tazpn) 
o new #define: USE_HASHMAP_FOR_VOBJECTS

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5370 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-09 08:16:37 +00:00
Wanne d929b47aea - A fix for the general slow down issue due to scope icons (by tazpn) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5369 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-09 08:14:38 +00:00
Wanne c92729f93d - Protection for random crash issue I have seen due to accessing a negative index in an array. (by tazpn) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5368 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-09 08:13:05 +00:00
Wanne b1b98417ce - convert outofbounds check to inline macro. (This gets called a lot in render map. The Visual Studio profiler highlighted this one though probably not a real optimization.) (by tazpn) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5367 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-09 08:11:27 +00:00
Wanne 863d079252 - add a handledefaultevents to the map. Might solve random mouse issues. (by tazpn) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5366 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-09 08:09:36 +00:00
Wanne de6c84d4a9 - Made the "Rifle sling" feature optional, so we can decide if we like to build an executable with/without the feature 
o See: builddefines.h: #define ENABLE_RIFLE_SLING
o Note: This feature is NOT the strategy performance killer

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5360 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-06 13:43:34 +00:00
Wanne cecdc22d61 - Made the "Display - mines/bombs/tripwires" feature optional, so we can decide if we like to build an executable with/without the feature 
o See: builddefines.h: #define ENABLE_DISPLAY_EXPLOSIVES
o Note: This feature is NOT the strategy performance killer

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5359 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-07-06 12:58:45 +00:00