Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,787 Commits 1 Branch 0 Tags 27 MiB
133a1fc8b5
Commit Graph

824 Commits

Author SHA1 Message Date
filux
a19abc5591 chat supports longer messages 2015-02-06 01:02:34 +01:00
titiger
9aff9842a4 camera start position shows main building in center. 2015-01-29 17:05:07 +01:00
titiger
2efa255ca3 no more double click in minimap 
Double  click is no more handled when mousepointer is over minimap.
This often resulted in unselected units when commanding via minimap.
 2015-01-29 11:42:13 +01:00
titiger
3433eb5835 healthbar default set to "if needed" 2015-01-26 22:32:08 +01:00
titiger
7006c26707 morph takes cellmaps into account ( needed for prax next ) 2015-01-14 22:58:19 +01:00
titiger
a7b376a700 ensure error message box is completly visible on screen 2015-01-12 21:21:42 +01:00
titiger
ab02478096 enabled depth_test for colorpicking 
To do it many changes were needed, because mouse position on map was 
calculated using the depth buffer with current rendering state
 2015-01-04 14:38:32 +01:00
titiger
f62efc64bf fix for uneditable closed slots 
https://forum.megaglest.org/index.php?topic=9620.0
 2014-12-22 03:08:19 +01:00
SoftCoder
b5d609586a - small coverity fix 2014-12-20 16:31:08 -08:00
SoftCoder
4dea67cff9 - attempt to fix thread crash when ending game for network play 2014-12-19 19:08:04 -08:00
SoftCoder
8210485a42 - a few bugfixes related to coverity scan 2014-12-15 19:44:26 -08:00
titiger
2d4c4ece8a fixed missing cast found by Coverity CID 1232665 2014-12-16 01:50:12 +01:00
titiger
db0007d277 fixed missing initialisations found by coverity scan 
Coverity CID 1197086
 2014-12-16 00:53:33 +01:00
titiger
2c15c89571 render server lines with background to make them more readable. 2014-12-15 01:07:25 +01:00
SoftCoder
5e292e931c - memory leak and a few other minor bug fixes as discovered by coverity scan. 2014-11-30 15:30:02 -08:00
titiger
bb62a998cd render healthbars after particles to make them more visible 2014-11-28 23:52:56 +01:00
titiger
54905c0e5c rename getCurrVector() to getCurrMidHeightVector() 2014-11-25 23:40:47 +01:00
titiger
6b35fa1918 its "Healthbar" in translation, not "HealthBar" 2014-11-23 01:52:38 +01:00
titiger
b20b548e76 Merge pull request #30 from titison/feature/lua_blockUnits 
Feature/lua you can disable units via lua commands so that they cannot be built
 2014-11-22 23:39:44 +01:00
titison
345c88d320 Work on Healthbars 
production bars;
options;
many more...;
 2014-11-22 23:15:19 +01:00
titiger
b4e9f787bd several changes for loading saved games 
allow to load older compatible save game
introduced a "last backward compatible version" for loading games
fixed a bug allowing to load older games
 2014-11-18 18:59:45 +01:00
titison
bcb3288d74 setLockedUnitForFaction 
*the actual lua function "setLockedUnitForFaction"
 2014-11-15 18:30:48 +01:00
titiger
49e55209da Healthbars in ingame options 2014-11-08 01:30:43 +01:00
titiger
26db981702 Merge pull request #27 from titison/feature/hp-bars 
Feature/hp bars
 2014-11-07 01:33:30 +01:00
titiger
85c79be337 Game name is now part of the game settings. 
This fixes the ugly "S Game" on the stats.
 2014-11-07 01:26:23 +01:00
titison
2f60d179e9 Healthbars 
* Hotkey now toggles between Default/Off/Always/Damaged/Selected
* Code clean up
 2014-11-06 21:12:47 +01:00
titison
791e1edec6 Healthbars 
Textures (border and background)
Faction.xml can specify more healthbars details
 2014-11-05 02:05:47 +01:00
