Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,860 Commits 1 Branch 0 Tags 27 MiB
339ff320cb
Commit Graph

524 Commits

Author SHA1 Message Date
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
08806c5416 *Finised Hp Bars 
*Added general settings in faction.xml
 2014-10-29 22:23:46 +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
titison
20a8011a46 first hp-bars 2014-10-26 21:34:14 +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
SoftCoder
b4807ed169 - in team mode always render two set of resources: 
- First set of resources is the team of selected units
  - SEcond set of resources is the team total
 2014-01-29 22:47:55 -08:00
SoftCoder
ce375073c1 - show team color asterisk in front of resources when displaying resources for an individual team member 2014-01-29 21:13:39 -08:00
SoftCoder
39696b6a65 - added ability to share resources across same teams 2014-01-27 18:55:08 -08:00
titiger
329805ac30 Merge branch 'master' of github.com:MegaGlest/megaglest-source 2013-12-30 16:20:03 +01:00
titiger
11eeed59a1 new attribute "render-size" in unit-type 2013-12-30 16:19:08 +01:00
SoftCoder
62821793c0 - moved core game data asset loading into lazy load methods to try to improve the startup speed of megaglest. 2013-12-27 22:00:29 -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
SoftCoder
da3c55c00b - bugfix, now support proper saving and reloading of games where attack boost is applied to units 2013-12-22 16:10:00 -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
titiger
9249d6370c looks like glEnable(GL_COLOR_MATERIAL); was still needed to render units properly 2013-12-18 21:35:04 +01:00
SoftCoder
d8160c1065 - modified game time to be game duration instead as that is more useful for players who want to see in game clock info 2013-12-17 13:26:58 -08:00
SoftCoder
d1f9fbc4a7 - cleanup warnings from clang 2013-12-15 09:19:24 -08:00
SoftCoder
f269273f07 - round #2 of coverity bug fixes 2013-12-14 22:37:15 -08:00
titiger
87f855b419 Very transparent parts of textures were cutted away while rendering. It turned out there is only a need to do this for shadows and selection rendering, not for real rendering. 2013-12-15 00:12:25 +01:00
SoftCoder
b9d6b38e8f - coverity based bug fixes - round #1 2013-12-13 23:04:12 -08:00
Will
6afadafa1e Start to abstract model 2013-12-05 16:17:41 +01: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
ccd6e19683 bug fix for font handling of newlines and added unit test 2013-11-14 00:23:01 +00:00
Mark Vejvoda
1067e89915 move text lower as it interferes with progress bar 2013-11-13 23:34:23 +00:00
Mark Vejvoda
41083f9f32 small cpp check cleanup 2013-11-12 02:30:26 +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
c6368b221e - added optional display of a frame count to help debug 2013-11-10 04:42:24 +00:00
Mark Vejvoda
095351c1a0 removed unused code 2013-11-09 16:51:00 +00:00
Mark Vejvoda
9b097fd911 decouple masterserver from network host game settings into two seperate threads 2013-11-07 18:39:08 +00:00
Mark Vejvoda
8b5e681ae5 updated for vc++ 2012 x64 compile 2013-11-03 01:51:20 +00:00
Mark Vejvoda
d2ba7b163b a little refactoring of function names in language class 2013-10-29 06:13:38 +00:00
Mark Vejvoda
8bbcdfbdb3 attempt to have mg shutdown cleanly when opengl version is too low 2013-10-28 18:27:51 +00:00
Titus Tscharntke
0b2d58f03b new icons for network player state 
labels can have a texture now
no more player coloring accroding to network state
 2013-10-27 16:13:27 +00:00
Titus Tscharntke
cc480e6bbd more menu changes ( still work in progress ) 2013-10-25 19:35:10 +00:00
Mark Vejvoda
ad0fb1d6f7 cleaned up code based on feedback from cppcheck 2013-10-25 05:45:54 +00:00
Titus Tscharntke
49451e1184 listboxes are rendered with dark background. 
listboxes can be "leftControlled"
 2013-10-23 23:11:18 +00:00
