1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,621 Commits 9 Branches 6 Tags
latest
Commit Graph
7621 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wanne 378c0f1df2 Bugfix: Movement costs (by Buggler) 
- Fixes include C1-D1 & I2-I3 as GroundBarrier; corrected Alma & its borders TravelRating
- Align traveling costs to be more inline w strategic & actual maps

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1554 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-11-06 18:26:56 +00:00
MaddMugsy 9462aec26d -Added missing entries to Lookup/ItemFlags.xml and Lookup/Attachments.xml 
-Added 0/None record to Clothes.xml (for editor)


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1552 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-11-06 07:50:30 +00:00
Flugente f970116840 Fix: disguising as a soldier did not always work because of string comparisons 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5671 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-11-06 00:55:33 +00:00
Flugente 8ace761e7f - new ini option ZOMBIE_ONLY_HEADSHOTS_PERMANENTLY_KILL: if a zombie is killed via headshot/melee combat, he can't rise again 
- new ini option FOOD_MAX_POISONING: determines the maximum amount of food poisoning eating a singel food item can give
- fixed a bug that caused tooltips to display the wrong traits
- fixed a few zombie-related bugs

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5669 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-11-05 22:38:52 +00:00
Flugente 622dd4ef69 - new ini option ZOMBIE_ONLY_HEADSHOTS_PERMANENTLY_KILL: if a zombie is killed via headshot/melee combat, he can't rise again 
- new ini option FOOD_MAX_POISONING: determines the maximum amount of food poisoning eating a singel food item can give

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1551 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-11-05 22:32:22 +00:00
Wanne 4c232c38c7 Added features (by Buggler) 
- 'Ctrl+Tab' for next tab in Enhanced Description Box at Strategic & Tactical Screen ('Tab' also possible in Strategic Screen as previously not in used)
- 'M' for Multiplayer in Main Menu Screen

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5668 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-11-05 09:12:14 +00:00
Wanne 29f8b5e7cd - Updated Data-1.13\TableData\*.Items.xml 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5667 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-11-05 09:10:23 +00:00
Flugente cc33522cdc The assassins now come in random clothes and are covert initially, making it harder for the player to detect them. Ini option: ASSASSINS_DISGUISED = TRUE/FALSE 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1550 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-11-05 02:05:11 +00:00
Flugente b9615ff597 Fix: Jim was missing in several assassin-related checks 
The assassins now come in random clothes and are covert initially, making it harder for the player to detect them. Ini option: ASSASSINS_DISGUISED = TRUE/FALSE

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5666 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-11-05 02:03:10 +00:00
Wanne 3124310a74 Bugfixes (by Buggler) 
- Close old description box to open the new one if nothing in hand while right-clicking on an item in sector stack
- Ctrl + Right-Click to call info description directly for e first item in stack
- Revert partially to have an empty mouse region to close item stack easily when stack is full (r5632)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5657 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-11-01 15:08:04 +00:00
Flugente ab8aec333b - new item flag NO_METAL_DETECTION (131072) makes mines and bombs undetectable via metal detector. Also works on action item bombs and mines. Sparing usage is advised. 
- new item flag JUMP_GRENADE (262144) increases the explosion heigth of explosives, can be used to simulate bouncing grenades or jumping mines.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1549 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-10-29 23:10:39 +00:00
Flugente 04278c7ad9 - new item flag NO_METAL_DETECTION (131072) makes mines an bombs undetectable via metal detector. Also works on action item bombs and mines. Sparing usage is advised. 
- new item flag JUMP_GRENADE (262144) increases the explosion heigth of explosives, can be used to simulate bouncing grenades or jumping mines.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5656 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-29 23:08:44 +00:00
Flugente 14561917ec Fix: bombs action items on newer map versions did not get the correct settings 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5651 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-28 19:23:15 +00:00
Flugente 43adda0e5b Fix: game should no longer complain about randomitems being invalid arms dealer items 
Reminder: Do NOT put random items into any merchant xml or BR, weirdness can occur here!

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5648 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-27 20:20:18 +00:00
Flugente a3bddbe742 Fix: map-editor specific copies of tripwire and claymore no longer appear at BR 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1548 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-10-26 20:35:27 +00:00
Wanne b1596f0c63 - Removed the "USE_HIGHSPEED_GAMELOOP_TIMER" define. Now highspeed timer and new way of dequeuing events are always enabled when building an executable 
o This makes the code more easy to maintain
o Highspeed timer seems to run fine (after months of tests)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5643 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-25 19:00:12 +00:00
Flugente 888c76e65c zombies no longer kick in melee 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5641 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-23 21:29:56 +00:00
Flugente 63a09bba5f - new option for militia command menu: crouch/all crouch 
- Larry now consumes every drug

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5638 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-21 16:57:45 +00:00
Wanne 9c57896a10 - Added updated "SortBy.sti" file, which is used for additional laptop merc sorting (added in source code revision: 5636) 
- Added missing Clothes.xml, RandomItem.xml for the "Data" folder
- Added missing Ja2_Options.INI entries for the "Data" folder

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1546 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-10-21 16:11:56 +00:00
Wanne 38bcb34702 Features (by Buggler) 
- More AIM sorting options. Default: Sort by Name
Laptop\AIM Homepage Screen
- Hotkeys 'm': Members Sorting page
- Hotkeys 'l': Links page
- Hotkeys 'h': History page
- Hotkeys 'p': Policies page
Laptop\AIM Sorting Screen
- Hotkeys BACKSPACE: Back to AIM Homepage Screen
- Hotkeys 'm': Mug Shot Index page
- Hotkeys 'f': Member page
- Hotkeys 'a': Alumni page
Laptop\AIM Mug Shot Index Screen
- Hotkeys BACKSPACE: Back to AIM Sorting Screen
- Hotkeys LEFT ARROW: Previous Page
- Hotkeys RIGHT ARROW: Next Page

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5636 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-21 16:10:49 +00:00
Wanne 5957af60aa - Bugfixes (by Buggler) 
o Fixed Restrict Mouse Region for Stack Popup Screen. Also a Dirty CTD fix for illegal Holster/Backpack pickup in Strategic Key Panel Popup
o Fixed Item Transfer Exploit in Stack Popup Screen/Item in Hand during Combat mode by using hotkeys to select other mercs in Strategic & Tactical Interface
o Corrected Numerator & Denominator Order for Armor Protection Raw Values in Popup Info text

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5632 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-19 08:33:11 +00:00
Flugente 9e058edf5e Fix: it was still possible to resolve random items in the map editor 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5625 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-11 19:17:13 +00:00
Wanne 02085a8422 - MP Bugfix: Fixed the nasty interrupt bug (endless clock), when playing in COOP and the pure client got interrupted by the enemy AI (by haydent) 
o As a workaround the server had to press ALT + E to give the turn back to the client. Now this workaround should not be needed (hopefully ) :)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5623 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-11 18:20:21 +00:00
Flugente e762c6b0f4 - new <usItemClass>: IC_RANDOMITEM (0x40000000 or 1073741824) is used for random items exclusively. 
- increased ma number of Random Items to 1000
- fix: A certain key combination no longer spawns random NATO ARs

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5618 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-10 20:10:49 +00:00
Wanne 72184716d4 - Externalised Laptop 'Lock&Release' feature (by Buggler) 
o LAPTOP_MOUSE_CAPTURED

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1545 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-10-08 11:01:26 +00:00
Wanne 902cd02298 - A few adjustments and minor fixes (by Buggler) 
o Externalised Laptop 'Lock&Release' feature
o Minor Fix for Tactical 'Lock&Release' feature
o Show 'Page Numbers' in BobbyR Item Selection Page, AIM Profile Page
o Change Low Stat Color to Dark Grey (Previous: same color w Medium Stat) & its Criteria to < 20 (Previous: <50) for AIM Member Stats
o Laptop\AIM Member Screen: Hotkey BACKSPACE - Back to AIM Mug Shot Index. Close Window if in Conference Mode
o Laptop\MERC Screen: Hotkey BACKSPACE - Back to Merc Homepage
o Repeat Keys for 'Next' & 'Previous' in BobbyR Item Selection Page, AIM Profile Page, Merc Profile Page, Strategic Sector Inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5614 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-08 11:00:58 +00:00
Wanne 5238ceb3b5 - MP: it just expands and differentiates the different messages generated during an interrupt to aid in debugging and knowing what is going on / what has happened (by haydent) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5604 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-02 22:39:49 +00:00
Wanne dfbb390371 - Developer feature: This is great for when in windowed mode eg development and your mouse is leaving the game window all the time to go to VS or another game instance on your desktop. (by haydent) 
o this just means the screen stays put and not scrolling around like mad
o also the way it is coded, if the setting isnt there in the ini it just acts like usual.
o this also requires matching setting in Ja2.ini

