gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity
16,562 Commits 1 Branch 39 Tags
a21
Commit Graph

47 Commits

Author SHA1 Message Date
leper 74c420f658 GUI code cleanup. Fixes #3354. 
Lots of code style fixes:
 * type [*&]varname -> type[*&] varname
 * else
   if (...)
   ->
   else if (...)
 * Spaces around some ops.
 * i++ -> ++i.
 * switch-case style fixes.
 * Indentation fixes.
 * Removing some commented out code.
 * include header sorting
 * Changed multiple pointer var declarations to be one per line.
 * Removed strange spaces in some places.
 * Changed some include header guards to be consistent with the rest of
the codebase.
 * Use UNUSED() instead of UNUSED2().

Some small code fixes:
 * Using .find() instead of .count() == 0.
 * !.empty() instead of .size() == 0.
 * Range-based for loops.
 * Making some member functions const by small changes.
   * Adds GetScrollBarPos(idx) const for this.
 * Using early returns/continues in some places.
 * Uses size_t for some loops in CList and COList.
 * Removes unused heading element (not attribute) from COList.
 * Use ENSURE in one case where some custom code did something similar.
 * Made some parameters const ptrs/refs.
 * Change removal loop in GUItext.cpp to erase-unique.
 * Made some static things const.
 * Allow iterating over children of IGUIObject with range-based for
loops by
   exposing begin() and end() (rename from ChildrenIt{Begin,End}()) and
use it.

Comments:
 * Comment COList.
 * Update a few comments.
 * Remove useless or duplicated comments.

This was SVN commit r16931.
 2015-08-21 17:08:41 +00:00
Itms caf89fa04e Rename ps/Overlay(.h|.cpp) to ps/Shapes(.h|.cpp), fixes a TODO located in graphics/Overlay.h. 
The file name did not match the content.

Also little cleanup of some unnecessary includes.

This was SVN commit r16431.
 2015-03-15 18:06:32 +00:00
leper 2c14d94559 Replace usage of CParser for CColor. 
Switches format to use integers only.
Adds logging if the string is invalid.
Refs #2589.

This was SVN commit r15278.
 2014-06-04 00:58:05 +00:00
JoshuaJB 5ce12c2263 Start phasing out the use of CParser in the GUI. Makes GUI parsing generally faster and stricter while adding better tests and debug information. 
This was SVN commit r15213.
 2014-05-25 03:16:52 +00:00
Ykkrosh 1f5b8f1c9a Move GUI renderer towards using shader infrastructure. 
Remove support for unused GUI sprite effects.
Use vertex arrays for bounding box rendering.

This was SVN commit r11039.
 2012-02-08 20:43:38 +00:00
Ykkrosh 04c63a4093 Clean up some text rendering to avoid relying on deprecated GL matrix state. 
Use scissor instead of deprecated clip planes for GUI text.
Remove unused support for generic font names.

This was SVN commit r10985.
 2012-01-29 20:04:21 +00:00
historic_bruno 67ca7461cd Adds Skip method to SGUIMessage which works more or less like wxEvent.Skip: GUI objects can allow other event handlers to process an input event after they finish. 
Allows hotkey handling of mousewheel events after minimap. Fixes #673.
Adds SendEvent to GUI objects, used in place of separate calls to
HandleMessage and ScriptEvent.

This was SVN commit r9340.
 2011-04-28 20:42:11 +00:00
Ykkrosh 30a6dbcb89 Fix uninitialised-value warnings 
This was SVN commit r7861.
 2010-08-06 14:15:08 +00:00
Ykkrosh 1706363bab Fix #423 (Switch from CppDoc to Doxygen), based on patch from anr. 
Also delete some unused declarations, and rename is_playing to
snd_is_playing.

This was SVN commit r7813.
 2010-07-29 15:55:41 +00:00
Ykkrosh 4ff8d8742c Partially support Unicode strings in GUI XML files 
This was SVN commit r7594.
 2010-05-30 13:11:32 +00:00
Ykkrosh c399dc277e # Rough first version of GUI redesign 
Minor GUI engine cleanups

This was SVN commit r7289.
 2010-01-27 19:20:34 +00:00
Ykkrosh caf2f72901 Cut down on some gratuitous memory allocations in the GUI 
This was SVN commit r7256.
 2010-01-07 19:00:56 +00:00
Ykkrosh f0d9806b3f # Restructured GUI implementation 
CGUI now represents a single 'page'. CGUIManager maintains multiple
pages and switches between them.
Split the XML files into pregame, loading, session and messagebox pages.
Added hotloading of GUI pages.
Minor GUI cleanups.
(Merge from hg 81862d33780c)

This was SVN commit r7214.
 2009-12-03 20:17:22 +00:00
sluzky 92637c1041 refactoring all PS_RESULT in GUI to PSRETURN/PSERROR 
closes #128

This was SVN commit r7147.
 2009-09-27 15:04:46 +00:00
sluzky 90f6641c1d Removing PS_RESULT errors from GUI, return values still need work 
Affects Ticket #128

This was SVN commit r7145.
 2009-09-23 21:16:55 +00:00
Ykkrosh 008d894dd7 Fix some GCC warnings 
This was SVN commit r7048.
 2009-07-28 16:59:19 +00:00
Ykkrosh c9fa7f13d9 Add GPL header 
This was SVN commit r6830.
 2009-04-18 17:00:33 +00:00
Ykkrosh 73884c1f09 Console: changed things so declaring variables while an entity is selected will no longer define a new property in that entity. Kind of broke the ability to access properties of the selected object without typing selection[0], due to other bugs. 
ScriptableComplex: added evil hack so iteration through properties works
with the new SpiderMonkey, which fixes the GUI scripts.