titison
d1597334bf *Adjusted Healthbar color 
*Hotkey for Healthbars (ToggleHealthbars)
*Background and Border Texture in core data
 2014-11-02 18:18:20 +01:00
titiger
dbddadc74b Fix to see normal consoleMessages in many menus again 
(+ consolemessages to show that the headless server did 
not had the selected map )
 2014-10-31 01:08:12 +01:00
titison
fe936f5c8c Adjusting healthbar related things 
*unit height=healthbar height per default
*no hpbars in photomode
*renamed function
 2014-10-30 00:55:18 +01:00
titison
de5135bfaf *added split(s,d) function for strings 
*reading unit xml healthbar node
*adjusted hpbars
 2014-10-29 00:50:45 +01:00
titison
a2790bd9cb Make them actually usable. 
added ep bars.
Of course its not finished yet
 2014-10-27 16:16:50 +01:00
titiger
5f9816eaab multiplier are displayed in debug 
Multipliers are now shown for CPU-Players in the debug info too
 2014-09-23 01:14:20 +02:00
titiger
af46a8497e Disabled teamchat is reported to the user. 
If teamchat is disbaled to prevent cheating the user gets a message everytime 
he tries to get into team chat mode.
 2014-09-22 03:31:35 +02:00
titiger
cf5da4d2b3 fixed lua function getUnitName; added new lua function getUnitDisplayName 2014-08-09 00:48:04 +02:00
titiger
70e01d5e0b lua commands to shake the cam 
-- camera-distance-affected=false
shakeCamera(int shakeIntensity, int shakeDuration) 

-- camera-distance-affected=true
shakeCameraOnUnit(int shakeIntensity, int shakeDuration , int UnitId)
 2014-02-04 21:21:06 +01:00
titiger
341c7ce46f Shake without effecting the real camera pos 
The camera shake effect does not manipulate the real camera pos anymore, 
just the Opengl campos is effected by it. By this all camera pos related caches 
don't need to refresh just beause the camera shakes.
 2014-02-04 21:14:52 +01:00
titiger
98234228d9 shake it baby ( camera shake effects ) 
Camera shake effects can be added via xml skill definitions.
 2014-02-01 23:15:44 +01:00
SoftCoder
39696b6a65 - added ability to share resources across same teams 2014-01-27 18:55:08 -08:00
SoftCoder
e33024c102 - For team shared unit mode, player does not lose unless all team members have no castle 2014-01-27 14:58:52 -08:00
SoftCoder
e63b3d7499 - added support for team unit sharing 2014-01-27 14:15:05 -08:00
SoftCoder
08af18429d - stubbed out use of xerces as no code was using it any longer. Xerces is no longer a requirement to build, we have been using rapidxml for a long time now. For now the MACRO: WANT_XERCES will build Xerces support into th egame, but it is still not used. We will likely deprecate xerces from megaglest soon. 2014-01-25 17:09:52 -08:00
SoftCoder
3425d4c248 - changed code to cleanup pixbuf allocation earlier to not confuse gDEbugger about an openGL memory leak. 2014-01-11 23:28:33 -08:00
titiger
9ea0debc51 CameraMoveSpeed can be modified 2014-01-11 15:53:53 +01:00
SoftCoder
7d8af94a44 - attempt to fix null pointer segfault on masterserver found by tomreyn 2014-01-08 12:48:56 -08:00
SoftCoder
37494a9c37 - added new LUA method getFactionPlayerType 2014-01-04 09:34:49 -08:00
SoftCoder
ecdb229bdf - attempt to do better lag handling (pause game up to 3 times for lagging clients then disconnect) 2014-01-02 13:56:37 -08:00
SoftCoder
5613b0739e - added more lua debug info 2013-12-30 14:00:04 -08:00
SoftCoder
853d531d11 - added two new lua methods basxto: 
storeSaveGameData(name, value)
string loadSaveGameData(name)
 2013-12-30 12:55:59 -08:00