Titus Tscharntke
ea92fce58d little bugfix for last checkin 2013-10-23 20:33:00 +00:00
Titus Tscharntke
5c419a2713 Extended console is rendered with dark background 2013-10-23 20:23:21 +00:00
Mark Vejvoda
53a557d8d1 - fixed mod center image previews in cases where userdata folder was non default 
- removed commented out old code
 2013-10-03 05:44:50 +00:00
Mark Vejvoda
9e60723296 revert most doubles back to float and truncate at 6 decimals 2013-10-03 00:17:51 +00:00
Mark Vejvoda
dc503d6340 - attempt to see if this makes stability better 2013-10-02 20:22:10 +00:00
Mark Vejvoda
939e88ce38 - attempt to fix additional oos issues 2013-09-28 07:10:25 +00:00
Mark Vejvoda
9967df316c - attempt to fix additional oos issues 2013-09-28 05:06:04 +00:00
Mark Vejvoda
63ed244de2 - attempt to fix additional oos issues 2013-09-27 00:14:54 +00:00
Mark Vejvoda
37c2ace11a - rollback last commit 2013-09-26 16:37:32 +00:00
Mark Vejvoda
7349a1f126 - attempt to convert use of more floats to double 2013-09-25 15:40:19 +00:00
Mark Vejvoda
875eb95790 bugfix for particle cleanup 2013-09-24 03:44:15 +00:00
Titus Tscharntke
440ec7dd7e shadow intensity with better performance 2013-09-22 13:55:20 +00:00
Titus Tscharntke
416ccaae4b Shadow intensity can be set in video options. 
Tilesets can set their own default shadow intensity with <shadow-intensity value="0.3"/>.
ShadowAlpha is beeing removed form ini files
 2013-09-22 00:51:47 +00:00
Mark Vejvoda
f9c991edda add a guard for null texture and warning on console 2013-08-01 22:22:21 +00:00
Titus Tscharntke
511ba5134f default selection is colorpicking now 2013-06-20 21:42:01 +00:00
Mark Vejvoda
0ead6a36dc full support for translated techtrees 2013-06-13 08:55:48 +00:00
Titus Tscharntke
1f96dae8c7 tilesets can set default air unit heights 2013-06-13 07:34:32 +00:00
Mark Vejvoda
a8662c8b31 updated menus to display translated tech name 2013-06-13 01:37:15 +00:00
Mark Vejvoda
1e1676a34a more render improvements 2013-06-12 06:14:55 +00:00
Mark Vejvoda
a516b0eb0d more render improvements 2013-06-12 01:07:53 +00:00
Mark Vejvoda
929381e3ee see if this fixes the black flicker we sometimes see 2013-06-12 00:53:52 +00:00
Mark Vejvoda
55653c10b5 try to see if this affects performance? 2013-06-12 00:25:43 +00:00
Mark Vejvoda
668b34db8e more mad attempts to squeeze better performance 2013-06-11 06:44:26 +00:00
Titus Tscharntke
819622f40e I hope this fixes the black flickering when selecting units you sometimes see (this was very obvious with selectbuffer , but visible in colorpicking too ) 2013-06-03 23:09:02 +00:00
Mark Vejvoda
6cc8f6ac75 attempt to fix the model render not properly timed 2013-05-31 07:09:25 +00:00
Mark Vejvoda
995617e91e bugfix to allow admin to kick player in same slot multiple times 2013-05-28 07:10:13 +00:00
Mark Vejvoda
aa69a5818b added some new lua methods to determine day or night and new event 2013-05-25 20:46:36 +00:00
Titus Tscharntke
218c540bea In graphics option new screenmodes are "tested" now. 
Animate only a given number of objects in tilesets.
 2013-05-19 12:30:10 +00:00
