Commit Graph

447 Commits

Author SHA1 Message Date
Mark Vejvoda
fce4d55dd5 - better error handling, try to display proper error message and restore state as best as possible 2012-04-02 01:45:13 +00:00
Titus Tscharntke
7f0aaebf50 XML option to hide a resource from the HUD 2012-04-01 19:42:59 +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
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
63af39e034 - hide map objects and their particles if not in current frustrum view 2012-03-27 06:09:30 +00:00
Mark Vejvoda
163271203d - tilesets now support animated models:
<model path="models/copter_sit.g3d" anim-speed="190"/>
2012-03-26 23:24:29 +00:00
Mark Vejvoda
b481fbcbb5 - proper save and restore for particles 2012-03-19 21:35:54 +00:00
Titus Tscharntke
91dce63aac savegame screenshot has smaller size (configurable)/ screenshots are deleted too 2012-03-17 11:26:39 +00:00
Mark Vejvoda
8d5de12d42 - added some particles to load game logic 2012-03-14 07:23:41 +00:00
Titus Tscharntke
38bd33acf9 Gamma Correction in inGame options with direct feedback. 2012-03-13 18:59:33 +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
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
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
Titus Tscharntke
9870c13a6b GraphicMessageBox can handle multiple buttons now 2012-02-19 17:37:53 +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
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
7b69d3040f - bugfix on windows for autoscreenshots in g3d viewer 2012-01-04 21:43:34 +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
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
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
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
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
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
d33e1174a5 - bugfixes related to cppcheck report
- bugfixes found using valgrind (memory leaks)
2011-12-02 16:07:59 +00:00
Mark Vejvoda
cd2daf09dc - new visibility frustum calculation is enabled by default 2011-11-30 21:27:03 +00:00
Mark Vejvoda
410201b313 - attempt to fix bug for new render visiblity 2011-11-30 17:56:58 +00:00
Mark Vejvoda
97378cf0ec - adding more debug info to rendering 2011-11-30 17:47:07 +00:00
Mark Vejvoda
ed072d27bb - adding more debug info to rendering 2011-11-30 16:51:51 +00:00
Mark Vejvoda
3b7e873a02 frustrum code can be re-enabled via ini setting:
EnableFrustrumCalcs=true
2011-11-30 07:39:24 +00:00
Mark Vejvoda
8996938e86 - disable new frustrum code for now 2011-11-30 07:27:45 +00:00
Mark Vejvoda
8445a5f616 - attempt to fix visible quad bug 2011-11-30 07:13:17 +00:00
Mark Vejvoda
4015520702 - bugfix the quad cache is now cleared properly at game start and end
- bugfix for debugging headless server caused segfault
2011-11-30 06:58:26 +00:00
Mark Vejvoda
b02c3123f6 - headless server bugfix during debugging as well as an attempt to improve rendering 2011-11-30 05:57:14 +00:00
Mark Vejvoda
1658306b59 - fixed debug output font position --> just for you james! 2011-11-28 05:54:31 +00:00
Mark Vejvoda
53ad9d77c2 - fixed font verticle centering for ftgl 2011-11-23 20:51:58 +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
cef0577e3e - added commented out debug code for future ref 2011-11-19 09:49:52 +00:00
Mark Vejvoda
cd6b961a3b small tweak to font height calc 2011-11-19 02:31:47 +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
e8279621b1 - fixed build on windows 2011-11-15 06:37:47 +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
9f316bef08 added an override for map preview rendering to use legacy non FBO code:
LegacyMapPreviewRendering=true
2011-11-08 16:41:10 +00:00
Titus Tscharntke
c82ad4689b earlier food warning / fixed norsemen medbar texture ( had visible white borders before ) 2011-11-02 00:30:10 +00:00
Mark Vejvoda
bcc97704b6 got ftgl raster fonts working when ini setting is:
Enable3DFontRendering=false and NOT running legacy font mode
2011-11-02 00:17:57 +00:00
Mark Vejvoda
1c96073db4 fixed the headless horseman segfault 2011-10-27 19:02:15 +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
6863876359 bugfixes from transition to battle end and back to menu 2011-10-22 19:45:05 +00:00
Titus Tscharntke
c151f538b1 3 cycle resource warning instead of percentage warning / sailboat texture fixed in menu 2011-10-18 22:00:59 +00:00
Mark Vejvoda
e5c5e22c26 initial attempt to add a visual food low warning (consumable falls to 25% and balance is ticking down) 2011-10-18 15:41:37 +00:00
Mark Vejvoda
5b7329594c - merging in changes from weltall for macosx 2011-10-18 01:13:38 +00:00
Mark Vejvoda
828069087b - removed un-necessary sendfile header
- fixed compile when streflop disabled
2011-10-13 20:05:39 +00:00
Mark Vejvoda
50ce6eb1ea - updated intro with better timing and multiple models. Updated menu background model as well and about screen to show megapack units. 2011-10-12 05:24:30 +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
5a7a37a678 - bugfix 3dlists when showing keyboard menu in game (water was showing wrong) 2011-10-05 03:42:29 +00:00
Mark Vejvoda
e8663b99bc - bugfix for popup menu in legacy font mode 2011-10-05 02:12:53 +00:00
Mark Vejvoda
bc5c32deb1 - initial attempt to add 'pause game' for network games. The following apply:
- only the server (or headless admin) can pause/resume a network game.
- to pause/resume press ESC in game and select the pause/resume button to toggle the state.
- chatting works while the game is paused. If clients want the game paused they should ask this in the chat window
2011-10-03 20:48:09 +00:00
Mark Vejvoda
d719e8e318 - in game popup menu now also allows viewing/changing keyboard setup
- now display (team) when chat text is intended only for team members
2011-10-03 00:36:28 +00:00
Mark Vejvoda
5d0eea51e3 - bugfix for rendering labels (now properly lines up with other controls) 2011-10-02 02:14:05 +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
Mark Vejvoda
9caff9dac3 - in headless mode avoid init of sdl's video surface so that we stay in console window (no graphics window shown) 2011-09-27 07:01:08 +00:00
Mark Vejvoda
c68aa74fcf - more updates for headless mode (try to avoid using opengl completely), server now runs at around 20 MB RAM at game start. 2011-09-27 05:29:57 +00:00
Mark Vejvoda
7d53df698a - added new in-game popup menu and new ability to switch teams in game (turned off by default in advanced settings) 2011-09-21 06:51:28 +00:00
Mark Vejvoda
bb68106912 - phase 3 of cppcheck verbose fixes 2011-09-01 18:08:56 +00:00
Mark Vejvoda
d44959d69c - phase 1 of cppcheck verbose fixes 2011-08-31 23:10:43 +00:00
Mark Vejvoda
93cc49a89a - bugfixes found from cppcheck 2011-08-31 20:04:50 +00:00
Mark Vejvoda
3af608151e - bugfixes found from cppcheck 2011-08-31 19:44:19 +00:00
Mark Vejvoda
3eb375904c - bugfix for text placement in progress bars 2011-08-30 21:48:32 +00:00
Mark Vejvoda
c4cbdd86e3 - disabled will's visible quad code as i cannot get it to work when rotating around with the camera. Bugfix for normal camera visible quad so we don't get black spots when moving camera around. Bugfix for menu keyboard entry if we get a bad utf8 conversion character 2011-08-30 18:28:30 +00:00
Mark Vejvoda
d99a8236ae - added the ability to synch unit particles with model animation using start-time and end-time attributes 2011-08-27 06:52:17 +00:00
Mark Vejvoda
a2e6f81a0d - added initial code from willvar for visible quad calc (but disabled for now till we have time to fix issues) 2011-07-23 23:22:30 +00:00
Mark Vejvoda
5400126332 - try bugfix for titi's verticle rotation
- added deep copy for child particles
2011-07-12 01:48:14 +00:00
Titus Tscharntke
9bc26f418d rotated_climb. For example tanks are rotated along the x- and z-axis when driving up or down a hill ... 2011-07-11 23:59:16 +00:00
Mark Vejvoda
970fe6a326 - some decent render improvement for surface terrain rendering (combined willvar's layer idea with visible quad, but no using vbo's at this point only vertex arrays) 2011-07-10 05:42:11 +00:00
Mark Vejvoda
0d248958c3 - added willvarfars vbo surface code when VBO is enabled in the video card, otherwise fallback to original code 2011-07-08 16:45:55 +00:00
Titus Tscharntke
c21f07ec7d "anim-hp-bound" is now called "anim-progress-bound" and available for produce/morph/upgrade skills too! Deprecated "anim-hp-bound" will be dropped VERY soon! 2011-07-07 23:02:46 +00:00
Mark Vejvoda
1b2d4fddea - merged in willvarfar's particle patch 2011-07-06 22:23:51 +00:00
Titus Tscharntke
9ef8c82441 extra team color markers ( by default use * to toggle/switch on ) 2011-07-06 22:02:38 +00:00
Mark Vejvoda
15488ddb31 - bugfixes related to attack-boost memory leaks 2011-07-06 05:16:25 +00:00
Mark Vejvoda
14c70966b0 - bugfix for hpanim on bebuilt, to interplotate out the last reset frames 2011-07-02 21:44:29 +00:00
Mark Vejvoda
50347b0a66 - cleanup of font work:
- removed uneeded code
  - set default scale font value to 0.8 to fit nicely on screen
  - added two new optional settings for ini or lng files to control scale and y centering:
  FONT_SCALE_SIZE=0.8
  FONT_SCALE_CENTERH_FACTOR=3.0
