Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,238 Commits 1 Branch 0 Tags 27 MiB
81df224573
Commit Graph

497 Commits

Author SHA1 Message Date
Mark Vejvoda
68d8ef11d8 - see if this hotkey fix is ok for titi 2012-11-21 18:54:50 +00:00
Mark Vejvoda
c3ff9973d9 - fixed screenshots so holding shift ignores the screenshot key 2012-11-20 01:12:07 +00:00
Mark Vejvoda
d9b624dbb8 - fixed spelling mistake in variable name 2012-11-15 08:16:08 +00:00
Mark Vejvoda
d322f73284 - bug fixes and patches from hasufell related to: 
- fontconfig not working
- new cmake option to control inclusion of libvlc
- new commandline option to force where to look for fonts: --font-path=x
- removal of libluajit from cmake
 2012-11-14 19:20:08 +00:00
Mark Vejvoda
df51816eb5 - remove unused code as debian flagged it as a warning 2012-11-12 04:32:01 +00:00
Mark Vejvoda
24fae99539 - remove unused code as debian flagged it as potentially unsafe 2012-11-12 04:18:43 +00:00
Mark Vejvoda
35f6a6665b - attempt to keep irc connection and just join / leave the irc channel as required to speed up irc in the lobby 2012-11-10 09:22:28 +00:00
Mark Vejvoda
ff58a868b3 - attempt to bugfix windows using proper printf syntax for data types 2012-11-10 06:37:23 +00:00
Mark Vejvoda
e3a7aedd5c - headless server now supports lan option 2012-11-09 21:50:01 +00:00
Mark Vejvoda
7b95922ce5 - cleanup from debugging 2012-11-03 07:49:09 +00:00
Mark Vejvoda
61cebc07fe - added some debug code for network protocol 2012-11-03 07:33:39 +00:00
Mark Vejvoda
72d6c693e1 - added some debug code for network protocol 2012-11-03 06:25:26 +00:00
Mark Vejvoda
fecdf22205 - added some debug code for network protocol 2012-11-03 06:09:40 +00:00
Mark Vejvoda
c1e2eac47d - added some debug code for network protocol 2012-11-03 05:46:39 +00:00
Mark Vejvoda
ca0ffef766 - added some debug code for network protocol 2012-11-03 01:29:20 +00:00
Mark Vejvoda
b6a25c8212 - added some debug code for network protocol 2012-11-03 01:23:48 +00:00
Mark Vejvoda
61c86c15d1 - added code for new network protocol (disabled by default as i need to test this on arm) 2012-11-02 19:08:55 +00:00
Mark Vejvoda
00e075df97 - more byte order logic 
- added new network packet debug
 2012-11-01 22:00:55 +00:00
Mark Vejvoda
8c2ed1187f - working on arm support 2012-11-01 19:17:29 +00:00
Mark Vejvoda
b12ade1ada - test data size 2012-11-01 18:48:24 +00:00
Mark Vejvoda
1346cc6024 - test byte order conversion 2012-11-01 18:22:25 +00:00
Mark Vejvoda
3bba236d02 - more updates to support big endian 2012-11-01 06:21:35 +00:00
Mark Vejvoda
b30909f90b - attempt to cleanup for debian compliance (proper copyright, etc) 2012-10-30 06:48:12 +00:00
Mark Vejvoda
604ee7f7be - updated platform id strings 2012-10-27 22:38:14 +00:00
Mark Vejvoda
5f52c1a578 - updated version output to be more verbose about platform 2012-10-26 19:03:58 +00:00
Mark Vejvoda
828616ff27 - updated curl-info to show protocols supported by the libcurl used 2012-10-26 18:17:02 +00:00
Mark Vejvoda
6718ee22e3 - curl-info now shows if ssl is enabled 2012-10-26 16:19:50 +00:00
Mark Vejvoda
28d65e8d55 - cleanup from last checkin (corrections) 2012-10-26 03:08:40 +00:00
Mark Vejvoda
3419127632 - proper way to handle size_t objects (cleanup warning on other platforms) 2012-10-26 02:42:10 +00:00
Mark Vejvoda
57d0104c01 - unescape special html entities when pulling down lng files from transifex 
- do not show pw when showing ini settings on commandline
 2012-10-22 20:05:42 +00:00
