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
ChrisL 3f9cb6b833 BUGFIX 497 - Aim Level function was not allowing negative aim levels which might initially make sense, but if any modifiers would result in a negative value, we'd end up with an high value which would then get reset by the built in limits. I've recast the variable to an INT8 which will allow negative results, at least prior to the built in limits being applied. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4481 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 23:09:16 +00:00
ChrisL 7376ffbb68 BUGFIX 491 - Recast variables related to the Buddy/Hated system so that proper UINT8 values (0-255) are allowed. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4480 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 22:28:19 +00:00
ChrisL 42a2130043 BUGFIX 484 - Appears that some of the SM Panel pockets were out of alignment by 1 pixel to the right. I'm not sure if this is because of a recent sti alteration or if this has always been the case but the code has been updated to account for the current STI coords. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4479 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 21:06:06 +00:00
ChrisL ab7ecb51e6 BUGFIX 482 - Corrected several variable definitions so that large mag capacity is better supported. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4478 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 20:37:23 +00:00
ChrisL 25133e0afe BUGFIX 480 - When disarming a bomb when your inventory is full, the merc actually disarming the bomb will now be the active "ItemPointerSoldier". 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4476 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 19:44:37 +00:00
Wanne 75b4d43964 - Fixed Tixa problem: When playing Realistic you could go down to underground level where crepitus are 
o When loading such a buggy savegame, we will fix it automatically

- Simplified (reworked) IF-conditions with crepitus