SoftCoder
5c90b9148c - bugfix for saving / loading booleans in a lua table 2013-12-30 09:28:25 -08:00
SoftCoder
97d11a9cfd - script manager detected errors don't try to translate the error 2013-12-30 08:17:05 -08:00
SoftCoder
5b445ad388 - removed stack trace from script manager methods that create known errors to make error message smaller. 2013-12-30 07:57:51 -08:00
SoftCoder
fda53f47d1 - bugfix for loading scenarios with their own techs 
- all scenario errors are now caught and shown in a messagebox and game can continue.
 2013-12-30 02:01:47 -08:00
SoftCoder
3111b733e2 - bugfix for chrono class calcs causing group camera recall to fail (And numerous other problems) 
- added better tracking of mutexes by assigning them location info
 2013-12-24 22:27:44 -08:00
SoftCoder
3a24531ba7 - more code cleanup based on cppcheck results and valgrind 
- added -h option to build-mg.sh to show parameter usage.
 2013-12-22 22:53:26 -08:00
titiger
372442d181 Render order changed to get better render results with units using 
semi-transparent textures.
 2013-12-22 01:36:54 +01:00
SoftCoder
e3996ceb92 - bugfixes for coverity reported issues 
- new bash parameters for build-mg.sh (in prep for coverity automation)
- updated travis build to use new bash param
 2013-12-17 17:35:51 -08:00
SoftCoder
a56eb83c91 - moved map path into config class 
- proper render performance calc compare
 2013-12-16 23:54:33 -08:00
SoftCoder
b8ab732b85 - cppcheck code cleanup 2013-12-14 18:07:22 -08:00
SoftCoder
b9d6b38e8f - coverity based bug fixes - round #1 2013-12-13 23:04:12 -08:00
SoftCoder
c91b92901b - added ignore folder 2013-12-11 19:18:33 -08:00
SoftCoder
a567fe159d - bugfix for headless mode segfault reported by titi 2013-12-11 19:07:24 -08:00
titiger
3bc5901a01 From Bugreport: cannot delete characters after clicking on player name in lobby 
https://forum.megaglest.org/index.php?topic=9302.0
 2013-12-10 01:52:08 +01:00
SoftCoder
b868a8468b - bugfixes to winner / loser logic to keep calculating stats and publish to masterserver after we determine a winner or loser as the game may not yet be fully over and we want accurate game stats on the masterserver. 2013-11-30 20:33:25 -08:00
SoftCoder
4b50560ca9 - added color picking used colors count in debug view 2013-11-30 17:38:32 -08:00
SoftCoder
2ff75c54e2 merged updates 2013-11-30 14:29:02 -08:00
SoftCoder
f217db38f1 - changed to git version stamp 2013-11-29 13:13:30 -08:00
Will
c6530c2783 merging in all Will's changes 2013-11-29 02:12:34 +01:00
Mark Vejvoda
8d040b9f63 - attempt to ensure color picking ALWAYS has unique colors 2013-11-25 07:26:23 +00:00
Mark Vejvoda
ceb799a66e - attempt to ensure color picking ALWAYS has unique colors 
- better handling of scenario's that are missing techtrees
 2013-11-24 04:44:12 +00:00
Mark Vejvoda
8414077d7a - bugfix for headless server's reporting of winning players and team. 
- masterserver returns proper JSON header now
 2013-11-22 21:17:38 +00:00
Mark Vejvoda
ab64b9343f - updated to support building with clang compiler (And cleaned up clang warnings from initial compile). Edit build-mg.sh and read the clang section as to how to build. 2013-11-19 21:57:28 +00:00
Mark Vejvoda
66761ba760 - code cleanup based on additional gcc warnings 2013-11-19 06:42:32 +00:00
Mark Vejvoda
9268aaf279 - a few minor bug fixes related to code warnings 
- code cleanup based on additional gcc warnings
- enabled additional gcc compiler warnings
 2013-11-19 06:14:06 +00:00