Mark Vejvoda
011e0263b0 - lots more code cleanup, using safe buffer size code to avoid buffer overflows 2012-10-19 01:31:20 +00:00
Mark Vejvoda
45c62dee1b - allow querying a headless even when no clients connected 2012-10-16 22:34:18 +00:00
Mark Vejvoda
4a972c9499 - fix invalid report of missing files of the linked faction xml when using linked factions 2012-10-14 21:59:35 +00:00
Mark Vejvoda
68b1ae54b5 - validation now works on techtree's with linked factions 2012-10-14 21:40:35 +00:00
Mark Vejvoda
e3e3832070 - added first round of security sandboxing for lua scripts (disable the os library) 2012-10-11 05:17:37 +00:00
Titus Tscharntke
685b15c91e renamed ServerPort->PortServer MasterServerExternalPort->PortExternal 2012-10-06 12:56:53 +00:00
Mark Vejvoda
5e42c6dc03 - loads of code cleanup based on verbose output from the latest git version of cppcheck 2012-10-06 07:06:40 +00:00
Mark Vejvoda
1a7f3d50ca - bugfix for broadcast override 2012-10-06 00:37:21 +00:00
Mark Vejvoda
fd48fe18e4 - added new ini option to allow for custom broadcast port for LAN game discovery: 
BroadcastPort=x
where x is the custom port for discovery
 2012-10-06 00:34:08 +00:00
Mark Vejvoda
62c82ad9bc - allow the --connecthost commandline to use: 
--connecthost=auto-connect
which will auto connect to the first found server on a lan
 2012-10-06 00:25:13 +00:00
Mark Vejvoda
74cca86b3f - added new commandline option --connect=x:y format as requested 2012-09-25 21:52:23 +00:00
Mark Vejvoda
7c0e10684a - added lua functions to add / remove cell markers: 
addCellMarker(0,'test from scenario!','',cellMarker)
param1=factionindex
param2=cell hint
param3=empty string
param4=cellPosition

removeCellMarker(0,{46,13})
param1=factionindex
param2=cellPosition
 2012-09-25 07:05:52 +00:00
Mark Vejvoda
d91e72a825 - windows compile bugfixes 2012-09-22 21:00:31 +00:00
Mark Vejvoda
1c211e4ce6 - lots of code cleanup from the cppcheck 2012-09-22 20:13:57 +00:00
Mark Vejvoda
a4ad1f5aea - bugfixes for network player disconnect feature 2012-09-21 15:03:13 +00:00
Mark Vejvoda
2a06197acd - added new commandline option to disable opengl capability checks to help trouble shoot users with bad video drivers: --disable-opengl-checks 
(same as ini setting: CheckGlCaps=false)
 2012-08-16 22:36:04 +00:00
Mark Vejvoda
4b586bc7b3 - added more opengl checking to see if the user has enough support to run megaglest. 
- for windows users, bring error message dialog in front of everything else
 2012-08-10 06:19:35 +00:00
Mark Vejvoda
9f0546c008 - set correct exit codes (for tomreyn) 
- fix loading when too many units on map (do not segfault)
- deprecate ThreadedNetworkClient setting
 2012-07-17 23:04:30 +00:00
Mark Vejvoda
4202989014 - attempt to switch CRC to use unsigned int everywhere 2012-07-07 02:46:57 +00:00
Mark Vejvoda
27b5d40bf8 - commandline override options now stored in a different buffer so that they will not be saved in ini files 2012-07-06 16:29:49 +00:00
Mark Vejvoda
a8af70cee1 - when disabling backtrace ensure console output only shows direct errors without backtrace 2012-07-03 00:19:23 +00:00
Mark Vejvoda
9209c5fdbc - bugfix for scenario validation to find standard techtrees 2012-06-22 01:48:31 +00:00
Mark Vejvoda
cb7bd8ff04 - added menu option and commandline parameter to disable video playback 2012-06-09 05:02:01 +00:00
Mark Vejvoda
90b0d96b5d - disable main menu background video playback when showing faction preview video 2012-06-09 02:59:46 +00:00
Mark Vejvoda
771c6d5bd6 - fix file CRC calcs 
- fix validation for techs to properly handle special file paths
 2012-06-04 04:00:37 +00:00
Mark Vejvoda
6f48ec6330 - play no videos when running special commands like validations 2012-06-04 00:11:29 +00:00
Mark Vejvoda
e96346ff28 - special text color override setting will only apply to non in-game text (useful when videos clash with menu text colors) 2012-06-01 19:14:55 +00:00
Mark Vejvoda
dcc615d427 - allow overriding text colors 2012-06-01 05:26:01 +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
b91f816f3e - a compromise for libvlc, only fallback to retarded env var code if plugins folder is missing. However we plan to ship that folder next install. 2012-05-14 07:28:34 +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
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
8488b9c2b4 - speed up leak checker 
- fix a few bugs that were discovered
 2012-04-17 07:12:07 +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
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
2ab041813f - code cleanup based on cppcheck report 2012-04-05 03:53:59 +00:00
Mark Vejvoda
6e66963664 - added validate-tileset 2012-04-03 19:35:22 +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
c13e0ef788 - better error handling logic on crashes 
- translate scenario to correct file on players system
 2012-03-29 00:43:03 +00:00
