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,167 Commits 9 Branches 6 Tags
7ba509cd40d1a522aba60f9104f144fb06232e21
Commit Graph
122 Commits
Author SHA1 Message Date
Wanne 959bb1901b - Chinese Bugfix: Adjusted WINFONTS for Chinese version (by zwwooooo) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4841 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-12-11 15:25:24 +00:00
Wanne 8624928dd5 - Chinese Bugfixes (by zwwooooo) 
o Correct tactical interface font height to fixed Chinese characters smearing bug
o Correct missing symbols "\n" in _ChineseText.cpp

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4799 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-11-16 00:02:01 +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 d8d0af38e8 ************************************************************ 
* Merged Source Code from Development Trunk: Revision 4063 *
************************************************************
- Deleted unused files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4065 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-01-18 09:18:46 +00:00
Wanne 91087ca8c0 ************************************************************ 
* Merged Source Code from Development Trunk: Revision 4063 *
************************************************************
- Source Code is merged from: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- This will be the Source for the Beta 2011 Test

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-01-18 09:11:09 +00:00
Wanne 025c3742b4 - Bugfix: Chinese Version crashed on start (problem with font initialization) 
- Bugfix: Assertion erro if "ja2_settings.ini" was not present
 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3394 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-03-13 18:11:35 +00:00
