1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-12 14:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,623 Commits 9 Branches 6 Tags
latest
Commit Graph
7623 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Flugente 310fa7d57c Fix: incorrect check (by sevenfm) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8224 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-18 19:13:38 +00:00
Flugente 79f964b134 Shopkeeper in San Mona (C6) now buys almost any armour, and sells early to midgame ones 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2322 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2016-05-18 18:16:31 +00:00
Flugente 5a84b7b748 Fix: on various actions in the strategic screen (open inventory, dynamic dialogue) the message list is turned on and off 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8223 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-18 18:13:45 +00:00
Flugente 1565a9f67c 'Improve Gear'-function now also merges magazines and fills up ammo stacks 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8221 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-17 21:37:42 +00:00
Flugente b9575fcbee If Skyrider can't fly due to being out of fuel, warn the player 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8220 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-16 20:54:01 +00:00
Flugente 41a9c7104d Fix: crash in release exe due to bad initialisation 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8218 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-16 16:25:32 +00:00
Flugente 5df191a263 New disability: Hemophiliac causes mercs to bleed a lot faster, even for tiny wounds 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8217 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-16 15:17:11 +00:00
Flugente 4c6ac2c672 New disability: Hemophiliac causes mercs to bleed a lot faster, even for tiny wounds 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2321 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2016-05-16 15:03:52 +00:00
Flugente 645b42bc8b Fix: UB compilation error 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8216 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-16 12:37:24 +00:00
Flugente 381acc74a4 If we manually disguise a merc, immediately test the disguise 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8215 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-16 10:31:47 +00:00
Flugente 6460e9d325 Fix: unable to save after loading an older savegame 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8213 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-15 22:53:19 +00:00
Flugente 7bb401b1fb New feature: We can now create non-profile-based merchants via lua.scripts. 
Requires GameDir >= r2320.

For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23061&goto=345526&#msg_345526

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8212 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-15 17:11:29 +00:00
Flugente d639452893 New feature: We can now create non-profile-based merchants via lua.scripts. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23061&goto=345526&#msg_345526

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2320 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2016-05-15 17:09:14 +00:00
Flugente d594ba0e67 If a merc intentionally removes the diguise property via the [Ctrl] + [.] menu, the disguise property will not be reapplied until new clothes are applied, even if COVERT_STRIPIFUNCOVERED is set to FALSE in Skills_Settings.ini. This allows dressing up mercs in other colours without them being subject to covert mechanics. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8211 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-13 17:25:02 +00:00
Flugente 312249a0b6 Fixed typos (by Elestir) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2319 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2016-05-13 16:59:09 +00:00
Flugente e2004c06ee Changes to covert operations feature (by sevenfm): If the new skill setting COVERT_STRIPIFUNCOVERED is FALSE, 
- we can only disguise successfully if we haven't been seen recently (last 3 turns)
- disabled automatic clothes stripping when uncovered
- redisguise automatically if spy haven't been seen by enemy recently and wears correct clothes

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2318 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2016-05-12 22:28:37 +00:00
Flugente 284910e2d5 Changes to covert operations feature (by sevenfm): If the new skill setting COVERT_STRIPIFUNCOVERED is FALSE, 
- we can only disguise successfully if we haven't been seen recently (last 3 turns)
- disabled automatic clothes stripping when uncovered
- redisguise automatically if spy haven't been seen by enemy recently and wears correct clothes

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8210 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-12 22:27:54 +00:00
Wanne e702c43603 Update - 2016-05-11: Deadly Games German Translated Mercs for 1.13 - alpha (by firebat) 
- added various Gap-files
- updates to Beth
- updates to Ears
- updates to Bud
- updates to Weasel

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@8209 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-12 14:20:02 +00:00
Flugente c7fe1a9df6 - made Rifle LAMs useable by FAMAS and FN FAL 
- made Grippod useable by FN FAL

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2317 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2016-05-10 18:56:42 +00:00
silversurfer e43d1b3fb3 Fix: The Brass Knuckles tag didn't count as bare hand attacks anymore since revision 6465. I changed that back because Martial Arts trait includes brass knuckle items. Single attack AP display of such items in EDB was fixed as well. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8207 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-08 15:19:39 +00:00
Flugente 1a56d4a473 Fix: jumping over a merc allowed moving through walls 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8206 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-07 19:54:56 +00:00
Flugente 999fcea058 Added more operation names 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8205 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-06 18:42:22 +00:00
Wanne a07bf323ba Update - 2016-05-05: Deadly Games German Translated Mercs for 1.13 - alpha (by firebat) 
- added Carp
- updates to Lance
- updates to Gary
- updates to Beth
- updates to Leon

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@8204 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-06 16:19:30 +00:00
Flugente dc78077b0f Fix: unneccessary individual militia created during savegame loading due to bad sector 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8203 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-06 15:09:17 +00:00
Flugente 9f52c940a8 New feature: individual militia creates small militia profiles that track a militia's history and allow it to be recreated, thereby maintaining the illusion of persistent militia. 
Requires GameDir >= r2316.