;******************************************************************************************************************************
; Enable/Disable Mouse Scrolling of tactical view
;******************************************************************************************************************************

DISABLE_MOUSE_SCROLLING = 1

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5602 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-02 07:41:43 +00:00
Wanne 873dfb9577 - MP: Bugfix: Fix for the bullet stock bug (by haydent) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5601 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-02 07:39:26 +00:00
Wanne f22265468a - MP: Bugfix: client wasnt getting update via turn bar that server got interrupt (by haydent) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5600 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-02 07:38:38 +00:00
Flugente 7a81a212a9 random items do not spawn food if food system is deactivated 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5599 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-01 20:55:19 +00:00
Flugente fc49b33398 - random items can also be results of merges and item transformations 
- removed a few instances of incorrect random item spawning

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5598 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-01 20:42:55 +00:00
Wanne 7ef76bbe35 - MP: Externalized hardcoded text (from Revision: 5590) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5597 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-01 12:32:49 +00:00
Wanne 2dd4a79153 - MP: Removed the "Player" string from the turn bar text, because AFAIK we had something similar and that caused problems with the turn bar text 
@haydent: Once we know for sure it is working, we can include that later

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5596 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-01 12:27:08 +00:00
Wanne 9dc6349e6f - Added "XML_RandomItems.cpp" to VS 2005 and VS 2008 tactical project files 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5595 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-01 12:22:34 +00:00
Flugente d150a0742e added random items with 2 examples for assault rifles. Note that this is an example, they might change in the future 
FIX: item #1581 no longer has two classes

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1544 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-09-30 22:01:57 +00:00
Flugente ff157fd96b New feature: random items allow spawn not themselves, but an item from a brad selection 
- specify random items in RandomItems.xml
- when the game creates a random item, it searches all vialbe items according to random item class and picks one randomly
- this allows mappers to place items in maps that are more independent of the xml-set used, however the random items themselves msut be the same in map&mod
- can also be used to broaden the enemy gun/item choices selection
- for more reference, see http://www.bears-pit.com/board/ubbthreads.php/topics/310793.html#Post310793

