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,449 Commits 9 Branches 6 Tags
8cfdddddc43d541bf10d80056fbe14dfe2fb669a
Commit Graph
2449 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Flugente 8cfdddddc4 Merged revision(s) 7699 from branches/ja2_source_official_2014: 
Merged revision(s) 7688 from branches/Flugente/BaseTable:
- moved hair & skin enums to header
- moved hair colour choosing function to header


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7703 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-05 00:39:35 +00:00
Flugente 72809ac09f Merged revision(s) 7698 from branches/ja2_source_official_2014: 
Merged revision(s) 7685 from branches/Flugente/BaseTable:
no need for each dropdown to have its own image library

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7702 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-05 00:33:38 +00:00
Wanne 134b534718 Merged from revision: 7683 
Fixed a few errors in Russian translation (by Sevenfm)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7684 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-12-28 09:37:06 +00:00
Flugente 3a61f680da Merged revision(s) 7680 from branches/ja2_source_official_2014: 
Fix: crash on IMP creation if selected voiceset uses .ogg files instead of .wav


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7681 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-12-18 16:52:51 +00:00
Wanne eebb57ed38 Merged from revision: 7678 
Editor Fixes (by Buggler):
- '~' (tilde) hotkey to toggle level cursor if applicable; CTRL hotkey for placing objects on roof removed 
- Fixed missing roof cursor for non-vanilla size maps
- Updated editor popup text

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7679 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-12-09 15:57:15 +00:00
Wanne eaa153b310 Merged from revision: 7676 
Features (by anv)
- new Ja2_Options.ini setting - HIDE_EXPLORED_ROOM_ROOF_STRUCTURES (e.g. sandbags) at ground level view
- Hold CTRL hotkey in mapeditor to place any object on roof

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7677 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-12-06 13:37:25 +00:00
Wanne bb264d6815 Merged from revision: 7674 
- Fixed merc lighted movement popup text in options screen (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7675 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-12-06 12:57:40 +00:00
Wanne de99bcdb4f Merged from revision: 7672 
Increased MAXATTACHMENTS size from 30000 to 40000 which is needed for the amount of attachments in AIMNAS mod (by DepressivesBrot)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7673 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-12-05 19:13:54 +00:00
Wanne 62287f7672 Merged from revision: 7670 
Updated _FrenchText.cpp (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7671 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-12-04 16:51:53 +00:00
Wanne 0ef41fffd7 Merged from revision: 7668 
- Externalized hardcoded TownInfo text which shows the number of Total # of prisoners/capacity, to language text files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7669 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-12-01 20:57:11 +00:00
Wanne 5064e59785 Merged from revision: 7666 
- Updated _FrenchText.cpp (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7667 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-29 17:20:31 +00:00
Wanne 6e0823d5d1 Merged from revision: 7662 
Fixed typos in Source Code texts (thx to ATigersClaw)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7663 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-24 17:13:16 +00:00
silversurfer d9badabaf6 EDB now displays morale modifier for food. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7661 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-20 12:17:13 +00:00
Flugente 4f00ce2ffd Merged revision(s) 7659 from branches/ja2_source_official_2014: 
Fix: memory corruption in CalcChanceToGetThrough() causes game crash


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7660 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-18 20:53:39 +00:00
Wanne 7b700ac5c2 Merged from revision: 7657 
Fixed missing "," for pHelicopterEtaStrings[] for Dutch, Italian, Polish and Russian Version (thx to Woquit)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7658 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-17 19:51:08 +00:00
silversurfer 71546b5cc8 Fix (by Ocular): departed personnel stats and help text where not shown correctly 
http://www.ja-galaxy-forum.com/ubbthreads.php/topics/337768/[PATCH]_Fix_departed_personnel#Post337768


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7655 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-16 19:53:50 +00:00
Flugente 3a015ed1e6 Fix: dynamic opinions: mercs will only complain about the killing of civilains if they aren't hostile at the moment of their death 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7652 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-12 21:08:08 +00:00
Flugente ee27a3864c Fix: removed unnecessary display cover updates (by Ocular) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7651 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-11 19:33:26 +00:00
Flugente b5ed7df390 DISEASE_CONTAMINATES_ITEMS controls wether contaminated food/blades/throwing knifes can infect people. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7649 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-05 22:01:14 +00:00
Flugente 291985c022 ROOF_COLLAPSE controls whether roofs can be destroyed. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7647 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-04 20:37:42 +00:00
Flugente 94ded57962 New Feature: tracking allows rangers to track past movements. 
Fro more info, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/337545#Post337545

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7646 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-04 20:03:18 +00:00
silversurfer 60bffb1352 Fix: Removed invalid item property "counterforcefrequencymodifier" and all code parts associated with it. It was not used anymore by the game but fragments of it were still displayed in EDB which lead to confusion. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7644 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-03 13:23:05 +00:00
silversurfer 001f716d2f Fix: Swap Merc Portaits caused problems when trying to swap position with a dead merc. This is now denied. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7640 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-02 15:16:57 +00:00
silversurfer b09e46dd1b Fix: When no sector was selected and a savegame was loaded the game couldn't find a valid loading screen. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7638 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-02 14:12:21 +00:00
silversurfer d4b6b6f4a7 Fix: During Autoresolve a group that was in the sector could be assigned again as reinforcement which practically cloned the soldiers. Groups that are in the battle sector already now will not be considered as reinforcement anymore. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7636 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-02 13:41:18 +00:00
Flugente 7a61eec3e0 Merged revision(s) 7634 from branches/ja2_source_official_2014: 
Fix: NPCs could be handcuffed. This is useless as long as there are no routines that handle their removal and interrogation.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7635 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-02 03:11:19 +00:00
Flugente eee078af6d Merged revision(s) 7632 from branches/ja2_source_official_2014: 
Fix: missing strings lead to confusion in finance log

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7633 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-02 00:19:00 +00:00
silversurfer 7bd14ec3fc Fix: LBE layouts were broken since r7600 and always displayed all slots instead of those defined in LoadBearingEquipment.xml. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7631 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-01 18:38:31 +00:00
Flugente 65056d793c Fix: should any robot still have the covert property from a savegame prior to r7628, simply remove it. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7629 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-01 17:09:08 +00:00
Flugente 30ae48c8d7 Fix: robot could get the 'covert' property when added to the team 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7628 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-01 17:01:00 +00:00
silversurfer 62cb6f44fa Fix: Spreadpatterns did never work since their externalization. Now they should work. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7624 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-01 13:31:51 +00:00
Flugente 8857e0772b - if a a roof collapses, any structures built on it (fans, sandbags) are destroyed 
- if a a roof collapses, any corpses on it are moved to the floor

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7623 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-31 22:13:32 +00:00
silversurfer faf345ac18 Fix (by Sevenfm): Corrected mixed suppression parameters MAX_CTH_PENALTY_FOR_TARGET_SHOCK and MAX_CTH_PENALTY_FROM_SHOCK and also fixed suppression calculation. 
http://www.ja-galaxy-forum.com/ubbthreads.php/topics/337412/Re:_Code_Snippets#Post337412


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7621 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-31 15:36:02 +00:00
silversurfer 08af7cca36 Fix: Inventory popups for LBE slots didn't work properly. LBE slots are supposed to return a pocket type of -1 because they are no pockets. Instead they returned 2 (Knife pocket). 
Fix: Inventory slots didn't show possible item amount anymore since r7600.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7619 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-30 16:11:24 +00:00
Flugente 4e1c24c2d0 - roofs can also collapse if walla are destroyed with anti-materiel rifles 
- Fix: roofs at the centre of an explosion always collapsed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7618 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-27 22:36:52 +00:00
silversurfer c47ad1214e Fix: type of explosive was not processed correctly which always lead to pExplosive->ubType of 1 (stun). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7617 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-26 21:21:09 +00:00
Flugente eb15473d37 Deconstructing the walls of a house will eventually cause it's roof to collapse. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7615 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-26 00:20:29 +00:00
Flugente 2e9c6965b0 - New Feature: roof tiles can be destroyed. Requires GameDir >= r2174. 
- Fix: Owner ID of player-requested artillery shells was wrong.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7614 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-25 23:46:45 +00:00
Flugente 9eb023abf2 - Fix: crash if fragments from a non-player-planted mine destroyed a lock. 
- Take direction of explosions into account if possible.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7613 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-25 21:21:14 +00:00
silversurfer 5b7f243ed9 Change to # of aim clicks bonus for Ranger trait: 
The hunter now only gets POSSIBLE_AIM_CLICK_ADDED_SHOTGUNS / 2 (rounded down) as bonus which is a compromise that was necessary after the revamp of shotguns by Strohmann in GameDir 2173.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7612 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-25 14:03:07 +00:00
Wanne af1f5c5e17 Merged from revision: 7605 
Multiplayer: Added additional info text for using the chat by pressing 'y' in the Multiplayer Start screen

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7606 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-24 06:59:07 +00:00
Wanne 852f5bd5bb Merged from revision: 7603 
- Fixed _FrenchText.cpp (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7604 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-21 18:46:12 +00:00
Flugente 178142ad3d Merged revision(s) 7601 from branches/ja2_source_official_2014: 
Fix: savegames in slots > 119 get a wrong number.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7602 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-20 18:08:41 +00:00
Flugente 499ff2db06 If the itemlist is huge and one uses New Inventory System, New Attachment System and a lot of MOLLE items, there is a noticable slowdown if inventory is open in tactical. I cleaned up code to ease that somewhat, but the problem will likely persist. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7600 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-19 21:53:05 +00:00
silversurfer 5dbcf2a1e8 Fix: Militia tank fix could lead to graphical glitch with following crash. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7597 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-19 17:57:18 +00:00
silversurfer 74845ec5b9 Fix: Having lower (and invalid) team size values in Ja2_Options.ini than in the savegame could lead to crashes. I put back the check and warning message for this case. Having higher numbers in the ini is ok. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7590 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-18 19:54:50 +00:00
silversurfer f05cdc3286 Fix: Improved the fix for militia manning tanks in revision 7557. Tank slots are not made invalid anymore. Instead the placement body type will be converted to a normal militia body and moved to a free slot next to the tank. There is a new function "FindNearestPassableSpot" for finding an accessible tile next to a starting grid. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7588 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-18 15:26:03 +00:00
Wanne e000abcc57 Merged from revision: 7586 
Multiplayer Bugfix:
- Improved (fixed) interrupt endless clock when enemy interrupts (CO-OP game) (tested by Woquit)
- Override turn (ALT + E): Now it is possible again for the server to give the turn back to itself
- Updated MP Version Number to 3.1

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7587 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-18 14:08:28 +00:00
silversurfer 03e6f0bb0b Fixes (by Ocular): Grenade Launchers didn't cost any Ready AP. 
Underbarrel launchers shouldn't be able to change Ready AP of primary weapon because of AP micromanagement exploits.
http://www.ja-galaxy-forum.com/ubbthreads.php/topics/336777/[PATCH]_Fix_ready_AP_cost_and_#Post336777


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7584 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-18 11:20:56 +00:00
Wanne f9cad94471 Merged from revision: 7579 
Externalized (by Buggler):
- Kingpin's faction sector and roaming gridno around tony shop if they become hostile
- Queen's alternate grid no if basement sector is cleared
- Doreen's kids sector that is being freed
- Single sector towns does not give global loyalty bonus instead of previously hardcoded Tixa and Orta sector
- Enemy investigation town sectors if current loaded sector is player-controlled
- Associated town sectors to mine when mine runs out

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7580 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-17 16:25:58 +00:00