For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=tree&th=23044&goto=345324&#msg_345324

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8202 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-06 14:51:24 +00:00
Flugente 641a41b24a New feature: individual militia creates small militia profiles that track a militia's history and allow it to be recreated, thereby maintaining the illusion of persistent militia. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=tree&th=23044&goto=345324&#msg_345324

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2316 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2016-05-06 14:50:22 +00:00
silversurfer 67927ed723 Fix: After restarting the game and loading a savegame the reinforcement option was always TRUE because it didn't take DifficultySettings.xml into account. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8191 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-04 11:23:03 +00:00
Wanne c969dce2b3 Bugfix: Button Image (WM_AUTOFIRE) was not unloaded (by Subotai) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8187 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-03 19:28:54 +00:00
Flugente 6adf9ad901 - Fix: coloured glitches in dropdown area 
- Improved mouse drag in dropdown scrollbar

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8183 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-02 20:11:42 +00:00
Flugente dba2386bc3 Changed variables to UINT16, in case a dropdown has a lot of entries 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8179 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-01 19:04:50 +00:00
Flugente bd59b2fcba - Fix: UB cannot be compiled 
- Fixed a few compiler warnings

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8176 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-24 19:59:25 +00:00
Wanne c266523f71 Update - 2016-04-23: Deadly Games German Translated Mercs for 1.13 - alpha (by firebat) 
- added Buzz (Snitch-files)
- Updates to Spike
- Updates to Moses
- Updates to Turtle
- Updates to Kaboom
- Updates to Beth
- Updates to Boss

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@8170 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-23 18:21:12 +00:00
Flugente 38814f5ee3 Fix: counter is not increased, potentially resulting in endless loop 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8169 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-23 14:42:58 +00:00
Flugente f0b9bb4304 Fix: if an enemy jeep is destroyed, sector jeep count is not properly updated 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8168 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-23 14:36:38 +00:00
Flugente 1b8a368108 Fix: UB cannot be compiled 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8167 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-22 20:03:32 +00:00
Flugente 92314bfbfb Fix: if a jeep is fought in autoresolve, it's entry remains in the vehicle list 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8166 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-22 19:46:41 +00:00
silversurfer 14ccc1193b Fix: The invisible troops fix from r8131 caused defending troops to be handled as reinforcements and appear at the map border instead of the pre-defined positions across the map. This was caused by unpausing the game before the troops had been placed. This revision fixes that and hopefully doesn't break anything else. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8162 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-18 21:21:53 +00:00
Wanne cc765fbd3f Added enhanced version (version #2) from Speck (by firebat) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@8161 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-17 11:48:28 +00:00
Wanne 0553b62571 Update - 2016-04-16: Deadly Games German Translated Mercs for 1.13 - alpha (by firebat) 
- added Speck
- updates to Hurl

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@8160 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-17 11:40:34 +00:00
Flugente 630889c561 Fix: combat jeeps could not be seen unless ENEMY_TANKS_ANY_PART_VISIBLE was true 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2315 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2016-04-14 20:32:13 +00:00
silversurfer 7aaeaad5ea some documentation updates in files (by CVB) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2314 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2016-04-13 14:32:16 +00:00
Flugente 26db62bd19 Fix: when merc starting gear is distributed into inventory, it is possible that too many items are spawned if an item stack is ahared over several slots 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8154 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-12 21:36:07 +00:00
Flugente 59b7026acc Fix: missing civ group names 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2313 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2016-04-11 18:48:18 +00:00
Flugente d913cf5ad8 Fix: crash in autoresolve 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8149 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-10 15:39:41 +00:00
Flugente 7124df2354 - Fix: Get Item assignement: if no valid gridno is found, let the game find one upon loading the sector instead of risking a wrong gridno assignment 
- Fix: When dropping an item in strategic inventory, height values are not set 
- Fix: When looking for a valid gridno to drop items t via strategic inventory, WORLD_ITEM_REACHABLE is not reliable, as updated map topology trumps this. Instead rely upon finding a valid gridno once the sector is entered.
- Fix: when searching for a new item dropoff gridno, search for new height too
- Fix: if items are spawned mid-air, the player cannot retrieve them

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8136 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-09 16:11:43 +00:00
Flugente b4e9f13935 Reworked armour values to be more balanced. 
For mor info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20659&goto=344851&#msg_344851

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2312 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2016-04-08 21:36:09 +00:00
Wanne 3e7c9a2eb8 Update - 2016-04-02: Deadly Games German Translated Mercs for 1.13 - alpha (by firebat) 
- added Eli
- updates to Kelly
- updates to Bob
- updates to Screw

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@8135 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-04 17:08:29 +00:00
Flugente d0dc6c3230 - Tweaked tunnel vision penalty calculation 
- If both body items and weapon have tunnel vision penalties, use their maximum, not their sum

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8134 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-03 16:53:17 +00:00
Flugente 6089e9a3b8 Fix: CTD when tring to check for panic triggers if no enemy is present 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8133 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-03 14:41:52 +00:00
Flugente 01ffd3eaf2 New feature: spawn extra civilians via Lua, see also http://thepit.ja-galaxy-forum.com/index.php?t=tree&th=22998&goto=344843&#msg_344843 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8132 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-03 14:40:17 +00:00