Wanne 14750c6903 ********************************************************** 
** Big Maps Projects code (incl. Multiplayer v1.5 **
**********************************************************
- Merged Big Maps Project code from BMP+MP trunk (Revision: 3340)
o Complete SVN Revision history: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- Before THIS merge, I made a branch of the existing 1.13 source
o SVN Branch: https://81.169.133.124/source/ja2/branches/JA2_rev.3336/src
- Removed old VS 6.0 and VS 2003 project and solutions files, because compilation is broken long time ago
- I will add VS 2010 projects and solution file in the next few days

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3341 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-02-28 18:38:52 +00:00
Wanne f010769397 ************************* 
* HAM 3.6 (by Headrock) *
*************************
- Info: Needed GameDir files for HAM 3.6 are not committed yet to the SVN GameDir. Will do that in the next few days
- For more infos on HAM 3.6 check out: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=244808&page=0&fpart=1


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3323 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-02-20 15:49:46 +00:00
Wanne a20ac7fb1c - Bobby Ray Tooltips (Fixes) (by Headrock) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3172 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-09-03 07:39:34 +00:00
bugmonster 5b11e6790e - removed loading of unused ja2_logo.STI 
- message "windowed mode requires a color depth of 16bpp" localized (need translation to Dutch & German)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3163 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-08-30 10:11:36 +00:00
Wanne 5c9f9e71f9 - Fixed a few Visual Studio compiler warnings 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3129 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-22 21:35:50 +00:00
Wanne 06a2af0fa6 Win 98 VFS Fixes (by BirdFlu) 
- add ini option to disable UNICODE in VFS (and use the current codepage)
- when UNICODE disabled in VFS, open files with default encoding (instead of UTF8/16) filenames


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3118 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-20 08:14:37 +00:00
Wanne cb0ceabb82 *** Merged Code from Multiplayer Branch Revision 3040 *** 
Bugfixes: Bobby Ray Shipment
- Re-enabled stealing from delivery sector (STEALING_FROM_SHIPMENTS_DISABLED)
- Re-enabled & externalized chance that whole shipment is lost (CHANCE_OF_SHIPMENT_LOST)
- Re-enabled delivery from John Kulba

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3041 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-28 16:51:52 +00:00
Wanne 20c8fb646d - Bugfix: Reset the pressed keys (ALT, \) after the console opened 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3031 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-26 08:36:20 +00:00
Wanne 46cd01e366 - Merged Source Code from MP branch Revision 3021 
. clip surface coordinates before blitting
. track surface data pointer, to identify the surface's clip rectangle
. editor : test if item index is smaller than the number of items 
. other minor updates
. update png loader to work with new appdata.xml structure
. VFS updates
. fix radar maps : write to <userprofile>\RADARMAPS

* New Map Editor Release (Build: 3023)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3023 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-19 15:19:49 +00:00
Wanne e240037535 - Bugfix: Fixed CTD when item could not be rendered in the Editor Toolbar 
- Fixed compilation error while compiling with disabled #define USE_VFS

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2997 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-10 15:12:58 +00:00
Wanne 1c69e1a019 *** Merged Code from Multiplayer Branch Revision 2993 *** 
- Updated VFS
- Fixed Map Editor not properly initialized with VFS
- New Map Editor Release (Build: 2993(


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2994 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-09 11:40:08 +00:00
Wanne 5291e3b127 - Bugfix: Console now works in VS 2008 (by SpaceViking and The_Bob) 
- Bugfix: Reset the ALT + \ keys after opening the console in the SGP

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2991 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-09 09:31:43 +00:00
Wanne 47db604b50 *** Merged Code from Multiplayer Branch Revision 2960 *** 
- Virtual File System (VFS) by birdflu. This is needed for Multiplayer and is also used for Single Player. Very neat system :-)
- Multiplayer Version 1.1 + some additional features and bugfixes
* INFO: If you compile a new EXE and want to test, be sure to also use the latest SVN GameDir files in your JA2 install directory *




git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2961 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-04 21:01:45 +00:00
Wanne a0a79078ab - Bugfix: Wrong savegame version (104 instead of 106) was used for Daeltar's Airport externalization and so we could not load older savegames (without airport externalization) 
- Enabled USE_AGGRESSIVE_ASSERTIONS in Debug.h

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2804 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-05 20:25:02 +00:00
SpaceViking e1a56677f4 Move random functions to .h and inline them. This will speed up the code overall given their high usage. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2788 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-01 03:08:54 +00:00
Wanne 9b9e22f09d - Fixes/Improvements to Option screen (by Arynn) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2709 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-10 10:36:08 +00:00
lalien 5f9261273a Removed assertion in Random.cpp 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2648 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-31 12:15:33 +00:00
SpaceViking 84299f157e Add "USE_AGGRESSIVE_ASSERTIONS" define 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2636 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-28 00:13:12 +00:00
Wanne a465bebf14 Fixed a bug when creating the application, it was only possible to start ONE instance of the game. Now it is possible to start as many instances of the game you would like. 
So this is very helpful for debugging and running 4 clients on one single PC (each client needs its own JA2 installation folder).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2635 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-26 05:09:52 +00:00
Wanne 8fa1c2a4e6 Merged Multiplayer UI patch from Zathras: 
New Features
- Added hits, misses, accuracy to scoreboard
- Added in-game chat with history
- Added more options from the ini to the host screen, Use NIV and Enable
civillians
bugfixes
- Clients connecting at the same time controlling the wrong client
- Team Deathmatch working again
- Refreshing the player list after a player changes team / edge
- AI is always on for Co-op now
- There is now always a scoreboard in Co-op even when you lose.
- scores on the Co-op scoreboard have been fixed for all deaths including
bleeding
- Start Game button now only appears for server
- Fixed cleaning up game resources on disconnection
- Disabled the 1,2,3,4 keys for connecting / disconnecting
- Fixed victory conditions for all game modes
- Fixed players names getting copied into TeamTurnString each game resulting
in multiple names
- Fixed Assertion bug caused by the game sometimes calling
SetCurrentWorldSector more than once before placement of mercs
- Fixed a bug that was possible when merging items such as M14 and EBR stock
on mapscreen.
- Fixed bug with game starting while a player was in chat, closes chat
window when game is starting
- Fixed bug with game starting while a player was in the options screen, if
the player leaves the mapscreen while ready, they are set to unready
- Team and Spawn direction popups changed to use buttons to open/close them
- Disabled players joining after the laptop has been unlocked, as they would
be out of state with any hires


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2628 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-19 15:31:55 +00:00
Wanne 8b0305e221 Chinese specific update (by zww from tbs) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2566 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-01-31 18:20:16 +00:00
Wanne 2364f70c5d Chinese Fixes: Changed code to use "Chinese.Items.xml", some smaller fixes for chinese version (by Inshy) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2528 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-01-20 14:47:34 +00:00
SpaceViking f26095d86f Space Viking's many mercs changes plus numerous generic bug fixes 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2498 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-01-15 01:26:13 +00:00
Wanne 962ccc0b40 Bugfix: Avoid Game to crash (stack overflow) when an error occurs and we have an active MOUSE_REGION 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2468 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-01-03 17:49:43 +00:00
Wanne bc7014a079 Bugfix: Lua shutdown (possible NULL reference) 
Russian, French and Polish texts update
Fonts update (for future Italian version)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2463 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-12-29 14:08:35 +00:00
Wanne 0e7ecd727c Disabled "Debug Memory Allocation On The Heap" for Debug Version (thx to Birdflu) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2462 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-12-27 13:44:08 +00:00
Wanne e95d4b8bca VS 2008 project files update 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2453 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-12-12 20:21:32 +00:00
Wanne 599f658232 Updated VS 2008 Project Files (thx to BirdFlu) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2451 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-12-10 20:57:37 +00:00
Wanne 2d6d7c8851 Source Code compiles now with VS 2005 and VS 2008 without making any changes. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2448 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-12-07 15:38:29 +00:00
Wanne b8c1ceffee New Release Build (2445) 
BE SURE TO UPDATE FROM SVN GAME DIR (REV. 1060) TO GET THE UDPATED GAME DATA FILES (FONTS) FOR THIS SOURCE MODIFICATION, BECAUSE OF FRENCH VERSION ADJUSTMENTS

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2445 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-12-05 22:44:55 +00:00
ChrisL 92219f3e5a Altered the RemoveRegion failsafe so use the REGION_EXISTS flag. This seems to resolve the "timed" crash and/or infinite loop that people have been reporting with sector inventory. 
Added a cheat hotkey that creates a huge variety of items for troubleshooting sector inventory with multiple pages.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2442 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-12-02 22:57:32 +00:00
Wanne c467ab629a Updated WinFont.cpp 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2434 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-11-25 22:15:22 +00:00
Wanne 9d08dd56a1 Updated VS 2008 Project Optimizations to VS 2005 Project Optimizations (Result: Build smaller Executables) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2432 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-11-24 19:26:52 +00:00
Wanne 647afe10c8 Added VS 2008 solution and project files 
To compile with VS 2008 you have to disable the fist line in "Standard Gaming Platform\input.cpp". Just look for comment "// VS2008"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2426 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-11-21 22:15:22 +00:00
Wanne 032fd1f353 - Added Chinese language support (thx to Noword from TBS) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2424 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-11-20 07:43:57 +00:00
lalien be9b2f47a7 Fixed polish letters 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2421 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-11-17 22:36:04 +00:00
Wanne 8f2201afe4 - on-the-fly convertation of all codepages to unicode (by lalien and bugmonster). I think this is needed for a Polish release in the future. 
BE SURE TO UPDATE FROM SVN GAME DIR (REV. 1050) TO GET THE NEEDED GAME DATA FILES FOR THIS SOURCE MODIFICATION 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2417 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-11-14 11:50:38 +00:00
Wanne 59f652c6a2 - Replaced all "Jagged Alliance 2" strings to "Jagged Alliance 2 v1.13" 
- Added missing tooltip text for Enhanced Desription Box in the settings
- New Release build 2415

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2415 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-11-13 14:06:46 +00:00
ChrisL 905ce20125 Enhanced Description Box, v1.3. By Headrock 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2414 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-11-13 01:11:59 +00:00
Wanne d63ae7501b Bugfix: JA2 now shuts down without an error, if the desktop colors are not set to 16 bit color after the message box appears 
Changed some text strings from "Jagged Alliance 2 v1.13" to "Jagged Alliance 2", so the game consistently used "Jagged Alliance 2".

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2396 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-11-04 19:44:03 +00:00
ChrisL 26201b3816 Updated build number 
--Editor fixes from Kriplo
Implementation for mouse wheel support
Implementation for mouse middle button support
Fix for adding on roof tiles
Fix assertion when leave editor mode
On saving map check of entry points are add
Fix for to many ToolTip messages in place walls
Fix assertion on loading map without entry points
Fix assertion in Sector Summary if DevInfo directory not exist
Fix for problem of losing map edgepoints
Fix problem with losing stuff from LBE
Fix crash in meanwhile
--Fixes from Headrock
Fixed a typo in the Health experience calcuation for strategic movement
Added "Draw" cost to weapons help data


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2375 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-10-13 21:05:28 +00:00
ChrisL 3e8d006329 Added a debug configuration for the MapEditor so that coders can more easily debug problems with the editor. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2354 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-09-19 16:27:07 +00:00
lalien 3ae10505f4 Fixes for new fonts 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2318 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-27 21:45:39 +00:00
ChrisL ec87dd51e6 SpaceViking's random number and CTH adjustments. 
OIV Graphic alignment correction.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2242 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-07-17 00:16:16 +00:00