Commit Graph

936 Commits

Author SHA1 Message Date
PolitikerNEU
54db1e20f6 Chaning of the queuing key is easier 2010-04-18 19:28:52 +00:00
PolitikerNEU
e06e964728 Added queing commands with shift 2010-04-18 07:35:48 +00:00
Mark Vejvoda
e9453ae7d1 Updated version # for current development 2010-04-18 06:01:20 +00:00
Mark Vejvoda
3d670be353 Changed ver # in preparation for a new release 2010-04-16 08:29:58 +00:00
Titus Tscharntke
304739e990 'm' is no longer use dto move units ( I think noone ever used it ) Its used to display faded messages now
Releasenotes are in the reame.txt now
2010-04-16 00:07:32 +00:00
Titus Tscharntke
e02a81d1a2 press escape to abort chatting 2010-04-15 21:16:13 +00:00
Mark Vejvoda
6a9dcdcf7e Added some extra guards for NULL 2010-04-15 05:06:15 +00:00
Mark Vejvoda
30c4eb2b96 Added some performance logging capabilities and socket cleanup for new broadcast thread sockets 2010-04-15 01:19:00 +00:00
Titus Tscharntke
e5d9631a9f watersounds playing all over the map is fixed.
'M' key shows faded console messages again (currently ingame only )
2010-04-14 20:49:14 +00:00
Titus Tscharntke
8099e9db96 version number position in intro 2010-04-13 19:08:08 +00:00
Mark Vejvoda
feb61e0598 Added a special file locking mechanism to the debug logging which allows testing multi-user to seperate logfiles automatically 2010-04-13 16:00:19 +00:00
Mark Vejvoda
8c438b812d Some final fixed related to combined cross platform socket code 2010-04-13 07:29:48 +00:00
Mark Vejvoda
a5aba5cc66 Bugfix for tracker#: 2985599
- Added better management of UDP broadcast thread when user toggles on/off network slots.
2010-04-12 21:40:57 +00:00
Mark Vejvoda
4e12d8dbcf Bugfix for tracker#: 2985601
- Added checking for NULL pointer as well as clients now check connection state of the server during load.
2010-04-12 20:32:47 +00:00
Mark Vejvoda
203d37bb6f Added status update for LAN server searching and guard against people who click find like mad. 2010-04-11 04:29:23 +00:00
Mark Vejvoda
af87e53bbe Bugfix for trace bug#: 2984991
falling back to english text for scenarios text. 
- Also added more error checking and commented out some excessive debug output statements.
2010-04-11 01:25:06 +00:00
Titus Tscharntke
ac6deedd93 fixed the null pointer exception related to font colors while chatting in the menu
setting version to 3.3.4-dev
2010-04-11 00:45:09 +00:00
Mark Vejvoda
63743aeedb Added more error condition checks and re-throw runtime_error in SDL event handler so we get a nice messagebox in the game 2010-04-09 07:44:23 +00:00
Mark Vejvoda
06b21ca4ee Bugfix for win32 loading jpg texture's 2010-04-09 06:51:13 +00:00
Titus Tscharntke
be9739cf29 3.3.3 2010-04-08 20:44:34 +00:00
Titus Tscharntke
f5e21ae896 ingame fontcolor change with key 'C' is back 2010-04-08 20:19:25 +00:00
Mark Vejvoda
a71f0d0e7c Bugfixes:
- Allow for load screens for networked clients
- Reworked the font loading for win32 so it will respect font names and sizes
- Disabled Alt-Enter for win32
2010-04-08 01:12:55 +00:00
Titus Tscharntke
d5a55f6a83 fonts can be scaled from options menu and more switches are in glest.ini
helvetica is used for linux
fire fix for blacksmith
persian elephant chaged a little bit for balance ( I think he is still too strong )
2010-04-07 22:20:28 +00:00
Mark Vejvoda
b16b0f00fc Bugfix for release so if the current used resolution string isn't properly detected we add it at the end.
- Updated win32 glest.ini and win32 installer script
2010-04-06 23:50:06 +00:00
Mark Vejvoda
ff65495829 Changed ver # in preparation for a new release 2010-04-06 20:44:06 +00:00
Titus Tscharntke
1f76690cf5 loading screens for the factions
its possible to define a loading screen for a techtree too.
2010-04-06 20:15:06 +00:00
Mark Vejvoda
40f5097a07 SLight change to win32 re-init when doing ctrl-enter (a small speed up) 2010-04-06 20:10:38 +00:00
Mark Vejvoda
9a2b958869 bugfix for ctrl + # grouping of units in win32 2010-04-06 14:25:00 +00:00
Mark Vejvoda
99c03d25bc Added some debug output for keypress events 2010-04-06 14:09:42 +00:00
Mark Vejvoda
d38a1f8877 Bugfix for cheating when the harvest command type has changed to a different command. Got this from Silnarm. 2010-04-06 03:28:20 +00:00
Mark Vejvoda
ec7e741ad3 Updated screen loading feature to support all supported image types 2010-04-05 21:41:33 +00:00
Mark Vejvoda
b7a5970a3c Added code to support toggling between windowed and fullscreen mode for win32 platform. 2010-04-05 20:42:05 +00:00
Titus Tscharntke
c525407904 loading screens for scenarios too 2010-04-05 20:16:49 +00:00
Mark Vejvoda
86a9bc0c84 proper cleanup of dynamically loaded texture 2010-04-05 19:48:26 +00:00
Mark Vejvoda
1fe29664c9 bug fix to properly initialize textures dynamically loaded when loading a faction. 2010-04-05 19:38:50 +00:00
Titus Tscharntke
ab1c302107 loading screen for players faction ( doesn't work at the moment ) 2010-04-05 17:43:04 +00:00
Titus Tscharntke
8681a551a1 smaller fonts for display and console 2010-04-04 16:48:42 +00:00
Mark Vejvoda
c51a4ca35f Removed call to reload textures when pressing alt-enter as it simply doesn't work in win32. 2010-04-04 04:28:23 +00:00
Mark Vejvoda
18249c02bd - Some changes to try to reload textures for win32 when doing alt-enter
- Added better logging and guards in sound and socket classes
2010-04-04 04:14:27 +00:00
Titus Tscharntke
a0c979a978 server socket number is displayed in cutom game menu ( in the connect state ) 2010-04-03 23:31:10 +00:00
Titus Tscharntke
4c9c10f460 size 16 font fix ( more a hack )
server port is displayed in join/options
ConsoleTimeout in ini raised to 20
2010-04-03 17:17:15 +00:00
Mark Vejvoda
924ec79364 Removed fogofwar code that I had in my synch check logic from, long ago as it is no longer needed due to Silnarms new feature 2010-04-03 05:50:07 +00:00
Mark Vejvoda
a0c0be4d65 Some bug fixes related to file transfer code and user folders 2010-04-03 04:30:28 +00:00
Mark Vejvoda
092f3a2bca some changes in preparation for file transfers 2010-04-03 02:22:41 +00:00
Mark Vejvoda
02d0781b40 A few changes to allow for better keyboard state detection 2010-04-02 17:37:04 +00:00
Titus Tscharntke
198d2aeb98 improved resolution change in options menu 2010-04-02 14:21:43 +00:00
Mark Vejvoda
bc725454fd Added a new menu item in join menu and added a threaded callback system for clients when searching for servers so that the UI doesn't wait for responses 2010-04-02 02:33:32 +00:00
Titus Tscharntke
c678d35bdb new glest ini, font handling changed!!!
"dynamic" fonts for linux ( maybe an error fallback should be added in gl_wrap.cpp if font is not available )
better option menu layout
2010-04-01 18:59:05 +00:00
Mark Vejvoda
76f4b87cbb ifdef for win32 only code 2010-04-01 07:53:07 +00:00
Mark Vejvoda
6c92f188b6 Ported auto-discover LAN connect to win32 2010-04-01 07:46:14 +00:00
Mark Vejvoda
0bcb710606 Added auto-discovery of LAN servers using UDP broadcast. (for now the client must press the A key from the join menu to trigger this) 2010-04-01 06:31:10 +00:00
Titus Tscharntke
5ecc84099a fonts
options menu
ingame resolution change ( game restart needed )
everything not really poolished yet!
2010-04-01 00:13:28 +00:00
Mark Vejvoda
2eae390d34 Added ServerPort to code so we actually use its value in code. Removed ServerPort from Configurator to make it more protected from common users 2010-03-31 17:30:12 +00:00
Mark Vejvoda
a74fa24001 Converted win32 project to use SDL so that more code is shared and cross platform friendly. This fixes the issue with using the mouse to scroll the camera. 2010-03-30 00:25:35 +00:00
Titus Tscharntke
52c40e0713 3.3.2-beta1 2010-03-27 22:22:33 +00:00
Mark Vejvoda
cda368b96c Added logic to NOT trigger camera mousemove if keyboard has a key pressed so you can scroll with keys and still move mouse simultaneously 2010-03-27 21:32:33 +00:00
Mark Vejvoda
02b1cb40e2 Bugfix and additional debugging of directx sound under win32 (added an explicit stop of playing the next buffer 2010-03-27 20:33:46 +00:00
Mark Vejvoda
5604473d28 added missing header 2010-03-27 18:43:38 +00:00
Mark Vejvoda
25dea73abc Added some debug tracing abilities for sound related issues. Added a little protected to the open_al sound wrapper to avoid having queued sound buffers not being cleaned up properly in some cases. (Need to test on Windows now) 2010-03-27 18:35:47 +00:00
Titus Tscharntke
42919a50f2 data is ready for rotation feature
some little hotkey changes
2010-03-27 16:08:03 +00:00
James McCulloch
a9026f8c20 * added missing #include "leak_dumper.h" to new cpp files
* fix for map names not being formatted (and replaced explicit loops to do the same to tileSet & techTree)
 * fix exploration state for fog-of-war off & multiplayer (note: also turns off for AI, diff. behaviour to before)
 * added fogOfWar to GameSettings and added to cutom game menu/menu_state_custom_game.cpp
2010-03-27 07:09:34 +00:00
Titus Tscharntke
c1ec8f97df new switch <rotationAllowed value="false" /> for buildings
new switch <relativeDirection value="false" /> for UnitParticleSystems
2010-03-27 03:09:11 +00:00
Mark Vejvoda
7d75f5cc97 bugfix for order of operations.. after rotating 360 degrees or more the enum didn't reset to 0 2010-03-27 02:22:14 +00:00
James McCulloch
9bca65faa3 * removed quick-fix for static init problem 2010-03-25 19:30:35 +00:00
James McCulloch
00dd0f490d * fix for map names (possible duplicate entries if mgm and gbm with same name) & alphabetically sorted now
* re-implemented building rotation (Note: requires particle systems that should be rotated with the building to be 'relative')
2010-03-25 12:15:10 +00:00
Mark Vejvoda
2ce421e06c - disabled mouse revert in win32 as it doesn't seem to work properly (screen freezes while dragging)
- changed the mouse cursor at startup so it always looks like the regular glest mouse (unless we get one of those new glest error message boxes)
2010-03-25 06:35:18 +00:00
James McCulloch
2d3dad5a9b Renderer::renderResourceStatus() fix, to always draw resource status icons 'lit' 2010-03-25 04:47:04 +00:00
Titus Tscharntke
bf9ebf4912 space is used to reset camera to normal game view
mouse scrollwheel behaves different in maxZoom position
2010-03-25 00:58:58 +00:00
Titus Tscharntke
147447b638 better mouse camera navigation ( missing win32 implementation ) 2010-03-25 00:19:49 +00:00
Mark Vejvoda
b22adbfa02 bugfix for scripted scenarios and placing unit model not showing 2010-03-24 21:26:17 +00:00
James McCulloch
dfc32cdba2 * quick-fix for static initialisation problem in ImageReaders
* fix error in two part NetworkMessageCommandList receive
2010-03-24 13:39:08 +00:00
Mark Vejvoda
3ecf980649 Updated camera panning so that holding middle mouse button and moving the mouse changes the camera angle. 2010-03-24 01:28:48 +00:00
Titus Tscharntke
ecc39ea911 PolitikerNEU jpg and png support! ( currently linux only ? )
Some little changes where I forgot to integrate the playername
Mousescroll is not longer super fast
2010-03-23 23:32:25 +00:00
Mark Vejvoda
270ff57512 bugfix for startup errors to properly display on both windows and linux 2010-03-23 08:56:41 +00:00
Mark Vejvoda
221b099c67 More bug fixes for error handling if we have early program launch errors. 2010-03-23 08:46:20 +00:00
Mark Vejvoda
1fbff088e4 Some bugfixing for logfile saving after testing in win32 2010-03-23 07:59:24 +00:00
Mark Vejvoda
ae10ab55b2 Added ability to automatically log debug info to a debug logfile (respecting the new read / write configurable path) 2010-03-23 06:57:41 +00:00
Mark Vejvoda
1e7cd63330 - Some improvements for setting max videomode when AutoMaxFullScreen=true and Windowed=false
- Added better logic to try to restore video when crashing
2010-03-23 06:03:16 +00:00
Mark Vejvoda
237b76e2f2 Updates to new netplayer code to default the value to the hostname and not crash if the property is missing from glest.ini. Also added new property to configurator 2010-03-23 02:37:41 +00:00
Mark Vejvoda
5b713bd785 Added camera zoom (from GAE) into mega-glest (middle mouse button zooms in and out like in GAE) 2010-03-23 02:35:55 +00:00
Titus Tscharntke
397fe3dc41 Network Playernames ( and some more changes in the options menu ) 2010-03-23 01:38:19 +00:00
Mark Vejvoda
c26e924e8c Bugfix for unit rotate (when a produced unit is built, the wrong id was used) 2010-03-22 23:10:16 +00:00
Mark Vejvoda
d713349187 Changed unit rotation logic to attach to existing ccBuild command (placing rotateAmount into the targetId field which was always unused for this commandtype). Commented out the old network code that was used to do this for now. 2010-03-22 04:47:16 +00:00
Mark Vejvoda
344c4778d1 Added the ability to tell mega-glest where to look for glest.ini, servers.ini and all of the various .log files. The new optional environment variable that mega-glest will look for is:
GLESTHOME
2010-03-21 23:40:35 +00:00
Mark Vejvoda
9756217445 Added full support to have maps, tilesets and techs in a scenario or tutorial folder. 2010-03-21 05:33:13 +00:00
Titus Tscharntke
d4202298fd - when you swittch off the ai in a scenario the faction does not consume consumable ressources anymore ( food ..)
- gui bugfix commands are no more canceled when any unit dies
2010-03-20 15:02:52 +00:00
Mark Vejvoda
64513cdf90 bugfix for scenario folder not finding language file 2010-03-20 12:11:46 +00:00
Mark Vejvoda
edd3af5243 Bugfixes so that win32 code will work with latest user data changes 2010-03-20 11:16:07 +00:00
Mark Vejvoda
a9d644eba0 Bugfixes so that win32 code will compile with latest user data changes 2010-03-20 10:52:55 +00:00
Mark Vejvoda
1f2c805fe8 Added new setting to allow playing glest using multiple monitors 2010-03-20 07:19:45 +00:00
Mark Vejvoda
4e9d348fbd Changed user data code to be one path where the data tree folder structure can be found 2010-03-20 00:46:16 +00:00
Mark Vejvoda
965a7ac2ba Updated debug logic to use a debug class to better control debug logging and centralize the control of it. 2010-03-19 23:26:00 +00:00
Titus Tscharntke
c5809e50b5 editor/g3dviewr startscripts which handle parameters / version number 2010-03-19 22:15:14 +00:00
Titus Tscharntke
c4a9f61842 Bugfix for lua. Units died by hunger are reported in luas <unitDied>-section too
Also fixed the stats by counting this kind of death too.
2010-03-19 18:58:46 +00:00
Titus Tscharntke
37c45275e4 about menu layout fixed 2010-03-19 01:18:05 +00:00
Titus Tscharntke
4b5d3fc94a end battle layout fixed. numbers are readable now. 2010-03-19 00:41:09 +00:00
Mark Vejvoda
f838293632 Added code for the following:
a) Complete Unit Rotation for multi-player
b) Added support for user defined data folders
2010-03-18 21:26:40 +00:00
Mark Vejvoda
abf7e57377 Attempt for bugfix to resume from msgbox 2010-03-17 20:57:19 +00:00
Mark Vejvoda
569a71e929 Changed version # for 3.3.1 release 2010-03-17 20:45:46 +00:00
Mark Vejvoda
10449faf39 Attempt for bugfix to resume from msgbox 2010-03-17 20:40:06 +00:00
Mark Vejvoda
1f78d09b80 SDL Bugfix to work with Windows and Linux 2010-03-17 19:10:18 +00:00
Mark Vejvoda
ae632f4d7a Attempt for bugfix to resume from msgbox 2010-03-17 18:04:44 +00:00
Mark Vejvoda
eddd0cd19b Attempt for bugfix to resume from msgbox 2010-03-17 17:24:12 +00:00
Mark Vejvoda
399c463f9d SDL Bugfix to work with Windows and Linux 2010-03-17 16:40:49 +00:00
Mark Vejvoda
f0133ba260 Added a more user friendly messagebox when network errors are encountered. Added fix for Fullscreen OpenGL Mode 2010-03-17 16:27:17 +00:00
Titus Tscharntke
7468e314d1 Chat line is visible in custom game menu.
Network consistency always checks and gives better messages.
2010-03-17 13:22:08 +00:00
Mark Vejvoda
30d2d87e6f Added a more user friendly messagebox when network errors are encountered. 2010-03-17 07:30:56 +00:00
Mark Vejvoda
cde1f285d0 Added a more user friendly messagebox when network errors are encountered. 2010-03-17 07:22:04 +00:00
Mark Vejvoda
89d3c66471 Added a more user friendly messagebox when network errors are encountered. 2010-03-17 06:25:19 +00:00
Mark Vejvoda
c925665d31 Bugfix for multiplayer binary and data checksum checking. 2010-03-16 21:44:22 +00:00
Mark Vejvoda
b9172acc5c Bugfix for multiplayer binary and data checksum checking. 2010-03-16 21:37:11 +00:00
Mark Vejvoda
e4bd0a9ce6 Updated build # to 3.3.0 2010-03-14 00:49:19 +00:00
Mark Vejvoda
ff60b09158 Cleaned up all compiler warnings 2010-03-13 22:00:01 +00:00
Mark Vejvoda
2012b7e22c Made changes to properly isolate new unit rotation code so that it is disabled by default 2010-03-13 21:10:45 +00:00
Mark Vejvoda
e9847750c1 Disabled in progress code related to unit rotation feature (will re-enabled after current release) 2010-03-12 07:42:55 +00:00
Mark Vejvoda
43c3f2457e Code Restructuring to make mega-glest more standard 2010-03-12 05:20:53 +00:00
Mark Vejvoda
7cb4f99ec4 Code Restructuring to make mega-glest more standard 2010-03-12 05:11:28 +00:00
Mark Vejvoda
4ecc284f75 Updated win32 solution and also made mgm files optional (not required) so that mega-glest will work with or without the new 8 player maps 2010-03-09 00:43:46 +00:00
James McCulloch
06012e4804 * looks for 'gbm' (1-4 player) maps & 'mgm' (5-8 player) maps 2010-03-04 13:42:27 +00:00
Titus Tscharntke
b6b54f1001 damage particlesystem / new glest.ini / ingame option to switch of particles 2010-03-01 00:30:51 +00:00
Titus Tscharntke
bb637920fa 8 player fix for existing scenarios. Closed slots don't have to be set any more. 2010-02-28 13:16:03 +00:00
Titus Tscharntke
ee8805ca3f switched version to v3.2.4-1-beta4 2010-02-28 11:25:38 +00:00
Titus Tscharntke
5cb8aca19c 8 players 2010-02-28 11:21:01 +00:00
Titus Tscharntke
59faabfe14 bugfix/improvement for teamcolor particles ** units can morph to flying units ** tech faction with particles 2010-02-27 00:34:03 +00:00
Titus Tscharntke
3b02f9c9b7 fix for damage-all value="false" bug ( direct hit still hurt an ally unit, but splash doesn't ) 2010-02-24 23:25:32 +00:00
Titus Tscharntke
15783511fd black particles 2010-02-22 22:51:46 +00:00
Titus Tscharntke
f80359fdca proper particle cleanup in unit destructor; campfire is using new particles now 2010-02-21 23:30:12 +00:00
Titus Tscharntke
daa9c94129 multiple particle systems for every skill 2010-02-21 13:56:17 +00:00
Mark Vejvoda
7657b40a4b - Additional bug fixes related to network connection code for win32
- print out socket errors to console instead of throw exceptions
2010-02-21 03:48:05 +00:00
Titus Tscharntke
c4d32651c6 removed old debug printfs in comments
fixed relative switch for unit particles
fixed gravity for unit particles
2010-02-16 23:55:45 +00:00
Titus Tscharntke
e4b3c3117e forgot 2 files for the particles 2010-02-16 01:15:38 +00:00
Titus Tscharntke
0550d06faf particles for te skills 2010-02-16 01:12:48 +00:00
Mark Vejvoda
012644273e Bugfixes:
- final network fixes for mega-glest multiplayer performance improvements
- added ability for windows builds to "ignore" hidden files so that glest wont try to read svn files
- bugfix for loading the map editor
2010-02-15 17:07:21 +00:00
Mark Vejvoda
fb5035c230 Updated with initial 3.4.4 codebase includes:
- network fixes for multiplayer defects found
- initial code (disabled currently) for content crc checking and downloading
- code compiles on Win32 using VS2008 express, project files not yet included
2010-02-03 01:09:50 +00:00
Titus Tscharntke
fb93fb1b14 megaglest 3.2.3 2010-01-23 18:34:40 +00:00
Titus Tscharntke
0ce9b5fcac initial version ( megaglest 3.2.3-beta3 ) 2010-01-22 01:45:58 +00:00