1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,688 Commits 9 Branches 6 Tags
64e4677ba767a67e6c237920a8b651351f329f48
Commit Graph
1688 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 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 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
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 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
Wanne a2b757d76a - Included missing XML_Clothes.cpp file to the project file for VS 2005 and VS 2008 
- Updated old text string for foreign languages

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5571 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-16 22:11:09 +00:00
Flugente b7e5b324d1 simplified a few lines concerning traits 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5569 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-16 17:44:33 +00:00
Flugente 665917e043 fix: sometimes, wrong clothes were taken off 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5568 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-16 15:13:05 +00:00
Flugente 3e30b296cf - removed the CLOTHES_CIVILIAN-flag, as it is not needed anymore 
- the Strip function now removes the covert tags, or takes off custom clothes if already not covert
- fix: XML_Clothes.cpp was not included

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5567 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-16 14:56:45 +00:00
Flugente 829c3140ae New feature: clothes items allow colouring of your mercs. See http://www.bears-pit.com/board/ubbthreads.php/topics/310208.html#Post310208 for more information. 
This feature requires GameDir r1540 or greater to work.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5566 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-16 02:57:45 +00:00
Flugente 3d6bc97289 Feature improvement: tripwire, tripwire mines and directional eplosives can now be planted with the map editor. 
- The action item system has been repaired for this. It has never worked correctly prior to this, but the errors never occured.
- New items from GameDir 1538 are required for this to work. They are direct copies of existing items, except for a new tag, <usActionItemFlag>.
- The name of the new action items should clarify in the editor what an item does.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5565 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-15 02:28:18 +00:00
Flugente 3cc8153a61 - fixed an issue saving the map in vanilla mode (by DepressivesBrot) 
- fixed a minor cosmetic issue (loading wrong frame for the overhead map) (by DepressivesBrot)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5564 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-13 19:53:14 +00:00
Flugente 692fff36ed Fix: commented out a code section that altered morale events depending on our current height 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5555 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-05 19:23:13 +00:00
Flugente d0e27b0229 Enhancements of the MOLLE Feature (by DepressivesBrot): 
- Added: Separate message for 'no space' (used 'already there' as a placeholder before)
- Fixed: Exchanging attachments when we are near capacity for the carrier
- Fixed: The LBE shown in the description box now changes as well and as soon as you add/remove an attachment
- Changed: The attachment now transfers the first non-zero pocket to the carrier instead of simply the first
- Added: Tooltips now show the currently used and the available space of a carrier.

- Added: A modifier for the explosive damage in confined spaces (by DepressivesBrot). Implemented on a per-item basis using the new float tag <bIndoorModifier> in Explosives.xml (0.5 means 150% damage, 1.0 means 200% etc.)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5552 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-04 19:27:01 +00:00
Flugente 02c53cdf16 fixed a bug that caused crashes when using food system, external feeding or covert ops while TOPTION_SHOW_TACTICAL_FACE_ICONS was false 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5547 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-02 21:39:59 +00:00
Flugente 41bc80dc3c - reworked the tripwire nework flags. This will allow much more complex networks in the future. WARNING: planted tripwires in savegames from previous savegames will behave strangely with this version. 
- externalised texts for cleaning, food, corpse handling and covert ops
- tripwire can now be defused even if it does not have a blue flag. When having a wirecutter in the main hand, click on the planted tripwire while crouched, the defuse dialogue will show up.
- corpses spawned from items will behave according to the zombie spawn rules
- fixed a few glitches with the covert ops trait
- fixed a bug that gave the 'mounted' bonus on a roof

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5546 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-02 20:38:17 +00:00
Wanne da441439ac - Added missing text entries to the _*Text.cpp files 
- Removed unused gzWeaponStatsFasthelp[ 32 ] from text files
- Fixed compilation warning in LOS.cpp
- Translated a few text entries for Chinese Version (by zwwooooo)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5543 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-31 09:00:45 +00:00
lalien a535c48c49 - fixed key ring icon position for all resolutions 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5540 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-27 20:56:05 +00:00
Flugente 623dcca3ed fix: carrying corpses did not raise suspicion like it should 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5539 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-27 20:48:39 +00:00
Flugente 6a05d44d85 - added second weapon cleaning operation to clean all guns 
- added missing texts
- cleaned up tripwire-related code

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5538 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-27 20:25:50 +00:00
Flugente 2ebe96ca59 New Attachment: the rifle grenade device (<AttachmentClass>33554432</AttachmentClass>) acts as a GL on the barrel slot, but blocks all other firing modes, and uses up one bullet. 
It is strongly advised not to use this in combination with other underbarrel GLs.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5537 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-26 18:59:37 +00:00
Flugente 3dbdd4b2ad added a global modifier to singleshot temperature (for those who feel the current values are too low or high). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5535 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-25 17:27:28 +00:00
Flugente e83afa8aa0 added stealing, cutting fences (and with that building fortifications) to the list of suspicious actions for the covert trait 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5534 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-25 16:45:42 +00:00
Flugente fd445fe5ed New feature: Covert ops 
- you can disguise members of your team as civilians or soldiers and, if careful, avoid detection by the enemy.
- For more info, see http://www.bears-pit.com/board/ubbthreads.php/topics/309312/New_feature_Covert_operations.html#Post309312
- GameDir revision >= 1529 is needed for this feature

- fixed a bug that could cause inventory items to be treated like armed bombs
- bloodcats can now be skinned

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5529 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-24 23:52:55 +00:00
lalien fa1586b22b - loading screen stretching for all resolutions fix 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5526 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-24 14:45:25 +00:00
lalien 3a599c1e2f - loading screen stretching for all resolutions fixed 
- warning in GameSettings.cpp fixed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5522 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-24 13:55:06 +00:00
Wanne 18f2420a2e - Updated Version: 5520 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5521 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-24 13:31:48 +00:00
Wanne 7a8475fb45 - Bugfix: If loadscreen does not exist, the filename was not outputted 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5519 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-08-24 12:55:59 +00:00