Commit Graph
133 Commits
Author SHA1 Message Date
lalien 3e22dce318 Merged Multi Player Project into main branch
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2144 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-12 08:20:47 +00:00
lalien 43ca24dda8 Merged New Inventory Project into main branch
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-08 15:15:25 +00:00
Wanne 72b9a847dd - suppressed all the deprecated insecure functions warnings for VS 2005:
Project -> Properties -> Linker -> Command Line -> Additional options: /D "_CRT_SECURE_NO_DEPRECATE"
- Enabled PLAY_INTRO (defined in ja2.ini) property in source code

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1834 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-24 17:55:49 +00:00
lalien 2ed23927f2 - fixes for VS2003
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1806 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-16 16:34:47 +00:00
lalien 8af1e04895 - added include dirs for debug config
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1079 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-20 07:03:46 +00:00
lalien 610df320a5 - added Res include directory to Console.rc for VS 2003 project
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1077 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-19 12:16:55 +00:00
Wanne 14340ad8ea Updated Project configuration for Release Build with VS 2003
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1057 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-15 15:54:46 +00:00
Wanne 1f337d9d51 Updated project files, because they did not compile on my machine under VS 2003
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1055 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-15 15:23:16 +00:00
lalien ee6980bc5d - added console project for VS 2003
- new shortcut: Ctrl+Y deletes all items of selected type from the sector inventory
- new shortcut: Alt+Y sells all items of selected type from the sector inventory