Mark Vejvoda
b3a9ad5411 fixed some vc++ compiler warnings 2013-11-14 13:56:05 +00:00
Mark Vejvoda
53eca42a11 - Disable performance warnings by default. To enable, either press ' in a game top toggle on/off or add this key: PerformanceWarningEnabled=true 
- refactor data compress into its own function
 2013-11-14 12:38:03 +00:00
Mark Vejvoda
5249ecc45d some code cleanup for xml parsing and loading saved games 2013-11-13 22:28:05 +00:00
Mark Vejvoda
94b8a346f2 bugfix to properly show render performance 2013-11-13 18:16:59 +00:00
Mark Vejvoda
feedde5f61 - streamlining fog of war unit cache 2013-11-11 22:11:13 +00:00
Mark Vejvoda
9625bd77a4 - attempt ot get fine details of performance bottlenecks 
- attempt to improve performance a bit
 2013-11-11 08:28:15 +00:00
Mark Vejvoda
f1abe148ea - bugfix for background crc thread shutdown 
- more performance monitoring and better output of only warnings
 2013-11-11 04:46:49 +00:00
Mark Vejvoda
8a7f686e33 updated to warn on console when performance is showing poor 2013-11-11 04:08:10 +00:00
Mark Vejvoda
d2494605e9 made performance info viewable by toggle key 2013-11-11 03:34:42 +00:00
Mark Vejvoda
ed94e9578c added performance info for various game sections using: ShowInGamePerformance=true 2013-11-11 01:42:27 +00:00
Mark Vejvoda
8ea6235495 ensure pre cache crc thread does not interfere with running game 2013-11-10 19:47:04 +00:00
Mark Vejvoda
b7a7d3bc4a ensure load saved games checks if new attribute exists 2013-11-07 05:20:02 +00:00
Mark Vejvoda
4a70fd09e2 added lua method to be able to allow or disallow speed change toggle 
void disableSpeedChange();
	void enableSpeedChange();
	bool getSpeedChangeEnabled();
 2013-11-07 05:18:21 +00:00
Mark Vejvoda
b190968e6b - bugfix for save / restore game (spelling mistake) 
- vc++ warning fixes
 2013-11-04 19:16:28 +00:00
Mark Vejvoda
8b5e681ae5 updated for vc++ 2012 x64 compile 2013-11-03 01:51:20 +00:00
Mark Vejvoda
9798668789 - added player platform to game stats 2013-11-02 19:05:59 +00:00
Mark Vejvoda
1d3859ff32 - windows x64 updates to get things compiling on vc2012 x64 2013-11-02 11:04:52 +00:00
Mark Vejvoda
9ef8076429 bugfix to ensure we set headless mode at game start so it can be saved on masterserver 2013-11-01 05:31:15 +00:00
Mark Vejvoda
77b9cbfb1d updated to set game stats before exit game check 2013-10-31 04:43:25 +00:00
Mark Vejvoda
7ad30f92bf - added game statistics gathering and saving on masterserver. 
see Table glestserver now has the field: gameUUID
Table glestgamestats has game header stats
Table glestgameplayerstats has game player stats
 2013-10-31 00:57:36 +00:00
Mark Vejvoda
d2ba7b163b a little refactoring of function names in language class 2013-10-29 06:13:38 +00:00
Mark Vejvoda
dda2f99e01 changed network CRC settings to FALSE by default and do NO network CRC checking unless explicity enabled: 
For Verbose logging: EnableNetworkGameSynchChecks
For Default Logging: EnableNetworkGameSynchMonitor
 2013-10-29 01:56:57 +00:00
Mark Vejvoda
ad0fb1d6f7 cleaned up code based on feedback from cppcheck 2013-10-25 05:45:54 +00:00
Mark Vejvoda
9224a7e242 - attempt to fix crc file bug 2013-10-18 15:47:17 +00:00
Mark Vejvoda
23552eb1a7 - bugfix for particles CRC calculation for oos 2013-10-18 04:55:29 +00:00
Mark Vejvoda
23963e537d - do not print out crc log info if disabled 2013-10-17 03:30:18 +00:00