ff35050d37
This was SVN commit r2725.
2005-09-14 19:43:16 +00:00
c6215a1451
guirenderer: fix bug that was breaking the ScEd button in main menu. it was calling glEnable/glActiveTextureUnit before ogl_tex_bind, which is now also doing that.
...
self_test: added another note
wtime: fix evil bug - was casting FILETIME* to u64*, which has different
alignment guarantees.
This was SVN commit r2662.
2005-09-04 19:48:26 +00:00
9ec828f6fd
- both tex.cpp and ogl_tex.cpp had functions named tex_* - confusing. renamed to ogl_tex* to disambiguate.
...
- ogl_tex_bind now supports multitexturing (avoids need to get id and
then bind manually)
- provide nicer API for querying texture properties (no longer one big
getter). improved GUI determination of texture alpha.
- renderer: another see-if-texture-has-alpha and fixed alpha map code
(wasn't checking if all are same size. only worked because the first map
was larger than the rest
This was SVN commit r2647.
2005-09-02 02:54:02 +00:00
b4ad393ee4
moved ps/X* to ps/XML/
...
premake: reflect 2 added and 1 removed source dir
add ps/Util - some helpful functions that were previously in main.cpp
This was SVN commit r2624.
2005-08-14 23:50:37 +00:00
dc027002c0
host of changes to accommodate Atlas:
...
- input.cpp allows feeding in events from the outside (will be used by
main.cpp and Atlas msg loop)
- most of main.cpp split into ps/GameSetup.*
- main.cpp is now a "controller" that drives the game via SDL events
(Atlas is another such controller that can override main.cpp). it calls
GameSetup functions to set up and processes messages.
- add functions to import AtlasUI.dll automatically
also, the usual refactoring ;)
This was SVN commit r2622.
2005-08-14 23:34:37 +00:00
4aa740bff5
- split up lib/res into file, graphics and sound.
...
- wposix.cpp: initial support for MEM_RESERVE and MEM_COMMIT semantics
in mmap
- cstr: removed no longer necessary serialization header
- xmlutils: wrap new() calls in nommgr/mmgr; allows tracking other
allocs in this file.
- add u64_from_u32
- various minor comments/improvements.
This was SVN commit r2604.
2005-08-12 17:06:53 +00:00
52ebd6ba11
scripting-interface improvements
...
- strict param count checks
- use ScriptingHost::RunMemScript instead of copy+pasted code
- replace duplicated parameter access code with macros
StringBuffer: use pointer instead of reference to allow
compiler-generated copy ctor
singleton: fix whitespace
This was SVN commit r2586.
2005-08-09 16:02:15 +00:00
a69ac0dee9
- fix w4 warnings
...
- add convenience macros for config_db(CFG_GET_SYS_VAL)
- VFSUtil::EnumDirEnts now uses flags instead of bool recursive
- UNUSED() for params, UNUSED2 (<- need better name) for variables
- config.h defines must be tested with #if (always defined) -> allows
detecting misspellings thanks to compiler warnings
- replace debug_assert(0) with debug_warn (its sole purpose)
- replace ScriptingHost::ValueToInt et al with ToPrimitive
- use nommgr.h to disable both mmgr and VC debug heap
This was SVN commit r2585.
2005-08-09 15:55:44 +00:00
pyrolink
2451e009d1
Added a line that had been somehow deleted and was causing errors.
...
This was SVN commit r2576.
2005-08-04 23:07:21 +00:00
pyrolink
7fb59c8471
Corrected the minimap's "interactive"/"warp" function so it works on all zooms and rotations.
...
This was SVN commit r2575.
2005-08-04 08:33:33 +00:00
pyrolink
8ae90b6fdb
Corrected the view rectangle for the minimap and added "interactivity" as well (click a point on the minimap, and the camera moves to that spot).
...
This was SVN commit r2572.
2005-07-31 23:54:19 +00:00
a18bb56add
Recognise alpha-channel DDS files in GUI
...
This was SVN commit r2562.
2005-07-29 03:18:41 +00:00
c3d42c1025
Fixed mmap bug, and GUI memory leak.
...
This was SVN commit r2560.
2005-07-28 17:39:27 +00:00
Gee
b1ef166bf3
Added support for customized colors.
...
This was SVN commit r2547.
2005-07-25 19:06:18 +00:00
Gee
b94c443037
Fixed so that you can have both types of tooltip (other-object 0 delay and pop-up non-zero delay) in the same environment. Haven't tested it that thorough, but hopefully all scenarios are covered.
...
This was SVN commit r2545.
2005-07-25 05:54:58 +00:00
Gee
f84cfcdf2a
Added default to <image size> ("0 0 100% 100%")
...
This was SVN commit r2543.
2005-07-25 04:48:13 +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
b5f6d19332
Lots of minor updates. Touched up the check-box quite a lot.
...
This was SVN commit r2532.
2005-07-24 08:29:02 +00:00
Gee
74e1c8a772
Text clipping
...
This was SVN commit r2527.
2005-07-24 00:01:41 +00:00
Gee
77c0ab074e
Someone had renamed a variable to one that already existed in a super-scope, this collided. Fixed it.
...
i.e. now the selection area is hid again.
This was SVN commit r2526.
2005-07-23 23:22:23 +00:00
Gee
fe087a73f7
Fixed some bugs, updated some things, etc etc
...
This was SVN commit r2523.
2005-07-23 22:27:55 +00:00
Gee
4d390f501c
Heads up, I changed "SelectionChanged" to "SelectionChange" for consistency, it should be read "on selection change", just like "on press".
...
This was SVN commit r2511.
2005-07-22 03:11:28 +00:00
Gee
abdc96b300
Default value for property 'selected' is now -1, i.e. no selection. Defining this value's default in the default style would be awkward.
...
This was SVN commit r2505.
2005-07-21 07:34:48 +00:00
Gee
8ebbb0bf35
Added IsRootParent function to check if the absolute property should be ignored or not.
...
This was SVN commit r2502.
2005-07-20 23:49:39 +00:00
Gee
c3cf031a52
Uncommented list, does anyone know why that has been done anyway? I can't even remember if I've done that or not. Also removed the annoying "Left click has been blocked" error in the log.
...
This was SVN commit r2498.
2005-07-20 05:27:32 +00:00
Gee
5f15ff3b2d
It is now valid for parentless objects to have absolute set to "false", this can be viewed as if the object were the screen's child, i.e., it doesn't matter if absolute is true or false if an object has got no parent, the property is ignored.
...
This was SVN commit r2495.
2005-07-20 03:52:09 +00:00
2ea40a23a3
VS2005 compatibility fixes and warning adjustments:
...
Updated DLLs.
Added DirectX headers/libraries, since they're not in the platform SDK.
Fixed invalid STL iterator usage.
Disabled STL in stack trace, since it breaks.
Added comments for some reported warnings.
Corrected some apparent off-by-one errors.
Defined strlen_s to strnlen.
Probably broke pre-beta2 versions of VC2005.
This was SVN commit r2454.
2005-07-02 21:42:55 +00:00
ec6b78b252
rename assert2 debug_assert; use instead of all plain assert(), since there are no longer any issues (e.g. can't use while handling an exception)
...
This was SVN commit r2447.
2005-06-28 04:06:25 +00:00
7577d224a6
Terrain XML loading, plus mouse/JS portability and some misc stuff to mix it up
...
This was SVN commit r2412.
2005-06-20 15:14:36 +00:00
92d221f183
Interact.cpp: Use double instead of float for storing absolute times (since the precision is required).
...
Atlas: Nicer handling of menus.
This was SVN commit r2400.
2005-06-17 23:14:06 +00:00
d24fd1b0c9
Use gl*ARB wherever possible. They are mapped onto the core gl* function if the driver's version is high enough, else onto the extension's gl*ARB function.
...
(Just for fun, compressed texture uploads are mapped onto a
decompression function if the user's system doesn't understand S3TC
textures.)
Corrected (unless I'm wrong) GL version identification logic.
This was SVN commit r2384.
2005-06-14 03:33:16 +00:00
4c16658a09
Updated autobuilder to maybe work.
...
This was SVN commit r2369.
2005-06-02 18:13:38 +00:00
b657a1cbca
Added CStr and some other things to precompiled.h, to reduce build times.
...
Altered CStr/UniDoubler's macros, to avoid polluting/conflicting/etc.
Fixed headers in non-PCH builds.
Used the _d version of vorbisfile*.lib in Debug builds.
This was SVN commit r2366.
2005-06-01 20:12:45 +00:00
982e051c54
Changed PSERROR to inherit from std::exception
...
This was SVN commit r2344.
2005-05-24 00:00:40 +00:00
21149d9fd0
Renamed translate() to I18n::translate(), to minimise conflicts
...
This was SVN commit r2334.
2005-05-22 22:58:27 +00:00
d0f7cb015c
- Linux/GCC (as usual :P)
...
- Ported lockless code to gcc inline assembly
- A few new net messages (gather, attack, add waypoint)
- Support for new messages in network->entity order converter
- Implemented rudimentary JS interface for Interaction
- issueCommand JS API, connected to the network
- Removed Interaction stuff now replaced by JS
- And something in there should probably break VS builds :P
This was SVN commit r2316.
2005-05-18 05:32:09 +00:00
7054957514
Minimap: Corrected orientation. Also cleaned up a bit, and fixed some inefficiencies.
...
Camera: Corrected code that wasn't doing what it looked like it was
doing, and was crashing JS "new Camera".
This was SVN commit r2302.
2005-05-13 01:15:53 +00:00
fd4eb91e93
debug_out -> debug_printf; MICROLOG moved to ps/Pyrogenesis.h
...
This was SVN commit r2285.
2005-05-11 18:56:30 +00:00
8aec300261
fix compile error: #include "GUIText.h" to define CGUIString
...
This was SVN commit r2175.
2005-04-26 20:29:28 +00:00
caf6915365
stomped on size() -> int warnings
...
This was SVN commit r2174.
2005-04-26 20:28:36 +00:00
Gee
4d367109c3
Added GUIList
...
This was SVN commit r2165.
2005-04-23 23:23:06 +00:00
Gee
15f951bfbc
CDropDown and the CGUIList type. This code is kind of rough around the edges as of yet. I'll work on it more.
...
This was SVN commit r2164.
2005-04-23 23:21:54 +00:00
Gee
15759ff4d7
Updated CList to fit JS interface, also added CDropDown in GUI.h
...
This was SVN commit r2163.
2005-04-23 23:20:50 +00:00
04e7b1b16a
fix warning (cast size() to int)
...
This was SVN commit r2149.
2005-04-19 17:02:57 +00:00
4c08a07052
Fixed warnings and bug. Updated binaries.
...
This was SVN commit r2136.
2005-04-15 22:40:15 +00:00
MarkT
2120576bc7
Gathering and unit training (engine-side); also other minor improvements
...
This was SVN commit r2132.
2005-04-15 04:23:33 +00:00
Gee
1302be8009
This was SVN commit r2116.
2005-04-07 09:14:09 +00:00
Gee
1e8d354404
This was SVN commit r2115.
2005-04-07 09:13:10 +00:00
0eb78450c0
Maybe fixed GUI event-handler function things. Other minor changes and fixes.
...
This was SVN commit r2096.
2005-03-30 22:33:10 +00:00
MarkT
bb7a22f32a
First draft of a GPG3-style profiler (including tracing into scripts, after a fashion)
...
This was SVN commit r2090.
2005-03-30 16:14:19 +00:00
9cc11918d3
Fixed small bug in GUI event-handler setting
...
This was SVN commit r2081.
2005-03-29 23:34:58 +00:00
249aaf436f
Allowed JS access to GUI object event handlers, via object.onPress etc.
...
Stopped crashes when ordering entities without bounding boxes.
This was SVN commit r2079.
2005-03-29 22:04:38 +00:00
b58a6339bb
Stopped undesirable loading-screen blending
...
This was SVN commit r2043.
2005-03-24 00:02:54 +00:00
ae172a9a01
Disabled mipmaps on GUI textures and cursors
...
This was SVN commit r1999.
2005-03-17 00:06:51 +00:00
e6c8cef293
types.h => lib/types.h (avoid name collision)
...
This was SVN commit r1935.
2005-02-26 15:13:15 +00:00
7134b17949
Fixed warnings, and made some minor changes for consistency with other code (wchar_t(' ') => L' ', and stack-allocated CFonts)
...
This was SVN commit r1908.
2005-02-05 14:53:06 +00:00
Gee
008f62b026
Removed temporary log output
...
This was SVN commit r1906.
2005-02-05 07:32:06 +00:00
Gee
4113aa0a36
GUI Update. Mostly with Input Control Beta :)
...
This was SVN commit r1904.
2005-02-05 07:25:16 +00:00
aca9ce6c3c
MiniMap GCC and crash bug fix as well as some miscellany
...
This was SVN commit r1896.
2005-02-02 17:03:37 +00:00
NoMonkey
0b903415dd
Player models now render shadows.
...
Viewing rectangle now moves with the camera on the mini-map and shows
it's FOV correctly. Currently it is a little out of place and possibly
out of scale as well.
This was SVN commit r1872.
2005-01-30 06:27:07 +00:00
4ed4a7e16d
Fix for the crash when a client connects, as well as some minor additions to client/server code
...
This was SVN commit r1861.
2005-01-29 16:51:13 +00:00
faff797cd6
include SDL or lib/input.h where needed (since lib.h no longer pulls it in)
...
input.h now includes SDL (no more macro hackery to avoid the dependency)
This was SVN commit r1837.
2005-01-27 15:31:06 +00:00
NoMonkey
d7b3d6b0c7
Added a new material, "player_trans.xml" which will give a model player color. So now if you want a player to be colored, just add this material!
...
This was SVN commit r1830.
2005-01-27 02:52:26 +00:00
NoMonkey
ed27392768
Made the minimap display the player colors and represent their positions correctly.
...
This was SVN commit r1821.
2005-01-26 00:19:17 +00:00
d29833e4ed
mouse_x/y => g_mouse_x/y
...
This was SVN commit r1767.
2005-01-23 17:35:36 +00:00
71e3b4e289
Allow clipboard pasting into input boxes (with the same hotkeys as the console - insert or ctrl+v)
...
This was SVN commit r1752.
2005-01-22 18:46:03 +00:00
2077698156
New JavaScript interface for the network client, plus some linux/gcc/misc fixes
...
This was SVN commit r1730.
2005-01-17 04:52:02 +00:00
38b30e5eb4
Corrected ICC errors and some warnings. Removed some unnecessarily verbose logging. Did minor things.
...
This was SVN commit r1718.
2005-01-13 00:17:31 +00:00
37d2d83a9d
Adjusted things to work with the new top-down orientation
...
This was SVN commit r1668.
2005-01-07 14:10:14 +00:00
f7e82dbc16
add ps/Errors.h and/or lib/types.h headers (shouldn't rely on precompiled.h to pull those in).
...
also prepended ps/ to make location clear.
This was SVN commit r1652.
2005-01-07 00:47:44 +00:00
bb8e24ec60
Corrected spelling
...
This was SVN commit r1637.
2005-01-04 22:07:17 +00:00
0de796c5ea
Send Load event to GUI objects after (instead of while) loading the rest of the engine
...
This was SVN commit r1635.
2005-01-04 21:51:23 +00:00
a61a961edd
Don't display blank tooltips
...
This was SVN commit r1634.
2005-01-04 21:37:51 +00:00
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
15bb170328
SessionStart event sent to GUI objects upon starting a game
...
This was SVN commit r1608.
2005-01-01 17:30:55 +00:00
f9c51d8ec7
Replaced - with _ in GUI
...
This was SVN commit r1604.
2005-01-01 12:06:17 +00:00
1c2acfed8c
CInput textcolor
...
This was SVN commit r1602.
2004-12-31 12:20:22 +00:00
9e2413acab
Allowed \\ in tooltip text. Fixed tooltips.
...
This was SVN commit r1587.
2004-12-28 13:13:27 +00:00
aab60e9ab8
Unbroke text-alignment buffer-zones. Allowed \n in tooltip text.
...
This was SVN commit r1585.
2004-12-28 12:38:45 +00:00
156ff7cf56
Minimal text-alignment ability in Text GUI objects
...
This was SVN commit r1584.
2004-12-28 12:17:04 +00:00
05c4ec0365
Alterations to ScEd, so that it almost works (except for saving/loading maps). Change the bottom of premake.lua if you want to build it.
...
This was SVN commit r1580.
2004-12-27 23:27:26 +00:00
7e004f07d3
Report zero-sized images as errors.
...
This was SVN commit r1566.
2004-12-23 23:14:47 +00:00
0382cdd9b1
More tooltip updates. Made the main menu buttons and the in-game resource counters use them.
...
Fixed space/tab inconsistencies in (though not between) GUI XML files.
This was SVN commit r1554.
2004-12-23 13:56:34 +00:00
28c7a682b8
Fixed annoying crash when SpiderMonkey's GC ran.
...
Minor tooltip updates.
This was SVN commit r1542.
2004-12-21 18:41:58 +00:00
659a9ea57a
Initial (incomplete) tooltip code
...
This was SVN commit r1540.
2004-12-21 13:37:24 +00:00
91d39f9a29
Allowed colour strings in XML files to contain negative values.
...
Updated GUI sprite effects to allow subtraction with add-color, and to
increase multiply-color's upper limit to allow 4x brightness.
This was SVN commit r1538.
2004-12-19 20:09:23 +00:00
4560c79667
'stretched:' sprites
...
This was SVN commit r1537.
2004-12-19 14:44:55 +00:00
849f50a500
Grayscale effects for GUI sprites
...
This was SVN commit r1536.
2004-12-19 12:20:04 +00:00
46f5c61179
Linux/GCC/glibc Compat
...
This was SVN commit r1532.
2004-12-18 23:30:28 +00:00
b291fafadb
Replace '_' with '-' when passing names through the GUI JS interface (so that object.cell_id is equivalent to object["cell-id"])
...
This was SVN commit r1526.
2004-12-18 14:24:50 +00:00
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
6526301cfe
GUI icon-sheets
...
This was SVN commit r1519.
2004-12-17 16:20:08 +00:00
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
b534e640ca
Resource leak fixes
...
This was SVN commit r1513.
2004-12-16 12:01:47 +00:00
855c00f6b8
Slightly tidied some small things
...
This was SVN commit r1510.
2004-12-16 00:47:12 +00:00
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
80b1876b77
Reduced GUI's exception usage (=> shortened debug-mode start time by a couple of seconds)
...
This was SVN commit r1494.
2004-12-13 12:07:12 +00:00
6d7d049d89
Attempted to minimise dependencies between header files (to make compilation minorly faster)
...
This was SVN commit r1490.
2004-12-12 19:43:55 +00:00
6a04509455
Fixed Release-mode compilation
...
This was SVN commit r1478.
2004-12-09 16:09:58 +00:00
e2062ccee1
Faster parsing
...
This was SVN commit r1477.
2004-12-08 18:15:39 +00:00