git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1051 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-14 13:51:39 +00:00
lalien 45b0868ace - fixed: shift-R (autoreload) doesnt check if the ammo is accesible/visible
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1024 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-04 22:04:12 +00:00
lalien 5102293774 - reverted resource.h for VS 6/2003 compatibility
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1022 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-01 20:48:33 +00:00
lalien 6cf3fbbe5a - added new militia control command
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1020 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-29 21:19:11 +00:00
Wanne dc441a425d Added Overhaul's Lua lib to the project. Now it works without Lua51.dll
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@996 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-20 19:11:58 +00:00
Wanne 4d51fbcdd9 PROJECT CHANGES (already done for VS 2003):
- Changed "Runtime Library" from "lua" project to "Multi-threaded Debug (/MTd)" so we get rid of "Linker Warning LNK4098" in project "ja2"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@940 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-10 19:42:03 +00:00
Wanne df9d9e6c00 PROJECT CHANGES (already done for VS 2003):
- Added "lua" project folder to the "Additional Include Directories" for each project
- Added "lua51_vs2003.lib" to the "Additional Dependencies" for project "ja2" 
Project should now compile in VS 2003 without any errors.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@935 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-10 18:48:46 +00:00
lalien 5299427465 - added project and lib files for Lua
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@933 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-10 13:58:34 +00:00
Wanne eebe112427 new exe build (911)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@912 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-31 08:31:22 +00:00
Wanne d61f4ff935 - new exe build (888)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@889 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-21 14:59:40 +00:00
Wanne 76cf1684f1 - new: Externalized sector loadscreens to TableData\Map\SectorLoadscreens.xml (INI-Switch: USE_EXTERNALIZED_LOADSCREENS)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@887 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-21 14:29:52 +00:00
Wanne 5661efc75b - new exe build (872)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@872 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-09 20:38:22 +00:00
lalien 0530b53b9c bug fixes from Overhaul:
- Data type changes 
- Templates removed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-09 13:16:37 +00:00
lalien 61d6152ce5 bug fixes from Overhaul:
- Disappearing corpses (and possibly items) when cursor hovers over a square on the rooftop; also fixes a "write to freed memory" heap check
- Fixed improper printf field in a debug message 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@870 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-08 22:44:08 +00:00
lalien 8e80a6168a bug fixes from Overhaul:
- roof inaccessible tiles problem
- AI hang while deciding on an action (fire 0 rounds on auto)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@868 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-08 15:10:29 +00:00
lalien 30cc546c09 bug fixes from Overhaul:
- CTD when someone fell off the west side of a building 
- Assertion failure when Skyrider leaves a sector where a merc cannot be woken up 
- Boxing fixes: Opponent no longer "seeks cover", ie jumps back out of the ring; no longer will pick up a gun from the ground while boxing
- Disappearing corpses (and possibly items) when cursor hovers over a square on the rooftop; also fixes a "write to freed memory" heap check

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@867 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-08 14:42:28 +00:00
lalien 60b6b85801 Strategic AI changes:
- Removed Omerta from the list of "unimportant" sectors (Estoni and San Mona still "unimportant")
- Allowed queen to attack Omerta before day 2 at 7:45AM and Drassen before day 3 at 6:30AM
- The reinforcements are not reassigned anymore when the sector where they were going to is captured by player
- Omerta garrison is not reassigned anymore when queen fortifies cities
- Enabled investigation of lost city sector by the enemy 
*Limit for the investigation of the sector depends on difficulty level (4, 8, 12 and unlimited on INSANE)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@861 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-27 21:30:59 +00:00
lalien a17a3f7cc8 - New feature: Remove attachments and unload all weapons in sector (Shift+F)
- Fix for grenade launchers (allow reloading with valid ammunition only)
- Fix for stacking items in sector



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@855 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-19 09:28:28 +00:00
lalien 0eb7e55a52 - Added translation table for Russian characters
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@839 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-07 15:26:43 +00:00
lalien 1ef4419b0d - Fixed misspelling of function names
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@822 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-01 10:37:34 +00:00
Wanne 68f05b3e6b new exe build (820)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@821 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-01 10:09:59 +00:00
lalien 6d117f5c06 - Added rooftop CtH fix from AndroidXP
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@812 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-03-30 18:08:32 +00:00
lalien 127c4933f5 - Fix for VS 2005 in German and Russian versions
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@805 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-03-29 11:43:29 +00:00
lalien 9467b5b6a7 - Added CtH fix from AndroidXP
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@804 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-03-29 11:00:22 +00:00
lalien 6664b92b25 - Added AndroidXP fixes for Sniper Deadlock and Grenade AP loss
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@797 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-03-25 15:20:25 +00:00
lalien c2528cab4f - changed UINT16 to wchar_t for VS 2005 compliance
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@781 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-03-13 20:01:02 +00:00
lalien 3f37673034 - added VS2005 compability fix from Space Viking
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@766 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-03-10 18:46:57 +00:00
lalien 1d00e73866 - fixed "end move & LOS bug" ('END' button has two different actions)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@751 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-03-04 18:04:07 +00:00
lalien 431b92c26e - moved ja2.set (game settings file) to a custom data directory defined in ja2.ini
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@748 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-03-01 21:10:55 +00:00
lalien b0ef70dbb8 - Tactical militia command: stopped merc from moving to militia in combat if he doesn't have a headset (radio)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@736 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-02-24 10:13:46 +00:00
lalien 81f5b6e748 - new menu option: Low CPU Usage (patch from MTX/defrog)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@725 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-02-21 17:17:00 +00:00
Wanne 01b0d31144 New Release / Update build
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@687 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-28 21:27:19 +00:00
Wanne 0ae307a316 - bugfix: German "Umlaute" were not displayed correctly for short item names
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@685 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-28 20:02:05 +00:00
lalien 21c2464a43 - AP costs for reloading a GL or RL by attaching an item are taken now from weapons.xml (still buggy, allows cheating)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@684 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-26 17:01:03 +00:00
lalien b46f47cb04 - bug fix: no explosion if the rocket launcher was reloaded manually (with attaching a rocket/grenade)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@679 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-24 12:07:39 +00:00
Wanne 805e9de8d7 new exe 656
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@666 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-18 19:02:29 +00:00
lalien e4d8bfa058 - bug fix: when merging an item to a stack of items all of them were converted to a new item
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@663 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-17 19:42:32 +00:00
lalien f96b4374f1 - new menu option: silent Skyrider
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@661 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-12 18:45:43 +00:00
Wanne 358fc9e31c - feature: Added filter buttons for Misc items to Bobby Rays
new exe build (656)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@657 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-07 21:03:32 +00:00
lalien bcfa50e793 - The queen should try to get the cities back after they were liberated, just like the SAM's
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@654 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-05 21:13:43 +00:00
Wanne 6049d1dda5 new exe build (650)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@650 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-12-17 13:47:14 +00:00
Wanne 7bcba64bf2 - new exe build (645)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@645 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-12-04 21:58:16 +00:00