Mark Vejvoda
9286130138 - bugfixes and code cleanup found using cppcheck 2012-03-28 06:25:57 +00:00
Mark Vejvoda
6bff5c0687 - try to improve error handling a bit for more accurate stack trace and less chance of garbage info 2012-03-27 22:44:16 +00:00
Mark Vejvoda
4d8fdca765 - changed order of port override to properly work with port status 2012-03-26 07:02:54 +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
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
b481fbcbb5 - proper save and restore for particles 2012-03-19 21:35:54 +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
01f8f518b3 - saved games now go into saved folder 2012-03-15 22:09:11 +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
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
e3fde99359 - fixed gamma correction so it works now 
- added more state when loading saved game
 2012-03-13 01:34:14 +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
Mark Vejvoda
90698f65dd - segfault bugfix for techtree validation 2012-03-10 06:44:57 +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
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
12d1885c65 - ported bugfixes to trunk from 3.6.0.3 2012-01-24 21:28:05 +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
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
61bebd6b86 - numerous fixed for network scenario handling 2011-12-28 04:46:36 +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
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
eb1408550d - more debian related changes for better manpages 2011-12-20 07:00:23 +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
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
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
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
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
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
1a2855f50f - updated windows to properly detect locale in windows (stupid non standard platform) 2011-12-01 08:05:36 +00:00
Mark Vejvoda
a994610574 - auto detect locale language and try to set language on first run 2011-12-01 02:31:00 +00:00
Mark Vejvoda
6937785f22 - now display native language name in options menu 2011-11-30 23:35:54 +00:00
Mark Vejvoda
da854f103b - added some special ways to configure how sockets work on a system for testing 2011-11-27 00:07:55 +00:00
Mark Vejvoda
1935f9314b added new commandline to specify internal/external port #'s to use when hosting: 
--use-ports=61390,61390
 2011-11-23 21:36:49 +00:00
Mark Vejvoda
115ef63f57 - hardened code for standalone mods 2011-11-23 19:12:06 +00:00
Mark Vejvoda
aefdfd98f8 - added new commandline option to support whole standalone mods: --load-mod=x 2011-11-23 18:02:00 +00:00
Mark Vejvoda
3cdf50c399 - a load of bugfixes including: 
- proper handling of invalid client connects, after 6 bad attempts in a 60 second period of time the IP address is blocked from the current game
  - Added check for invalid particles for tileset objects
  - Made messagebox wider in game mod menu
  - Fixed numerous threading issues discovered while testing on my 8 core CPU
  - a Little bit of rendering cleanup
 2011-11-23 08:00:09 +00:00
Mark Vejvoda
31fafe4528 - fixed up font alignment and added a way to force ftgl font mode: 
--force-ftglfonts
 2011-11-18 19:53:56 +00:00
Mark Vejvoda
54e4d7604c - added new option to headless modedisable reading from local console: 
--headless-server-mode=vps

can be comgined with exit option:

--headless-server-mode=exit,vps
 2011-11-16 05:20:35 +00:00
Mark Vejvoda
3e3bcb6af8 - on console error show proper error message 2011-11-16 04:39:26 +00:00
Mark Vejvoda
204d2bea86 - added some extra error output on poll looping 2011-11-16 04:03:17 +00:00
Mark Vejvoda
043cd5789c - default to english is a selected language is missing 2011-11-15 18:38:13 +00:00
Mark Vejvoda
41ae17757b - just for you james! Fixed about screen text alignment 
- re-enabled unit titles in special debug mode (requires special keys to toggle)
 2011-11-15 04:48:57 +00:00
Mark Vejvoda
252080b3b0 modified sound fade on app exit as per tom's forum post 2011-11-11 18:15:46 +00:00
Mark Vejvoda
30e1f45cc7 - intro is now fully translatable and configurable (see english.lng file at the bottom for intro strings) 
- added game loading text strings to language file
- ONLY load the font type we are using
 2011-11-02 17:17:28 +00:00
