Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,228 Commits
1 Branch
0 Tags
544 MiB
Commit Graph

12228 Commits (c6274f3d3367de16691beb9952b1acdebb730a6f)

Author SHA1 Message Date
Cyp c6274f3d33 widget: Make IntFormAnimate self-delete after closing. 
This eliminates boilerplate code growing in src/hci.cpp for each animated form.
 2013-02-28 10:07:36 +01:00
Cyp 6a71410927 widget: Replace intOpenPlainForm, intDisplayPlainForm and intClosePlainForm with IntFormAnimated class. 
Animation variables are no longer part of W_FORM.
 2013-02-28 08:29:08 +01:00
Cyp d372a818bd widget: Move widgSetReturn, screenSetFocus and screenClearFocus into W_SCREEN. 2013-02-27 10:59:22 +01:00
Cyp 050c3c105d widget: Simplify recursive widget logic and W_FORM/W_TABFORM special cases, remove unused variables. 
Restore black background on ally research bars, missing from second-last commit.
 2013-02-27 00:06:35 +01:00
Cyp eb3b88ac1d widget: Remove W_FORM::aColours and associated WZ_DECL_UNUSED PIELIGHT *pColours spam throughout the code. 2013-02-26 10:45:50 +01:00
Cyp c19c853b10 widget: Factor out usage of widgSetColour(), and remove it. 2013-02-26 00:24:53 +01:00
Cyp 258cc99ebd widget: Allow W_BUTTON to show images, without needing special display functions. 
Also, clean up password form.
 2013-02-25 19:25:05 +01:00
Cyp ff4aa35d5e widget: Make widgAddBlah() return the new object. 
Also, do #define nullptr NULL on pre-C++11 compilers.
 2013-02-24 10:28:04 +01:00
Cyp d87282ba96 widget: Remove no-longer-meaningful WIDG_MAXSTR. 
A QString generally isn't limited to 80 bytes.
 2013-02-24 10:06:51 +01:00
Cyp 07bb6f6246 widget: Replace displayMultiBut() with WzMultiButton class. 2013-02-20 09:50:21 +01:00
Cyp 873d5eff2a widget: Remove unused WIDGET::formID. 2013-02-19 22:58:58 +01:00
Cyp fcedae2fcf widget: Unduplicate more W_TABWIDGET code. 2013-02-19 19:33:33 +01:00
Cyp 002232ebd7 widget: Make W_TABFORMs less special. 2013-02-19 19:31:39 +01:00
Cyp a60f592fe1 widget: Replace WCLICK_GREY, WCLICK_LOCKED, WCLICK_CLICKLOCK with WBUT_DISABLE, WBUT_LOCK, WBUT_CLICKLOCK. 
This makes more sense than translating between them.
 2013-02-18 20:50:37 +01:00
Cyp f7de883d05 widget: Replace WBUTS_GREY, WBUTS_LOCKED, WBUTS_CLICKLOCK with WBUT_DISABLE, WBUT_LOCK, WBUT_CLICKLOCK. 
This makes more sense than translating between them.
 2013-02-18 18:35:07 +01:00
Cyp b173b57a36 widget: Convert WIDGET::x,y,width,height to member functions. 2013-02-18 09:05:01 +01:00
Cyp 8652eb2d96 widget: Remove unused widgSetTipFont(). 2013-02-17 09:04:28 +01:00
Cyp 16eecd8390 widget: Keep track of screen pointer, widgets are now safe to delete directly. 2013-02-17 09:02:08 +01:00
Cyp 2f5d244b4c widget: Convert WIDGET::display to virtual function. 
Fixes a sign error in tabVertOffset for WFORM_TABBOTTOM.
 2013-02-17 08:42:55 +01:00
Cyp b5a59a22c2 widget: Disable copy constructors/operators for WIDGET and W_SCREEN. 2013-02-16 11:47:43 +01:00
Cyp d93a799820 widget: Replace bitflag manipulation with WIDGET::show()/hide(). 2013-02-16 11:20:55 +01:00
Cyp e6652b2ca8 widget: Use new/delete instead of widgCreateScreen/widgReleaseScreen. 2013-02-16 08:44:47 +01:00
Cyp 292dca6ed8 widget: Replace WIDGET::psNext with WIDGET::childWidgets/parentWidget, move most clean up to ~WIDGET(). 2013-02-16 00:37:30 +01:00
Cyp b9f882da77 widget: Remove unused major tab tips. 2013-02-14 08:29:56 +01:00
Cyp f7a3c86ee5 widget: Remove unused psContext parameter in WIDGET::highlightLost() and replace widgRelease() with delete. 2013-02-14 00:46:39 +01:00
Cyp 3e73f13a57 widget: Partially unduplicate code for various tab orientations. 
Left and right tabs are not used, and may or may not actually work before and/or after this patch.
 2013-02-13 11:13:59 +01:00
