Commit Graph

1175 Commits

Author SHA1 Message Date
Mark Vejvoda
0d38e2eb5d - added support for main menu background video 2012-05-19 08:40:49 +00:00
Mark Vejvoda
3187252936 - fixed libvlc on windows (timing problem when loading videos)
- commented out retarded environment variable code since we just ship the plugins folder now
2012-05-19 02:47:53 +00:00
Mark Vejvoda
9fdde8c5f3 - when intro video stops playing continue to main menu 2012-05-18 19:53:01 +00:00
Mark Vejvoda
66af241154 - few updates to video player 2012-05-17 21:52:00 +00:00
Mark Vejvoda
895428a954 - fixed vc++ 2008 project file so it builds again (vc++ 2008 missing a C99 header file, requires re-download of win32 deps) 2012-05-16 22:14:50 +00:00
Mark Vejvoda
dec1922060 - disable libvlc for ancient nix platforms (min version required 1.1) 2012-05-16 21:48:51 +00:00
Mark Vejvoda
040872748d - bugfix for loading videos 2012-05-16 15:38:35 +00:00
Mark Vejvoda
b7cf90a09e - attempt to get static linking working for libvlc 2012-05-16 05:46:04 +00:00
Mark Vejvoda
32b4925f31 - attempt for better support for older versions of libvlc 2012-05-14 21:09:44 +00:00
Mark Vejvoda
5d5224b4a2 - attempt to allow support for older vlc 2012-05-14 15:57:50 +00:00
Mark Vejvoda
0a55a9b33d - commented out some useless code because of how bad windows handles environment vars 2012-05-14 07:38:21 +00:00
Mark Vejvoda
093d22ce8b - oh how I despise windows, another evil hack to get proper detection of vlc plugins 2012-05-14 03:36:43 +00:00
Mark Vejvoda
e3c2719458 - fixed build on windows 2012-05-12 23:59:40 +00:00
Mark Vejvoda
69c1de284c - plugin fix on windows 2012-05-12 23:47:16 +00:00
Mark Vejvoda
ec2a708603 - plugin fix on windows 2012-05-12 23:23:24 +00:00
Mark Vejvoda
7d8aee2f78 - fix the check for libvlc and better support for windows users 2012-05-12 23:05:34 +00:00
Mark Vejvoda
af508a1a59 - added new ini setting to explicitly set the vlc plugins folder:
VideoPlayerPluginsPath=c:\program files\videolan\plugins
2012-05-12 22:48:29 +00:00
Mark Vejvoda
ede0a63def - require libvlc version minimum 2.0.1 2012-05-12 22:36:44 +00:00
Mark Vejvoda
46395d1322 - added support for windows build for libvlc to play videos (requires updated deps) 2012-05-12 22:21:15 +00:00
Mark Vejvoda
7b3de2d109 - added support for intro videos using libvlc (if libvlc is installed for the developer, its optional) 2012-05-12 20:33:18 +00:00
Mark Vejvoda
e38c9b5db0 - small changes to checksum file loading 2012-05-12 02:08:08 +00:00
Mark Vejvoda
f79222defa - more pathfinder in progress changes, nothing to test yet 2012-05-05 04:38:49 +00:00
Mark Vejvoda
3ff0796bec - some in progress pathfinder work 2012-05-04 21:03:52 +00:00
Mark Vejvoda
2267011cbc - try to optimize debug flag checking 2012-05-03 01:25:34 +00:00
Mark Vejvoda
897346d1f5 - added the beginning work to support translatable techtrees 2012-05-02 20:46:47 +00:00
Mark Vejvoda
5c0db25c86 - added a few new lua methods to register cell 'areas' for unit or for factions for wciwow 2012-05-02 06:07:11 +00:00
Mark Vejvoda
35e9577d77 - does this fix the build on Arch Linux? 2012-05-01 20:22:18 +00:00
Mark Vejvoda
8d1300d9a1 - does this fix the build on Arch Linux? 2012-05-01 20:11:32 +00:00
Mark Vejvoda
20ffdbcf2d - fixed on windows platform 2012-05-01 15:21:09 +00:00
Mark Vejvoda
a70b1a9881 - patch to compile on gcc 4.7 2012-05-01 14:55:06 +00:00
Mark Vejvoda
1352f42854 - added support for checking if LuaJit library is installed and use that instead of normal Lua for increased lua performance (Currently only implemented in gcc builds) 2012-04-26 16:17:12 +00:00
Mark Vejvoda
2a1ee15a54 - applied patch for lua 5.2 2012-04-26 00:46:49 +00:00
Mark Vejvoda
e5d1cada0e - fixed cmake build to work again with mingw 2012-04-24 03:52:06 +00:00
Mark Vejvoda
81890b0077 - fixed build on linux 2012-04-20 02:11:15 +00:00
Mark Vejvoda
dbb116f250 - load of changes to get things compiling under VC++ 2010 (with updated deps seperate for vc2010) 2012-04-20 01:04:05 +00:00
Mark Vejvoda
329bb58b04 - a few code cleanup items while doing some testing in VC++ 2010 2012-04-17 19:42:53 +00:00
Mark Vejvoda
8488b9c2b4 - speed up leak checker
- fix a few bugs that were discovered
2012-04-17 07:12:07 +00:00
Mark Vejvoda
c8fdc9269f - fix win32 build
- cleanup a lot of win32 compiler warnings
2012-04-16 20:15:57 +00:00
Mark Vejvoda
3b8dd289ac - updated cmake to check for support of backtraces in gcc compiler
- fixed numerous bugs / warnings from cppcheck
2012-04-16 19:29:37 +00:00
Mark Vejvoda
ae91368a99 - memory leak checker fixed a few issues 2012-04-16 16:57:10 +00:00
Mark Vejvoda
1403a3fe44 - fixed a memory leak and fixed a segfault in a thread class 2012-04-16 15:46:22 +00:00
Mark Vejvoda
a37dc8a7b3 - fix headless server crash due to new call to setgama in headless mode
- a few code optimizations to start to improve performance
2012-04-16 06:14:10 +00:00
Titus Tscharntke
fe59fe8703 Bugfix: particles are also colored with daylight effect if they are created. ( if isDaylightAffected is set ) 2012-04-15 22:38:41 +00:00
Mark Vejvoda
5cfb7e85d5 - Added stack traces to win32 build when we detect an error 2012-04-14 22:48:49 +00:00
Mark Vejvoda
8c0bf75bf5 - got built in memory leak working. Just edit leak_dumper.h and uncomment:
//#define SL_LEAK_DUMP
- got better / more accurate stack dumps when we detect errors in game.
- Both of these need to be worked on in windows next, win32 may not compile for now until i fix it on that platform.
- BE VERY CAREFUL when working in leak_dumper.* it may cause GCC and your system to crash if you don't know what you are doing!
2012-04-14 21:21:09 +00:00
Mark Vejvoda
9aca26a0f0 - bugfix for unit selection segfault on game exit
- added thread hardening to try to ensure we never try to delete a thread more than once.
2012-04-12 20:43:19 +00:00
Mark Vejvoda
cd5bce3b91 - removed configurator from cmake file
- applied libircclient patch from forums 'the Chakra project'
2012-04-11 18:58:38 +00:00
Mark Vejvoda
83d2474ded - bugfix animated particle model logic 2012-04-04 23:43:31 +00:00
Mark Vejvoda
c1f617481e - bug fixes for load saved game (now fixes loading on windows) and corrects memory bug for loading saved games on all platforms. 2012-04-04 15:36:09 +00:00
Mark Vejvoda
6e66963664 - added validate-tileset 2012-04-03 19:35:22 +00:00
Mark Vejvoda
5b5d753341 - bugfixes for save / load game bugs reported 2012-04-02 15:02:44 +00:00
Mark Vejvoda
f80e440713 - added a bunch of new commandline commands to display lists of different kinds of installed game data:
--list-maps
--list-techtrees
--list-scenarios
--list-tilesets
--list-tutorials
2012-04-02 06:07:32 +00:00
Mark Vejvoda
030582c1ef - added a new EnumParser class to convert enum to string and vice versa
- factions can now customize some more of the AI behavior
2012-03-31 05:54:24 +00:00
Mark Vejvoda
c02c90427b - added some more lua commands:
vector<int> getUnitsForFaction(factionIndex,commandTypeName, field)
int getUnitCurrentField(unitId)
2012-03-30 07:10:14 +00:00
Mark Vejvoda
f7423608ce - bugfix for lua strings 2012-03-30 01:48:41 +00:00
Mark Vejvoda
f3df72bb14 - added a new function to correct some file paths when loading a saved game from another persons computer (may need more tweaking)
- added support for saving and loading tables from Lua
2012-03-29 18:14:25 +00:00
Mark Vejvoda
433f4e84ce - a few more fixes found using cppcheck 2012-03-28 06:34:34 +00:00
Mark Vejvoda
9286130138 - bugfixes and code cleanup found using cppcheck 2012-03-28 06:25:57 +00:00
Mark Vejvoda
9e1001fac7 - headless server will only give network status info to the locahost now and not on any other ip (for security purposes) 2012-03-27 05:39:02 +00:00
Mark Vejvoda
d6619a9cd3 - added new ability to specify the game status listen port 2012-03-26 06:59:08 +00:00
Mark Vejvoda
4f1bee5aea - attempt to save and load scenario info in saved games 2012-03-26 06:48:58 +00:00
Mark Vejvoda
d356e5f5de - added new headless server status check:
on the SAME box as the headless run:
./megaglest --headless-server-status
2012-03-25 06:55:43 +00:00
Mark Vejvoda
bc3cc07aba - corrected multiple model processing based on hp
- fixed cmake scripts (thanks Andrew Clarke)
- fixed streflop files to ignore softfloats if not used during build
2012-03-24 18:30:49 +00:00
Mark Vejvoda
b14431385f - attempt to make accepting socket connections and dealing with certain connection problems more stable 2012-03-24 01:09:55 +00:00
Mark Vejvoda
a7e45eb354 - added the ability to record all game command to a replay file. To test saving / loading games from a replay file, add this to glestuser.ini:
SaveCommandsForReplay=true
2012-03-20 04:53:26 +00:00
Mark Vejvoda
b481fbcbb5 - proper save and restore for particles 2012-03-19 21:35:54 +00:00
Titus Tscharntke
d738dddab6 particles are no longer saved ( just particle systems ) because they made the savegame huge. 2012-03-17 22:26:50 +00:00
Mark Vejvoda
1ac9aa6d3f - fixed xml loading via rapidxml for some scenarios that had embeddex xml comments in lua
- added automation abilities for automated testing with automated saved games
2012-03-17 08:20:17 +00:00
Mark Vejvoda
d222e6a4ba - fixed windows build 2012-03-17 03:59:30 +00:00
Mark Vejvoda
5f15bf20a9 - yes you can load saved games now :) 2012-03-16 01:58:39 +00:00
Mark Vejvoda
01f8f518b3 - saved games now go into saved folder 2012-03-15 22:09:11 +00:00
Mark Vejvoda
510ee7dfff - bugfixes for loading XML and not dropping newlines
- started work on trying to save lua state (global variables only)
2012-03-15 20:48:27 +00:00
Mark Vejvoda
5cd0a788d2 - updated windows build to compile with latest updates 2012-03-15 16:37:53 +00:00
Mark Vejvoda
3eeb1ddea4 - added option to specify which game to load when loading a saved game.
- added a hotkey to save games any time during game play (F11). This saves files with a timestamp
- we now keep track of the last game the user saved and if commandline does not specify a game to load it uses the last saved game
2012-03-15 15:57:21 +00:00
Mark Vejvoda
fc125bec37 - added command groups and unit selection to save / load game info 2012-03-15 07:09:36 +00:00
Mark Vejvoda
d1dd79047e - no need for xerces anymore? All XML is now done by rapidxml by default (loading and saving) 2012-03-15 05:59:23 +00:00
Mark Vejvoda
8860fd0dc8 - fix saved games in headless server mode 2012-03-14 23:25:47 +00:00
Mark Vejvoda
7425dc8fdf - ALL XML loading will default to rapidxml, we now ONLY use xerces for saving the game (until i get time to implement xml save using rapidxml) 2012-03-14 22:48:46 +00:00
Mark Vejvoda
4bd6b53f9d - added insanely fast rapidxml as a supported xml engine to use. Currently its ONLY used for loading saved game xml and the currently class ONLY handles loading (not saving) xml's. 2012-03-14 21:52:13 +00:00
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
d1a0eeca2e - check for null for particles 2012-03-13 22:37:47 +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
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
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
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
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
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
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
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
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
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
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
2e6fcb2d4a - comment out lua console debugging 2012-01-04 23:21:06 +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
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
2298cc99a7 - more debian related changes for better manpages 2011-12-20 06:31:38 +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
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
bb16ed2a65 - debian related changes 2011-12-15 11:16:14 +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
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
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
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
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