Commit Graph

2610 Commits

Author SHA1 Message Date
Mark Vejvoda
8d5de12d42 - added some particles to load game logic 2012-03-14 07:23:41 +00:00
Mark Vejvoda
3b964ebbd2 - fixed xerces crash with version 3 and higher 2012-03-14 00:33:23 +00:00
Mark Vejvoda
63dbea6af7 - added new commandline option to show which version of xerces is compiled with binary 2012-03-14 00:21:59 +00:00
Mark Vejvoda
4481151c5b - check if unit is dead when loading game and do NOT set cell map for dead unit 2012-03-13 23:51:39 +00:00
Mark Vejvoda
d4ca1c36cb - fixed some particle issues 2012-03-13 23:18:09 +00:00
Mark Vejvoda
0ea22572dd - fix ally list when loading games 2012-03-13 23:10:48 +00:00
Mark Vejvoda
aa93999dce - fixed map placement when loading untis from file 2012-03-13 22:55:11 +00:00
Mark Vejvoda
d1a0eeca2e - check for null for particles 2012-03-13 22:37:47 +00:00
Mark Vejvoda
3926a34ef4 - missed another bad index 2012-03-13 22:28:36 +00:00
Mark Vejvoda
a67a3776af - fixed conflicting loop index variable names in map 2012-03-13 22:27:34 +00:00
Mark Vejvoda
9a1b4cf680 - small fix for map state 2012-03-13 22:23:42 +00:00
Mark Vejvoda
917adc8c98 - bugfix for game save and load (string buffer was too small for one item) 2012-03-13 21:58:31 +00:00
Titus Tscharntke
38bd33acf9 Gamma Correction in inGame options with direct feedback. 2012-03-13 18:59:33 +00:00
Mark Vejvoda
5f95b08c17 - a ton more load game state now working (including commands) 2012-03-13 15:21:25 +00:00
Mark Vejvoda
e3fde99359 - fixed gamma correction so it works now
- added more state when loading saved game
2012-03-13 01:34:14 +00:00
Titus Tscharntke
edd7f732ea alpha correction in options menu ( checkin with error included , which needs to be fixed! ) 2012-03-13 00:44:55 +00:00
Mark Vejvoda
485b74af8b - load game restore more game state 2012-03-13 00:00:10 +00:00
Mark Vejvoda
82cd1d3e9c - restore timeflow and gamecamera on load game 2012-03-12 23:40:54 +00:00
Mark Vejvoda
9271d7d7f6 - initial loading logic for loading of saved games.
- currently we always save the game during out of synch or on game quit.
- added a new commandline option to load the last saved game, this doesn't do much yet, just creates units in the map locations they were when the game was saved
./megaglest --load-saved-game
2012-03-12 23:08:22 +00:00
Mark Vejvoda
6e857b3af2 - more techtree validation fixes 2012-03-10 17:46:10 +00:00
Tom Reynolds
519384c4b9 correct references in convert_faction_xml2html's side-by-side faction viewer 2012-03-10 15:07:37 +00:00
Mark Vejvoda
90698f65dd - segfault bugfix for techtree validation 2012-03-10 06:44:57 +00:00
Mark Vejvoda
c5331b7e8a - initial work to save game state to XML. Current only saves when out of synch or game end occurs and saves to same folder as log files and file is called: megaglest-saved.xml
(Currently we store way too much info but this is a starting point)
2012-03-10 03:27:25 +00:00
Mark Vejvoda
623623d33f - bugfix for segfault in menu when exiting too fast 2012-03-05 22:53:03 +00:00
Mark Vejvoda
7399d10247 - attempt to get better stack trace if simple thread dies in destructor 2012-03-04 07:04:36 +00:00
Mark Vejvoda
246f4b326f - attempt to see if threaded client network receive improves performance (ThreadedNetworkClient=true to enable on a client) 2012-03-03 23:59:44 +00:00
Mark Vejvoda
04e16819aa - fix segfault when converting models
- fix segfault when mod menu cannot connect to masterserver
2012-03-03 18:40:18 +00:00
Mark Vejvoda
a6af5b96af - when RainEffect=false then ALSO disable rain in the main menu 2012-03-03 08:52:52 +00:00
Mark Vejvoda
94f3665285 - added nick sound when user mentions another players name in chat (in game lobby and in game) 2012-03-03 08:45:20 +00:00
Mark Vejvoda
7fe7800ac2 - added better error handling and increased delay + retries when publishing a game to masterserver (in case upnp is slow) 2012-03-03 08:28:15 +00:00
Mark Vejvoda
8b7e2a7b9e - when searching for hud, loop until we find a file 2012-03-03 07:48:05 +00:00
Mark Vejvoda
060d1f453d - change the crc cache file names to avoid excessively long filenames and to see if this improves performance and fixes buggy behaviour. 2012-03-03 04:55:00 +00:00
Mark Vejvoda
3eba87727c - bugfixes for headless mode, map selection logic was broken for admin user
- during in game, if admin user disconnects, server re-assigns a new admin user so paused game can be unpaused by a new administrator
2012-03-03 04:33:39 +00:00
Mark Vejvoda
909b680836 - a little cleanup of request parameters 2012-02-25 08:46:48 +00:00
Mark Vejvoda
c3e40ca1e5 - updated to include desktop files for map editor and g3d viewer and added to make install in cmake build system 2012-02-25 04:11:07 +00:00
Mark Vejvoda
9d6607a051 - added new lua method so users can create units without spacing rules:
createUnitNoSpacing
2012-02-21 21:56:20 +00:00
Titus Tscharntke
2b50070249 you can init a GraphicMessageBox without a button now. 2012-02-19 17:49:33 +00:00
Titus Tscharntke
9870c13a6b GraphicMessageBox can handle multiple buttons now 2012-02-19 17:37:53 +00:00
Titus Tscharntke
9dd8dd4098 Display of the boost effect in the GUI. ( shown in the command description ) 2012-02-19 02:40:13 +00:00
Mark Vejvoda
cf1c7c1ca2 - tighten up socket error checking during peek for data on connection check 2012-02-11 22:52:52 +00:00
Mark Vejvoda
4ed3050f84 - fixed soft float support so megaglest might now work with other architectures at least in terms of streflop support 2012-02-11 15:20:40 +00:00
Mark Vejvoda
2fbebb4721 - some cleanup of CRC calculation for better cache use 2012-02-10 16:53:56 +00:00
Mark Vejvoda
4ad42518c0 - updated for better handling of streflop on different platforms
- attempt for bugfix on windows when socket send buffer is continuously full
2012-02-10 06:21:06 +00:00
Mark Vejvoda
b6473b69ab - added ability to turn off some screen selection items for better recording ability. Set RecordMode=true in glestuser.ini to disable some selection effects for recording a video and not seeing selection circles etc. 2012-02-03 06:16:50 +00:00
Tom Reynolds
17856ced2f increase delay before gameserver availability check kicks in (due to client side UPnP configuration delay) 2012-02-02 20:41:00 +00:00
Titus Tscharntke
4b2703a771 I forgot to comment out a printf 2012-01-28 14:41:46 +00:00
Mark Vejvoda
12d1885c65 - ported bugfixes to trunk from 3.6.0.3 2012-01-24 21:28:05 +00:00
Mark Vejvoda
ebe45d253a - bugfix for custom data path 2012-01-24 16:14:49 +00:00
Mark Vejvoda
ff4c327261 - bugfix for custom data path macro usage to avoid compiler errors 2012-01-24 07:39:16 +00:00
Mark Vejvoda
84f06d3cbd - bugfix to compile with libircclient 1.6 and beyond 2012-01-23 20:36:15 +00:00
Mark Vejvoda
f40c37f5e8 - ported bugfixes for 3.6.0.3 release:
- CMake build system fixes applied during debian testing (like checking for compiler SSE support etc)
 - Windows client fix for headless server operation
 - Crash for some systems when trying to use VBO's
 - Fixed AZERTY keyboard support
 - Enhanced support for screenshots in g3d viewer
 - Updated particle code from titi
 - Bugfix for custom data path override causing compiler error
 - Bugfix for fontconfig to properly find fonts on systems that support and have fontconfig installed (fixes numerous non debian based systems that reported null font errors)
 - Minor UI fix on battle end screen when playing 8 players (last player was sometimes chopped off)