Mark Vejvoda
3dfd316484 fixed legacyfont 2011-11-01 23:51:28 +00:00
Mark Vejvoda
bb25e0ec79 fix for macosx 2011-11-01 21:47:34 +00:00
Mark Vejvoda
193354865c another attempt to fix things on macosx 2011-11-01 21:17:24 +00:00
Mark Vejvoda
e15d9cab5d attempt to see if eariler init helps on macosx 2011-11-01 20:07:18 +00:00
Mark Vejvoda
279ef96fd1 another attempt to supplant macosx's weakness 2011-11-01 17:38:51 +00:00
Mark Vejvoda
1c96073db4 fixed the headless horseman segfault 2011-10-27 19:02:15 +00:00
Mark Vejvoda
0b6dbdf411 ensure language toggle only happens outside of a render event 2011-10-25 22:40:28 +00:00
Mark Vejvoda
50adfb3305 - added ability to switch languages from nearly anywhere (and new hotkeys to do so): 
CTRL+L shows language popup selection, CTRL+SHIFT+L toggles to next language automatically
 2011-10-25 18:39:11 +00:00
Mark Vejvoda
5ac681ca73 changed app exit sound fade to 1.75 seconds and allow it to be set via new optiona lini setting: ShutdownFadeSoundMilliseconds 2011-10-21 22:36:36 +00:00
Mark Vejvoda
b10c489418 just for you tomreyn (fade sound on application exit) 2011-10-21 22:07:34 +00:00
Mark Vejvoda
9d1617e045 display thread counts on app shutdown / ftp server startup and shutdown only in verbose mode 2011-10-18 14:01:55 +00:00
Mark Vejvoda
b30fdea0d0 only output error filename once 2011-10-18 02:11:55 +00:00
Mark Vejvoda
62f1ad0464 output to console before trying to write to error.log 2011-10-18 02:02:37 +00:00
Mark Vejvoda
dc4b367f69 - changed contact email address to bug report URL 2011-10-18 01:40:49 +00:00
Mark Vejvoda
d98e35f245 bugfix when shutting down after visiting internet menu 2011-10-18 01:29:08 +00:00
Mark Vejvoda
3b8d07fc8d - don't allow game to start and show a message if network player connected and on an unassigned slot 2011-10-15 01:03:24 +00:00
Mark Vejvoda
2d42f59fe1 - added a new lua function to allow loading a new scenario from inside an existing scenario 
loadScenario('capture_the_flag2')
 2011-10-06 18:04:59 +00:00
Mark Vejvoda
6aa079390d - try to avoid a hang when multiple runtime errors occur at the same time. 
- attempt at small speed boost in pathfinder
 2011-10-05 21:46:41 +00:00
Titus Tscharntke
a011cb3b26 Font LinBiolinum_Re-0.6.4.ttf is default now and some default values are set according to this font. 2011-10-04 23:49:34 +00:00
Mark Vejvoda
be3209e1fc - when we have a runtime error, we now log the error text to error.log which will be located in the path where all log files are written. 2011-10-03 18:39:21 +00:00
Mark Vejvoda
9316c1b4c3 - when we have a runtime error, we now log the error text to error.log which will be located in the path where all log files are written. 2011-10-03 18:34:59 +00:00
Mark Vejvoda
7eb68c4023 - added new commandline option to override base font size 2011-10-03 02:45:43 +00:00
Mark Vejvoda
75e73ec85d - headless mode now properly uses selected slot of player 2011-10-01 08:04:30 +00:00
Mark Vejvoda
77a2fa7d48 - getting fanatical about memory cleanup so that valgrind output is more useful 2011-09-30 23:55:07 +00:00
Mark Vejvoda
43ed4553ea - more memory cleanup and thread cleanup (found using valgrind) 2011-09-28 15:32:57 +00:00
Mark Vejvoda
aed293bba2 - fixed a bunch of memory leaks that will hopefully mean less overall memory requirements. 2011-09-28 06:57:42 +00:00
Mark Vejvoda
fe8e76efd8 - applied some memory leak cleanups 2011-09-27 20:35:45 +00:00
Mark Vejvoda
04b40ab476 - bugfix for endless loop on headless server when pressing control-D 2011-09-27 19:21:06 +00:00
Mark Vejvoda
0cf03a3562 - added option to quit headless server after game has completed: 
./megaglest --headless-server-mode=exit
 2011-09-27 18:44:01 +00:00
Mark Vejvoda
ec554ffffb - do not init SDL's video subsystem in headless mode 2011-09-27 10:25:31 +00:00
Mark Vejvoda
2a86cb4f7d - added support for proper quiting and console input/output in headless mode. Type: quit followed by return into the console to properly shutdown in headless mode. 2011-09-27 10:16:09 +00:00