2011-07-02 01:56:06 +00:00
Mark Vejvoda
850825695e - added support for min / max hp associated with damage particles 2011-07-01 21:47:54 +00:00
Mark Vejvoda
d2c8cc0187 - bugfix for unit titles in special debug mode
- added support for png format for pixmap3d (Water) textures
2011-07-01 07:46:18 +00:00
Mark Vejvoda
ec15c81d12 - added a FPS cap (at 800 fps we will sleep for 1 millisecond) to avoid pinning the cpu for hardware that has fps which is too good. Also user can toggle fps view on any screen now 2011-07-01 02:50:20 +00:00
Mark Vejvoda
1b72bcafe8 - i think this fixes the y centering for all resolutions, after testing we can remove lots of unused properties and code 2011-07-01 01:18:47 +00:00
Titus Tscharntke
97e19785a9 fonts really fixed now? 2011-07-01 00:03:30 +00:00
Mark Vejvoda
f5af03f8d7 - bugfix for using wrong xml names for min and max hp values for models (now look for names mentioned in forum) 2011-06-30 18:59:58 +00:00
Titus Tscharntke
baea45cae8 no fun with fonts 2011-06-29 23:48:48 +00:00
Mark Vejvoda
8bbf398e70 - attempt to bugfix weird map preview for ColdfusionStorm 2011-06-28 23:49:45 +00:00
Mark Vejvoda
0e897ee94f - bugfix for y centering of font for different fonts / languages 2011-06-28 08:15:05 +00:00
Mark Vejvoda
a9dfd3853b - corrections for y co-ord placement of font 2011-06-28 07:52:05 +00:00
Mark Vejvoda
ebd5bca7fe - attempt to fix 'blurry fonts' 2011-06-28 06:18:24 +00:00
Mark Vejvoda
945c2aa66b - some font bugfixes (use proper fonts in menus and also proper spacing in console) 2011-06-28 00:51:13 +00:00
Mark Vejvoda
1700cbba2d - working implementation of particles for new attack-boost xml tag 2011-06-25 20:44:46 +00:00
Mark Vejvoda
86743e2718 - more bugfixes for attack-boost check (and now in debug mode if unit selected show his attack-boost radius as well as the units affected) 2011-06-25 14:18:53 +00:00
Mark Vejvoda
f0c636d2ff - render battle end screen to texture buffer on first render so it takes less fps to render after the 1st frame 2011-06-12 05:54:54 +00:00
Mark Vejvoda
752dd26bcd - some small font centering adjustments 2011-06-12 01:32:02 +00:00
Mark Vejvoda
f1aa231e4b - bugfixes for font display:
- workaround for a bug in freetype in some cases
  - better handling on different resolutions
  - new commandline option to override screen resolution settings