Cyp 4fa3552838 widget: Remove unused minor tabs from tab forms. 
Tab forms had major and minor tabs, but only the major tabs were used, despite a lot of code all over the place for
handling minor tabs.
 2013-02-13 10:36:41 +01:00
Cyp f218c63f74 widget: Use new directly, internally. 
Unduplicated some code.
 2013-02-12 15:10:54 +01:00
Cyp 1286f91795 widget: Convert setTip functions to member functions. 2013-02-12 09:31:49 +01:00
Cyp 5eea4631f4 widget: Remove widgStartScreen/widgEndScreen. 
They did not seem useful, and widgStartScreen was only called from hci.cpp.
 2013-02-12 09:11:14 +01:00
Cyp ef30b48ddf widget: Remove unused and useless buttonStartUp(). 
No, a function which just does "return true;", and is never ever called is generally not considered useful. Not
even as a paperweight. Unless printed on something very heavy, then maybe it could actually function as a
paperweight. However, this commit comment is much longer than the function, so it would make a better paperweight
when printed.
 2013-02-12 08:49:11 +01:00
Cyp 0c85c628a3 widget: Use delete directly, internally. 2013-02-12 08:31:53 +01:00
Cyp 92349db0ca widget: Convert getString/setString functions to member functions. 2013-02-12 00:51:32 +01:00
Cyp 84e3461ffc widget: Use QString internally. 
Previously, some strings were stored in fixed length static arrays, and others were stored as pointers to the
original (uncopied) data.
 2013-02-12 00:08:37 +01:00
Cyp 57b5b680e0 widget: Convert setFlash functions to member functions. 2013-02-11 09:35:23 +01:00
Cyp 773e93365a widget: Convert getState/setState functions to member functions. 2013-02-11 09:26:17 +01:00
Cyp f959ffd496 widget: Refactor W_FORM virtual functions into W_TABFORM and W_CLICKFORM virtual functions. 
Instead of a huge if () checking if it's a W_TABFORM or W_CLICKFORM, just split the functions.
 2013-02-10 22:58:35 +01:00
Cyp c1cb8e4343 Merge branch 'bugfixes' 
Conflicts:
	src/ai.cpp
	src/combat.cpp
	src/mapgrid.cpp
	src/mapgrid.h
	src/projectile.cpp
	src/qtscriptfuncs.cpp
 2013-02-10 13:46:55 +01:00
per 7bd4da5cc9 Misc changes forward ported from GLM patch. 2013-02-09 21:37:50 +01:00
haoNoQ d5f3a2489c qtscript: Fix a typo in getDroidLimit player argument. 2013-02-09 23:12:14 +04:00
haoNoQ 0633524b76 qtscript: Fix a typo in structure health calculation. Fixes ticket:3930. 2013-02-09 22:31:57 +04:00
per c825e9bf7e Remove fallback mode. GLSL 1.20 or better is now required. 2013-02-09 14:18:56 +01:00
Cyp 5c7788784b Change gridStartIterate interface to safely allow recursive calls. 
Probably fixes ticket:3894.
 2013-02-09 12:33:00 +01:00
per 97ef0aee1b Draw GUI images cleanup. 2013-02-08 23:44:13 +01:00
per 6ed3ad8052 qtscript: Fix addLabel() coordinates. Closes ticket:3932. 2013-02-08 23:19:44 +01:00
automerge 17226ad172 Merge branch 'bugfixes' 2013-02-08 08:00:54 +01:00
per 933c099ec1 Add gDebugger / apitrace debug markers. Remove unused code. Do more 
aggressive caching of shader states.
 2013-02-07 21:48:21 +01:00
Cyp a0862274ae cpp: Remove old fixcppbuild script. 
Redundant since ea4e99a92d, as everything that should be compiled as C++ already is.
 2013-02-07 10:13:44 +01:00
Cyp 42ec6f160c newnet: Remove very-out-of-date newnet.TODO, since newnet is done. 2013-02-07 10:08:08 +01:00
Cyp 259e07ee77 Allocate joining players in topmost available slot. 2013-02-07 10:07:34 +01:00