2012-01-23 07:22:43 +00:00
Mark Vejvoda
fbf7610420 - port changes from 3.6.0.3 to trunk for windows hosting patch 2012-01-20 04:15:13 +00:00
Titus Tscharntke
eaa8a56cb2 better sort order again ... 2012-01-18 23:10:14 +00:00
Titus Tscharntke
83c8efae51 sort order for select statement changed ( ip instead of lastchanged) 2012-01-18 22:57:00 +00:00
Mark Vejvoda
7438ec4669 - bugfix for windows users to be able to host games 2012-01-17 06:02:54 +00:00
Titus Tscharntke
9f703f2303 faction links, modders can include factions from other techtrees if techtree.xmls are compatible.
( Still problems with CRC-calculation and download in Multiplayer for those linked factions )
2012-01-17 01:34:50 +00:00
Mark Vejvoda
3049c5e376 - attempt to fix using grouping hotkeys for AZERTY keyboards (so user can press shift + #) 2012-01-09 21:08:19 +00:00
Mark Vejvoda
174e419314 - fixed keyboard bug where - was thought to be numeric 2012-01-09 15:52:15 +00:00
Titus Tscharntke
15537e059a missing initialisation of "emissionRateFade" made damage smoke particles from objects disappear or much too strong 2012-01-07 23:53:08 +00:00
Titus Tscharntke
e05984d527 - daylight effects for unit particles ( best use with mode "black" )
- meadow has good looking mist in night now
- startdelay for particles
2012-01-07 20:24:54 +00:00
Mark Vejvoda
1f60d2606a - bugfix for icon size in windows header (shows proper size now) 2012-01-07 20:02:40 +00:00
Mark Vejvoda
61b51eb9ed - finally a fix for upside down icon (uses png file) 2012-01-06 23:34:49 +00:00
Mark Vejvoda
4c0e39848a - attempt to see if this solves the dumb icon issue 2012-01-06 23:26:23 +00:00
Mark Vejvoda
89f06a76be - set the color key for the icon 2012-01-06 23:04:59 +00:00
Mark Vejvoda
093b1efb2c - added a few more socket guards around invalid socket value 2012-01-06 21:21:52 +00:00
Mark Vejvoda
88ad6d3723 - added a guard on the socket so we only shutdown if not already done so by possibly another thread. 2012-01-06 21:18:36 +00:00
Mark Vejvoda
d8092d25f6 - best i can do for now, screnshots can be sized, but size cannot exceed max viewable on screen resolution 2012-01-06 21:02:23 +00:00
Mark Vejvoda
1622b9b046 - changed g3d screenshot resizing to render at desired screensize instead of scaling image. 2012-01-06 19:34:47 +00:00
Mark Vejvoda
d449517872 - added ability to specify scaled image size of screenshots in g3d viewer example:
./megaglest_g3dviewer --load-unit=techs/megapack/factions/romans/units/catapult,attack_skill --auto-screenshot=resize-1024x768
2012-01-06 18:49:33 +00:00
Mark Vejvoda
8e4ed05159 - bugfixes to g3dviewer when loading a unit with particles from commandline (fixes recursive call crash), and added verbose commandline switch for g3dviewer 2012-01-06 18:04:01 +00:00
Mark Vejvoda
0427cea646 - only init sdl keyboard items in interactive game mode 2012-01-06 07:15:04 +00:00
Mark Vejvoda
50f1fa65ca - bugfix on battle screen when 8 players playing, last player is sometimes chopped off
- masterserver mode bugfix for map filter
- masterserver now outputs in-game stats to console every 10 minutes (can be adjusted via ini setting: GameStatsDumpIntervalSeconds=x where x is update interval in seconds
2012-01-06 06:55:27 +00:00
Mark Vejvoda
33674256a3 - fix for windows compile with new fontconfig changes 2012-01-05 23:29:34 +00:00
Mark Vejvoda
fe72cb629b - updated to properly use fontconfig for finding fonts 2012-01-05 22:35:05 +00:00
Mark Vejvoda
ced374410c - added GAE compatible stubs for a few new lua methods 2012-01-05 20:01:22 +00:00
Mark Vejvoda
58f6ceb801 - fixed placement of map filter controls 2012-01-05 02:03:54 +00:00
Mark Vejvoda
e351def1cb - added new lua function to display playername:
getPlayerName(i)
2012-01-05 00:45:17 +00:00
Mark Vejvoda
6f924b310d - added new lua method to get system macro values:
dofile(getSystemMacroValue("$SCENARIO_PATH") .. "unit.ai.class.lua")
2012-01-05 00:04:55 +00:00
Mark Vejvoda
2e6fcb2d4a - comment out lua console debugging 2012-01-04 23:21:06 +00:00
Mark Vejvoda
7b69d3040f - bugfix on windows for autoscreenshots in g3d viewer 2012-01-04 21:43:34 +00:00
Mark Vejvoda
43c9d44bd6 - updated g3dviewer to output file found status on unit autoload 2012-01-04 19:59:12 +00:00
Mark Vejvoda
a1a0b9e79c - bugfix for not finding hud for scenarios with embedded techtree 2012-01-04 04:10:11 +00:00
Mark Vejvoda
a20b848646 - discovered a possible bug that may have caused people with valid VBO support to crash, this fix may resolve that issue. 2011-12-30 06:24:59 +00:00
Mark Vejvoda
ec2f889a76 - scenario pause command should work in network mode 2011-12-28 07:26:16 +00:00
Mark Vejvoda
61bebd6b86 - numerous fixed for network scenario handling 2011-12-28 04:46:36 +00:00
Mark Vejvoda
e45d42cd6f - bugfixes for network scenarios to enable / disable certain controls 2011-12-26 22:51:48 +00:00
Mark Vejvoda
ca03fab5aa - bugfixes for network scenarios to use proper fog of war settings from scenario (also victory conditions etc) 2011-12-26 07:11:52 +00:00
Mark Vejvoda
0338841689 - initial code to try out network based scenarios (not yet implemented for masterserver) 2011-12-26 06:29:14 +00:00
Mark Vejvoda
dfa8f4a7e2 - bugfix for handling of custom data path (Should not require strange escaping sequence) 2011-12-25 16:22:01 +00:00
Mark Vejvoda
835c886705 - few tweaks to get things compiling under mingw 2011-12-25 03:09:39 +00:00
Mark Vejvoda
2e94c32d59 - added ability to check if compiler supports SSE and if not fallback to X87 for streflop.
- added ability for clients to specify gamma override value for drivers which support it
2011-12-23 08:20:54 +00:00
Mark Vejvoda
496b847999 - bugfixes to build on debians multi-platform build system 2011-12-23 04:38:42 +00:00
Mark Vejvoda
2224d75d10 - updated copyright headers to the same as the rest of the main mg source for files i wrote. 2011-12-20 07:39:07 +00:00
Mark Vejvoda
eb1408550d - more debian related changes for better manpages 2011-12-20 07:00:23 +00:00
Mark Vejvoda
2298cc99a7 - more debian related changes for better manpages 2011-12-20 06:31:38 +00:00
Mark Vejvoda
cd046783c8 - updated man2help options 2011-12-20 06:09:33 +00:00
Mark Vejvoda
ea741cb0bb - updated man2help options 2011-12-20 05:51:10 +00:00
Mark Vejvoda
1fb7f74466 - server updates waiting message more frequently now on game loading 2011-12-20 02:36:04 +00:00
Mark Vejvoda
50021e7789 - cleanup of some manpage output (try to keep max width of 80 characters) 2011-12-19 23:29:33 +00:00
Mark Vejvoda
63032223ea - removed useless file 2011-12-19 20:21:21 +00:00
Mark Vejvoda
24bd9e921e - removed useless file 2011-12-19 20:09:20 +00:00
Mark Vejvoda
dbd1e03f12 - updated copyright for md5 source code from David Henry (with his permission). Info pasted into docs/COPYRIGHT.source_code.txt 2011-12-18 15:18:46 +00:00
Mark Vejvoda
ff52484af8 - moved file as requested by pabs 2011-12-17 23:15:25 +00:00
Mark Vejvoda
4548c6ebb8 - updated scripts to make release easier.
- incremented version to 3.6.0.2
2011-12-16 09:04:26 +00:00
Mark Vejvoda
ebba25b06f - updated so streflop can be totally ignored when that cmake switch is off 2011-12-16 06:24:21 +00:00
Mark Vejvoda
6a6b58fa20 - turn off building freetype-gl unless enabled in cmake flags 2011-12-16 05:30:46 +00:00
Mark Vejvoda
138d5b1295 - added blender scripts for blender 2.5x and 2.6x for g3d import / export 2011-12-16 01:21:52 +00:00
Mark Vejvoda
bb16ed2a65 - debian related changes 2011-12-15 11:16:14 +00:00
Mark Vejvoda
c11266d529 - fix custom player colors for mods 2011-12-14 23:01:13 +00:00
Mark Vejvoda
157c052a82 - allow mod's to change player colors 2011-12-14 22:42:38 +00:00
Titus Tscharntke
3e7b8a5aa8 Little fix to get rid of annoying black squares on left and right screen border when moving camera. It fixes some missing(black) parts of hills too ( not all of them but the obvious ones ). 2011-12-14 22:38:02 +00:00
Mark Vejvoda
92088ef1f6 - more bugfixes for properly install of manpages on debian 2011-12-14 16:57:56 +00:00
Mark Vejvoda
eca4f1934f - updated cmake builds scripts to not fail if help2man is not installed 2011-12-14 09:39:03 +00:00
Mark Vejvoda
17ce117c18 - bugfix for manpage location during install on debian 2011-12-14 08:33:10 +00:00
Mark Vejvoda
19d564dcd1 - fixes for build scripts to use common manpage variable name 2011-12-14 07:50:53 +00:00
Mark Vejvoda
9852325da6 - fixed Martiño Figueroa's name in all copyrights in source code
- added copyrights to files that were missing it
2011-12-14 07:40:48 +00:00
Mark Vejvoda
62a7186216 - updated build files to auto generate manpages for debian
- fixed spelling mistakes and broken links
2011-12-14 06:27:35 +00:00
Mark Vejvoda
ddca84a8b4 - default to regular selection buffer selection, but make optional support for color picking or frustum picking in case some players need it. 2011-12-14 02:25:14 +00:00
Mark Vejvoda
d64bf0a4c9 - disable color picking by default, and add error codes for selection buffer 2011-12-14 01:15:27 +00:00
Mark Vejvoda
2fd89f11d5 - performance improve for color picking using pbo 2011-12-13 22:50:14 +00:00
Mark Vejvoda
724d274367 - fixed pixel buffer logic on windows (wacky vc++ 2008 doesn't properly allocate memory on vector.reserve(); 2011-12-13 22:21:21 +00:00
Titus Tscharntke
dc4ba27048 no more long distance unit rendereing 2011-12-13 20:29:32 +00:00
Mark Vejvoda
c4dc1e616b - added support for pixel buffers and use it for color picking (eventually for screenshots) 2011-12-13 19:52:17 +00:00
Mark Vejvoda
2dd2afb296 - changed selection code to use color picking, can disable using new ini setting:
EnableColorPicking=false
2011-12-13 01:30:52 +00:00
Mark Vejvoda
b6d7d1234c - incremented version to 3.6.1-dev
- a few changes to opengl version checking (now uses glew)
2011-12-06 01:34:51 +00:00
Mark Vejvoda
dc6cd9281f - centralized finding map files and validation of map files. a New report at game start shows a list of invalid maps which will be ignored
- headless server now shows GUI messages in console
- made 'blocked player' button font smaller
2011-12-05 05:26:48 +00:00
Mark Vejvoda
a0888b8292 - add more info on corrupt map 2011-12-05 00:13:30 +00:00
Mark Vejvoda
049b2952f2 - bugfix for invalid language setting in userini
- added debug info to track down tomreyn's issue
2011-12-05 00:02:32 +00:00
Mark Vejvoda
dee5b11518 - updated version to 3.6.0 in prep for release 2011-12-03 17:44:54 +00:00
Mark Vejvoda
860808a3bb - fixed UI to fit most language text comfortably 2011-12-03 10:02:33 +00:00
Mark Vejvoda
1efb0b2b9a - bugfix for battle end screen font placement 2011-12-03 09:20:13 +00:00
Mark Vejvoda
4cfca0846c - fixed font overlapping on master server menu 2011-12-03 09:08:50 +00:00
Mark Vejvoda
4955090cb5 - commented out old debug output 2011-12-03 08:54:18 +00:00
Mark Vejvoda
8d89718a76 - fixed font overlapping on battle end screen 2011-12-03 08:43:48 +00:00
Mark Vejvoda
6c945a4aa6 - admin connected to a headless server can now restore auto saved game settings 2011-12-03 08:17:49 +00:00
Mark Vejvoda
8a5d4463a6 - fixed bug in sdl where it doesn't always give the correct key modifiers.
- can now press alt-enter on intro screen
2011-12-03 04:58:36 +00:00
Mark Vejvoda
46d68b8d50 -updated so all languages can take default values from the default language 2011-12-03 03:35:36 +00:00
Mark Vejvoda
7b8c8195b0 - fix map preview so it doesn't flicker 2011-12-03 02:23:06 +00:00
Mark Vejvoda
609bc528d2 - fixed fog of war bug in map preview for connected client
- in headless mode keep three caches in case its related to out of synch
- comment out spurious irc console text
2011-12-03 01:19:54 +00:00
Mark Vejvoda
01ea0787a3 - a few more updates to cut down on RAM use for headless server 2011-12-03 00:39:03 +00:00
Mark Vejvoda
3f69da1f62 - do NOT output missing language text messages in headless mode 2011-12-02 22:24:47 +00:00
Mark Vejvoda
8bdf863636 - cleanup of masterserver global flag
- attempt to cut down on resources required for masterserver mode to minimize RAM
2011-12-02 22:04:02 +00:00
Mark Vejvoda
8ed9498c4e - fixed win32 build 2011-12-02 18:05:54 +00:00
Mark Vejvoda
14d400ce04 - fixed win32 build 2011-12-02 17:57:07 +00:00
Mark Vejvoda
66f44ff7c4 - more cleanup from cppcheck (using eclipse plugin now) 2011-12-02 17:46:02 +00:00
Mark Vejvoda
f6dafcde3c - added stats on console for headless server when game exits 2011-12-02 17:27:13 +00:00
Mark Vejvoda
d33e1174a5 - bugfixes related to cppcheck report
- bugfixes found using valgrind (memory leaks)
2011-12-02 16:07:59 +00:00
Tom Reynolds
953435d549 * fix typo 2011-12-02 01:41:48 +00:00
Mark Vejvoda
27c4b2f629 - added more debug info for headless server conole results 2011-12-01 19:45:46 +00:00
Mark Vejvoda
d8f4c69a01 - ensure locale is properly set when converting numbers 2011-12-01 18:49:30 +00:00