Mark Vejvoda
8408526b12 code cleanup based on cppcheck results 2013-05-17 03:59:34 +00:00
Titus Tscharntke
db921c3fb7 attack enemy units even if you missed them and only hit the map cell. 2013-04-29 23:05:56 +00:00
Titus Tscharntke
d303170b3f colorpicking: first we render buildings then we render units. By this we can select units in or behind buildings with colorpicking. 2013-04-28 10:26:25 +00:00
Titus Tscharntke
6849d432bf colorpicking improved again and hopefully fixed false clicks on attacks ... ( works with low display resolutions too now) 2013-04-27 17:38:35 +00:00
Titus Tscharntke
9d3c99d6d0 Speed for colorpicking :-D. Its nearly as fast as selectbuf now . ( and tree selection for colorpicking is fixed ) 2013-04-25 23:12:34 +00:00
Titus Tscharntke
c8b6a9f410 fixed colorpicking selection for units in front of trees ( flying units above forests for example ) 2013-04-24 23:06:11 +00:00
Titus Tscharntke
e7907394de lighting of rotated tileset objects was wrong. 2013-03-14 21:16:16 +00:00
Mark Vejvoda
2210d48c49 - added a temp ini setting: DebugGameSynchUI=true 
to show all units in minimap to compare on two screens if the game is going out of synch.
 2013-03-10 00:40:38 +00:00
Mark Vejvoda
13665d58f1 - attempt to fix light sources handling as reported by tomreyn 
- allow speed up / slow down for network game as long as no-one is connected
 2013-02-26 20:48:20 +00:00
Mark Vejvoda
aca17684a7 - attempt to see if this fixes drawing of starting points for some bad video drivers 2013-02-12 20:47:46 +00:00
Titus Tscharntke
41671ac997 frustRum ->frustum 2013-02-11 22:51:36 +00:00
Mark Vejvoda
f87b8b6ee2 - updated code to protect against null pointers and uninitialized values and threading issues 2013-02-04 08:30:43 +00:00
Mark Vejvoda
3ccdd1a0c7 - updated windows exception handler to catch all error types 2013-02-01 05:26:07 +00:00
Titus Tscharntke
c5dd29f4ff new way to define the selectionType. No more use of EnableColorPicking and so on! 
allowed values are: selectbuf color frustrum

Default is selectbuf again as Colorpicking still makes trouble.
 2013-01-27 22:10:24 +00:00
Mark Vejvoda
8cd7aa0e43 - code cleanup from cppcheck 2013-01-25 02:55:28 +00:00
Mark Vejvoda
87b39a3cb5 - fix unit selection 2013-01-24 15:52:11 +00:00
Mark Vejvoda
d7d83f7c5e - attempt to speed up color picking 2013-01-23 23:20:54 +00:00
Mark Vejvoda
69568f5b1a - attempt to speed up color picking 2013-01-23 21:53:02 +00:00
Mark Vejvoda
93438d42f4 - attempt to see if this fixes units that do not attack when right clicking enemy 
- see if this fixes crashes when using color picking
 2013-01-23 21:03:00 +00:00
Mark Vejvoda
7ecc7325ac - trying to trace nig's crash (more debug info and safer code) 2013-01-23 14:51:28 +00:00
Mark Vejvoda
141f7eaa48 - cleanup some warnings in VC++ 
- more consistent project settings in vc++
 2013-01-23 06:53:55 +00:00
Mark Vejvoda
e7e5ac8987 - only render live units when picking selected units 2013-01-23 06:26:26 +00:00
Mark Vejvoda
7146a20976 - attempt to fix / improve performance of color picking 2013-01-22 04:30:06 +00:00
Mark Vejvoda
11392c69c9 - see if this speeds up color picking 2013-01-16 18:23:29 +00:00
Mark Vejvoda
ccb402d42e - fix build on windows 2013-01-16 17:51:31 +00:00
Mark Vejvoda
06a135301b - set color pciking as the default selection type. Possible ini entries are: 
EnableSelectBufPicking=true
EnableColorPicking=true
EnableFrustumPicking=true
 2013-01-16 17:13:51 +00:00
Mark Vejvoda
ce7982dc91 - see if this speeds up color picking 2013-01-16 16:58:28 +00:00
Mark Vejvoda
21f674abd9 - see if this fixes color picking 2013-01-15 03:34:01 +00:00
Mark Vejvoda
ceedef5200 - see if this fixes color picking 2013-01-15 03:18:26 +00:00
Mark Vejvoda
4d0811f0ec - update debug stats to remove unused items 
- disable interpolation when doing unit or resource selection
 2013-01-12 07:36:14 +00:00