FIX: sector curfew value was interpreted wrong

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5594 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-30 21:59:47 +00:00
Flugente 84c86d96ad FIX: loading BigMaps 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5592 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-30 14:59:32 +00:00
Wanne 2850011b11 - MP: Titlebar: Adds the word "Player" to start of the title bar (by haydent) 
o TODO: Also add the word "Player" to the other (non english) text files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5591 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-30 09:59:19 +00:00
Wanne 6f812ed45e - MP: COOP-AI Turnbar: adds a AI count to the turn bar (by haydent) 
o TODO: Externalize the text for translation

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5590 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-30 09:57:31 +00:00
Wanne 33291a713e - MP Bugfix: Sets the starting selected sector as the same for clients (by haydent) 
o There was a bug where if sector chosen before clients join, when they join they wont see this choice

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5589 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-30 09:54:43 +00:00
Wanne 82b10b0e08 - MP Bugfix: Allows the clients too see the sector deployment bullseye as chosen by the host (by haydent) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5588 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-30 09:53:19 +00:00
Wanne 4af60034f0 - Added missing items in *.Items.xml files 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5587 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-25 06:48:16 +00:00
Wanne cd0614461d - Updated Chinese.Items.xml (by zwwooooo) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5586 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-25 06:43:48 +00:00
Flugente 7d650f5389 fix: item pic was missing 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1543 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-09-21 18:44:16 +00:00
Flugente 9edcd360a5 - water from swamp sectors is now less poisonous. Also lowered the amount of poison bad food gives. 
- fix: igniting explosives in inventory now correctly triggers faction hostilities.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5579 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-20 19:36:31 +00:00
Flugente 446086c506 fixed error in UDB that could crash the game with displays after dirt system 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5578 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-19 23:34:41 +00:00
Flugente ecfb6f46ad Better pics for clothes (by Thor). 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1542 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-09-19 20:23:53 +00:00
Flugente f24e202fe7 New item flag: ItemFlag ATTENTION_ITEM (4096) makes an item 'interesting' to the AI. Upon checking for general pickup of items, these items have high priority. This can be used to lead the enemy into traps. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5575 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-18 22:16:23 +00:00
Flugente 3fdecfbcf4 - fixed an error that could cause clothes to spwan that were not worn 
- upon shooting/stabbing someone, their vest/pants will get unusable. It can be taken off, but no item will appear.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5572 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-17 20:42:38 +00:00