2011-06-11 08:52:49 +00:00
Mark Vejvoda
4aca4af404 - updated patch from willvarfar for animated models in particles 2011-06-11 00:26:26 +00:00
Mark Vejvoda
06999a8f88 - reworked fonts to now use 3d matrix positioning and render performance is much better.
*NOTE: Still need to deal with some letters getting partially chopped off in some cases.
2011-06-10 03:09:19 +00:00
Titus Tscharntke
bc2c59a82a just put a hud.png in a faction dir and you got a HUD overlay 2011-06-09 00:59:03 +00:00
Mark Vejvoda
f65bfe8710 - added some bug fixes to check if lng files are utf-8 or not and deal with it appropriately 2011-06-08 07:18:06 +00:00
Mark Vejvoda
c808a5661a - added freetype2 / FTGL support 2011-06-06 21:38:25 +00:00
Mark Vejvoda
60b8093f5b - attempt to get non ascii file paths working in megaglest (Japanese etc...) 2011-05-18 21:49:11 +00:00
Mark Vejvoda
449e3f25c8 - updates to commondata handling. From now on commondata tag specified the commondata folder under a techtree making it easier to share data and portable since you just need to copy the techtree and its contents, this means no sharing data between techtrees (which is good since we don't want such dependencies) 2011-05-06 22:12:16 +00:00
Mark Vejvoda
e34e70a0c8 - added code to merge duplicate sounds used in a techtree 2011-05-06 07:47:31 +00:00
Mark Vejvoda
c258dc0822 - display which files contain the reference (the parents) to duplicate data in validation report 2011-05-05 20:18:38 +00:00
Mark Vejvoda
6492832c35 - added initial validation code to warn about duplicate data used in factions 2011-05-05 19:21:50 +00:00
Mark Vejvoda
c3d1d6fca0 - add support for models, sounds and images to be able to load from commondata 2011-05-05 07:15:12 +00:00
Mark Vejvoda
fb79bce5ab - added new ini entry for totalnoob to try to see if it fixes his stick trees?
PerspectiveFarPlane=1000
is what he should try when using this svn version
2011-05-01 22:48:44 +00:00
Mark Vejvoda
030058e3fc - revert a render method to the 3.4 version for better ATI card support (thanks for pointing this out sojourner) 2011-04-29 23:48:46 +00:00
Mark Vejvoda
4a20646d37 - revert 2d mouse renderer to 3.4 2011-04-27 23:37:57 +00:00
Mark Vejvoda
1f3d97dbe1 - fixed strange messagebox display (was caused by map preview renderer setting glLineWidth to 14 and never resetting afterwards) 2011-04-24 05:39:13 +00:00
Mark Vejvoda
a12e9787e1 - moved progress bar beside return button 2011-04-20 05:24:11 +00:00
Mark Vejvoda
d4cff9786a - bugfix for displaying units with light sources in view of the camera 2011-04-19 18:30:44 +00:00
Mark Vejvoda
c366d108e8 - see if this fixes some peoples screenshot problems 2011-04-18 20:20:16 +00:00
Mark Vejvoda
c4d32ae0d2 - bugfix for users toggling back from Linux tty session 2011-04-18 19:48:05 +00:00
Mark Vejvoda
016771ed81 - adjust camera angle for more properly unit visibility calc
- more accurate unit titles when debugging
2011-04-18 16:51:30 +00:00
Mark Vejvoda
4bce94fbbb - make messageboxes less alpha background so they are darker and easier to read (try it ultifd)
- made lag timeout max set to 35 instead of 65 since 35 is bad enough
- added another error check
2011-04-18 06:42:25 +00:00
Mark Vejvoda
26b1785b7a - mod description now word wraps on \n 2011-04-16 18:53:57 +00:00
Mark Vejvoda
431ca8e6fb mod menu now only shows 3 lines max for console messages 2011-04-14 23:13:44 +00:00
Titus Tscharntke
8c39a1b725 now you are "forced" to say "ready" when you are connected :-D 2011-04-12 22:20:41 +00:00
Titus Tscharntke
556b190d3a mod menu can display descriptions now, endgame stat with gold instead of green, minimap has smaller border and is a tiny bit less transparent 2011-04-07 00:09:57 +00:00
Mark Vejvoda
e56b6079c6 - added new menu option to be able to toggle texture compression
- scenario menu now does NOT cache textures
2011-03-31 01:34:01 +00:00
Titus Tscharntke
b4a352285f minimap transparent again but with border 2011-03-30 23:27:21 +00:00
Titus Tscharntke
12a33e8461 minimap with border and non transparent 2011-03-30 22:39:52 +00:00
Mark Vejvoda
3ed636aae2 - fixes for some threading shutdown bugs
- We now display when a screenshot is taken in game showing an ingame console message
- Updated AI to attack closest attackers
- Updated found enemy to be closest attacker
2011-03-28 21:04:47 +00:00
Mark Vejvoda
3b56aa4475 - performance changes... (problem found by titi) most debug calls line are skipped when the debug flag is disabled even BEFORE getting into the handledebug method.
This improves performance VERY MUCH.
2011-03-28 03:54:23 +00:00
Titus Tscharntke
5ccfc59819 Masterserver messages are highlighted in yellow now; console lines now can have individual colors (if not in game)! 2011-03-26 17:17:34 +00:00
Titus Tscharntke
5648080095 Ready/not Ready/brb in colors; labels can have colors now 2011-03-26 13:40:22 +00:00
Mark Vejvoda
1a783b3bba - updates to mod menu for better user experience 2011-03-25 18:42:08 +00:00
Mark Vejvoda
9681e7f1bc - initial code for managing mod content (downloads and removal of user data) 2011-03-25 10:11:16 +00:00
Mark Vejvoda
f7fdafbff4 - did some code refactoring, wanted to load some textures threaded but bailed out due to opengl's hideous problems related to multi-threads 2011-03-22 02:02:54 +00:00
Mark Vejvoda
0379b7284d - removed requirement to have a newer libcurl, now most platform, should be able to build mg more easily (only require 7.16.4 or newer instead of 7.21.0) 2011-03-20 00:11:00 +00:00
Mark Vejvoda
7d38aec84a - new commandline options to discover and optional delete unused files in techtrees 2011-03-15 15:30:28 +00:00
Titus Tscharntke
c54174061f particles have more switches: day/night visibility , alternating value , radiusBasedStartenergy ( can be disabled now! ) 2011-03-13 23:16:07 +00:00
Mark Vejvoda
39bf1b986e - added new commandline option to convert folders of g3d models to use specified texture format
- added new utility methods and changed code to use them (like adding trailing slash on paths)
2011-03-13 08:23:43 +00:00
Titus Tscharntke
ad94506842 gonanas patch! Thank a lot! For me it works, please test ! ( hopefully really no more flickering now ) 2011-03-09 01:46:00 +00:00
Titus Tscharntke
5e844c39e4 particles for ressouces ... the gold will glow tomorrow :-D 2011-03-09 01:32:27 +00:00
Titus Tscharntke
5494a80233 removed unused isDirty bool ( maybe unstable with tileset particles before ) 2011-03-07 20:19:43 +00:00
Titus Tscharntke
fefed3e3ce No more flickering! Thanks gonana ! ; Tilesetparticles are only rendered/calculated when visible now 2011-03-05 14:34:36 +00:00
Mark Vejvoda
935895c89f - configurable keys can be edited in keyboard menu now 2011-03-04 22:54:04 +00:00