- new define in luaglobal.h: LUA_GAME_INIT_NEW_GAME, LUA_GAME_INIT_NPCS.
o So we can select if we want to use lua script (GameInit.lua) or the hardcoded JA2 stuff

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4475 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 19:04:56 +00:00
Wanne a6cade76ca BUGZILLA #510: Crepitus were still present in Tixa underground even in Realistic GameMode 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1300 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-06-05 22:09:48 +00:00
Wanne bfbe6b0311 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4472 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2011-06-05 07:44:32 +00:00
Wanne da8d90a1b6 - Updated a text from the option screen 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4471 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-03 13:18:24 +00:00
Wanne 7ff31b59b0 BUGZILLA #492: Fixed CTD when switching from IMP page to another web page 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4469 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-02 20:52:24 +00:00
Wanne 6b72751538 - Bugfix: Fixed CTD that could occur on enemy soldier pathing 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4466 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-31 19:03:21 +00:00
Wanne ad90dcc884 - Fixed comment for STRENGTH_TO_LIFT_HALF_KILO 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1295 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-05-30 10:45:13 +00:00
Wanne 68757bfda0 - Changed output name to match language selection 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4464 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-30 02:39:13 +00:00
Wanne 38bd7da7bb *** Hotfix: Build 4462 *** 
- This fixes the problem with the merc portraits (game freeze, portraits not showing up when talking, ...)
- It also fixes the problem with the wrong opponent counters on the merc portraits

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4462 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-30 02:31:51 +00:00
Wanne ef59f6e415 - Reverted the fix to set the correct camo face in the save load method, cause I am not exactly sure if that also leads to the merc faces bugs 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4461 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-30 01:42:12 +00:00
Wanne 1b60a67678 - Fixed game hang when merc tries to exermine a door with explosives 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4459 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-29 21:46:00 +00:00
Wanne 2b7f79db94 - Fixed problems with merc faces when doing certain actions. This bug was introduced in revision: 4396 
o Fixes endless loop when clicking on items with explosives and merc starts to talk
o Fixes hidden merc faces
o Fixes wrong merc faces (merc face instead of skull) when merc is dead

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4456 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-29 16:08:27 +00:00
Wanne 993f3a204c - Reverted BUGZILLA #338 fix, because the fix lead to problems with enemy soldier opponent count 
o Now it should work again

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4455 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-29 10:14:10 +00:00
Wanne e98e6a3f26 - Bugfix Merc Profile Editor: Wrong personality traits were shown in the drop down list. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1294 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-05-28 12:41:44 +00:00
Wanne f22df5f30d - Fixed wrong description text for CAN_TRUE_CIVILIANS_BECOME_HOSTILE (thx to Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1293 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-05-28 08:47:04 +00:00
Wanne 3a3e524a61 - Minor updates for the spring 2011 release: 4452 
o Small correction for INI Editor
o Updated ja2.ini

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1292 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-05-27 10:27:07 +00:00
Wanne 508ef18db9 - Official Spring 2011 Release Build: 4452 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4452 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-27 10:26:04 +00:00
Wanne 39a6c78684 - Changed "Dr Q" Traits from "Hand-to-Hand/Martial Arts(Expert) & Night Ops" to "Hand-to-Hand/Martial Arts, Paramedic/Doctor & Night Ops", cause that fits better (thx to Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1291 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-05-27 06:18:05 +00:00
Wanne bd9d5a0d9d - New XML Editor build with all the needed XML files 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1290 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-05-26 22:54:45 +00:00
Wanne e4dd5e7fc7 - Fixed type in _EnglishText.cpp 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4450 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-26 14:09:00 +00:00
Wanne d95d831ba3 - Added files to "ignore list" 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4449 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-26 12:49:35 +00:00
Wanne be95a2a7b1 - Added missing projects "VFS" & "export" to SVN 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4447 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-26 11:25:04 +00:00
Wanne 6e2bdd557c **************************************************************************** 
** Merged Source Code from Development trunk, for the Spring 2011 Release **
****************************************************************************
o Development Trunk (Revision: 4444):  https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
o This trunk (the official 1.13 source trunk) will only be used for fixing bugs. No new features will be added here.
  New Features are only included in the Development trunk
o !!! After we have fixed a bug here in this trunk, we should MANUALLY merge the bugfix in the development trunk !!!

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4446 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-26 11:04:47 +00:00
Wanne 310c42dfa4 - Deleted unused File 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1289 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-05-26 10:56:41 +00:00
Wanne 5c04b9b1e1 **************************************************************************************** 
** Merged (English) GameDir files from Development trunk, for the Spring 2011 Release **
****************************************************************************************
o Development Trunk (Revision: 4444):  https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1288 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-05-26 10:54:58 +00:00
Wanne def3070e9d ************************************************************************************************ 
** Merged Language specific GameDir files from Development trunk, for the Spring 2011 Release **
************************************************************************************************
o Development Trunk (Revision: 4444):  https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@4445 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-26 10:50:22 +00:00
Wanne dc36a0fa4f - Updated some Chinese Version files (by zwwooooo) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@4440 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-26 09:20:17 +00:00
Wanne 7b3115ad5f - Updated Chinese files (by zwwooooo) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@4419 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-19 08:03:22 +00:00
Wanne f6af3a7e7a - Fixed problem in Chinese.CivGroupNames.xml 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@4414 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-17 08:42:24 +00:00
Starwalker 9d2e6426db gave NCTH-values to the HK LMGs with integral bipods where they were missing. 
removed NCTH-values from LMGs (and SRs) that no longer have an integral bipod.
FN MAG can mount a Grippod now (found an after-market rail on the web...)
raised the number of 6.8mm SPC ammo at BR's and added a clip to Tony's inventory as well.
made Rifle-LAMs attachable to AICW (it has a rail on top).

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1287 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-05-17 06:49:08 +00:00
Wanne 77bc83d49c - Removed double entries from *.CivGroupNames.xml 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@4413 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-17 06:24:04 +00:00
Wanne 92524291d4 - Fixed double entries in CivGroupNames.xml 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1286 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-05-17 06:16:56 +00:00
Wanne 5600f5d287 - Added Chinese EDT files for Wildfire 6 mercs (by zwwooooo) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@4411 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-16 16:41:06 +00:00
Wanne b593050059 - Fixed "jumping letters" in "Multiplayer Game" titletext in main menu 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1285 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-05-09 10:09:42 +00:00
Starwalker 91bfd7ae30 changed binoculars back to being one-handed, because ChrisL will implement code that stops the exploit of having one in each hand to get double the bonus... 
added a 'Use Item'-merge to get a Fumble Pak out of a Portable TV by using the Utility Knife.
changed Bubba's ammo from magazines to speedloaders (was mentioned on Bugzilla).

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1284 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-05-02 14:00:49 +00:00
Wanne 2fcbaabab6 - Fixed some frames for Wildfire IMP camo faces (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1283 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-05-01 18:43:43 +00:00
Wanne cedcc69f7a - Translated missing items texts in German.Items.xml (by SergeantKolja) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@4362 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-04-25 08:34:18 +00:00
Wanne 10beeb98b2 - Updated "Data-1.13/Scripts/initunderground.lua": Now it is possible to specify alternate loadscreens when loading a sector (by Realist) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1282 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-04-25 08:27:59 +00:00
Wanne 81d67a56cf - Translated most of the English text in German.Items.xml (by SergeantKolja) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@4344 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-04-22 16:45:44 +00:00
Wanne 19c7913d77 - Fixed typo 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@4343 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-04-22 16:40:40 +00:00
Wanne 263fceec02 - Forget to set 50/50 chance for the new UB loadscreens 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1281 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-04-19 08:32:29 +00:00
Wanne c34ab43816 - Added 1.13 sector loadscreens (by Jazz) 
- Added a few 1.13 matching sector loadscreens to alternate sector loadscreens in SectorLoadscreens.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1280 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-04-19 08:20:27 +00:00
Wanne 06fb2d1ff2 - Added missing camo faces for IMP 218.sti and 219.sti (by Jazz) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1279 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-04-19 07:23:27 +00:00
Wanne 4389c13eb9 - Added missing camo faces for IMP 216.sti and 217.sti (by Jazz) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1278 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-04-16 16:13:30 +00:00
Wanne 31e90b8ed2 - Fixed a few face portraits (corrected some sti frames) (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1277 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-04-11 07:59:12 +00:00