This was SVN commit r5185.
 2007-06-16 22:07:40 +00:00
Ykkrosh 5664f097d9 Profiler: Added malloc-counting to GCC. Fixed counting of unlogged allocations in the root node. 
GUI: Tried a tiny bit to improve the response to mouse movement.
Atlas: Realised you can do "new XML(...)" to parse XML.

This was SVN commit r5180.
 2007-06-15 17:03:26 +00:00
janwas b755ddefda remove all author/modified by tags. 
make include guards consistent.

This was SVN commit r5040.
 2007-05-07 16:33:24 +00:00
Ykkrosh 5f7855f7f0 Simplification of #Include paths: relative names are used only for included files in the same directory as the including file; everything else uses the full path relative to source/. 
This was SVN commit r3930.
 2006-06-02 02:10:27 +00:00
Ykkrosh 3d26549032 Fixed file properties - removed svn:executable and svn:keywords (left over from CVS conversion?) from all files; set svn:eol-style=native for *.cpp, *.h (and fixed files with inconsistent line endings) 
This was SVN commit r3802.
 2006-04-23 23:14:18 +00:00
olsner fcfa746244 Linux compat changes, fix for (really old) bug in VertexBufferManager shutdown, GUI header reorganization for gcc 4.0 
This was SVN commit r3437.
 2006-01-29 18:23:47 +00:00
Gee 727d2035d3 Changed <icon>'s property 'texture' to 'sprite'. Better late than never. Fixed a bug in the Input rendering code. Minor changes. 
This was SVN commit r2539.
 2005-07-25 00:52:03 +00:00
Gee 4113aa0a36 GUI Update. Mostly with Input Control Beta :) 
This was SVN commit r1904.
 2005-02-05 07:25:16 +00:00
Ykkrosh 31f0e62c83 Changed the add_color GUI sprite effect to use alpha=0 by default 
This was SVN commit r1625.
 2005-01-03 22:23:27 +00:00
olsner 46f5c61179 Linux/GCC/glibc Compat 
This was SVN commit r1532.
 2004-12-18 23:30:28 +00:00
Ykkrosh ba0ebd6644 Renamed icon-size/icon-id to cell-size/cell-id, and allowed cell-id to be used in <icon>s. 
Added <effect>s to sprites/images - currently multiply-color and
add-color, though they're far from perfect.

This was SVN commit r1525.
 2004-12-18 13:32:00 +00:00
Ykkrosh 8f4f8e240f Fixed things that use a colour rather than a texture (e.g. the progress bars). Also fixed the completely broken 'caching' system that recalculated everything every single frame. Also made it give linker errors if I ever make that mistake again. 
This was SVN commit r1518.
 2004-12-17 00:05:37 +00:00
Ykkrosh c19f3608a5 Initial changes to GUI sprite code. (There shouldn't be any visible effects - if there are, they're bugs) 
This was SVN commit r1507.
 2004-12-15 21:24:46 +00:00
Ykkrosh 6a04509455 Fixed Release-mode compilation 
This was SVN commit r1478.
 2004-12-09 16:09:58 +00:00
Gee f4b410ff82 A bunch of updates: 
- Added *unfinished* control input.
- The GUI captures the events now, so that you can't press anything in
the game if the GUI is infront of it. The GUI needs some cleaning up
though.
- Made the type 'empty' unpressable, because all those "0 0 100% 100%"
empties were just like pieces of glass making the user unable to select
anything in the game.
- A bunch of other updates I made like weeks ago and never committed.

This was SVN commit r1234.
 2004-10-14 10:09:26 +00:00
Ykkrosh 9b1127d82f Type checking in dangerous pointer-using code 
This was SVN commit r1113.
 2004-09-03 21:25:39 +00:00
Gee f2a615f0a3 Updates, mostly about centering text. 
This was SVN commit r1099.
 2004-09-02 03:02:32 +00:00
Gee 924b0bf1b4 Major fixes and updates. Let me know if I screwed up resolving conflicts. 
This was SVN commit r1085.
 2004-08-31 02:09:58 +00:00
janwas 4258ba245d while working on cstr, search and destroy made "CStr &x" -> "CStr& x". didn't intend to hit gui code, but ok :) 
This was SVN commit r534.
 2004-06-18 14:07:06 +00:00
Gee e326ebae46 major update 
This was SVN commit r290.
 2004-05-29 04:06:50 +00:00
janwas 5b5726ed4d merge of (work in progress) VFS code with new dir layout 
This was SVN commit r216.
 2004-05-06 17:14:30 +00:00
Gee a08cbd2f74 vc6 mods 
This was SVN commit r144.
 2003-12-27 07:23:47 +00:00
Gee e21ebb37f5 Major updates 
This was SVN commit r141.
 2003-12-27 06:26:03 +00:00
Gee 512bfd4067 no message 
This was SVN commit r128.
 2003-12-01 07:06:55 +00:00
Gee 953f72a91c no message 
This was SVN commit r94.
 2003-11-25 03:21:11 +00:00
Gee 6d86a928a3 no message 
This was SVN commit r92.
 2003-11-25 02:47:12 +00:00
Gee 90bbd48a14 no message 
This was SVN commit r77.
 2003-11-24 17:13:37 +00:00
Gee 5122b0f906 no message 
This was SVN commit r74.
 2003-11-24 02:18:41 +00:00
Gee 26b2ca3828 Added doxygen comments 
This was SVN commit r66.
 2003-11-18 10:00:57 +00:00
Gee c2a71e41bf Essential files for the GUI 
This was SVN commit r31.
 2003-11-06 00:21:45 +00:00