ae0f4fa731
timer.h: require trailing ; after TIMER
...
wtime.cpp: fix comment
main: reorder includes, remove deadwood, rename a few functions for
consistency, moved config code together into one section, slight change
to system info text file (for new ogl driver detect code), remove
_control87 (see comment)
This was SVN commit r2392.
2005-06-16 21:50:20 +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
dd3c8f6fb5
Use the standard Singleton for CLogger, to fix problems with unordered shutdown
...
This was SVN commit r2383.
2005-06-13 19:31:48 +00:00
33a2f16ec3
remove sundry debug remnants
...
This was SVN commit r2375.
2005-06-05 05:07:22 +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
fd4eb91e93
debug_out -> debug_printf; MICROLOG moved to ps/Pyrogenesis.h
...
This was SVN commit r2285.
2005-05-11 18:56:30 +00:00
1ff0d112d2
revise loader return values - nicer interface now.
...
This was SVN commit r2281.
2005-05-11 04:39:21 +00:00
MarkT
86dc351205
Projectile code and updates to some actors that can use it (celt_ijv and hele_iar)
...
This was SVN commit r2266.
2005-05-10 07:13:25 +00:00
cab424ce81
Creating playlist sub-window to soon try out file access functions. (Committing in-development stuff to get an auto-build incorporating change to GUI .xml names.)
...
This was SVN commit r2214.
2005-05-02 22:04:29 +00:00
MarkT
bcabe3aa53
Script integration work - valueOf() is no longer required most of the time; also property-change watches and enumeration over entities (but not yet other native objects), rudimentary beginnings of a global events system, and adjusted the status orb to update only on changes.
...
This was SVN commit r2157.
2005-04-22 07:12:55 +00:00
771a9ba0dd
label each system_info field (because even I was getting confused :P). nicer network host/IP detect code
...
This was SVN commit r2150.
2005-04-19 17:04:12 +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
6a0b5fa0ab
ScEd: Added unit deletion. Made zoom less frustrating. Let >2 players work.
...
Fixed random actor props.
This was SVN commit r2109.
2005-04-03 05:02:00 +00:00
9d139926c9
file: provide FILE_TEXT flag that enables newline translation - useful when outputting XML files, so notepad doesn't see "\n" (which it can't handle)
...
vfs: no longer watch dirs when mounting - need to pass flag. allows
turning this off for screenshots dir (where hotloading doesn't make
sense)
vfs_tree: expand hash table when 3/4 full; 1/2 was quite wasteful.
main: do CPU init early, so timing during init can use TSCmain: do CPU
init early, so timing during init can use TSC
This was SVN commit r2098.
2005-04-29 13:17:17 +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
22dd4dd67b
Entities: Removed Tag attribute; it is taken from the filename instead. Made entity XML files be loaded on demand. Probably stopped crash when maps contain non-existent entities. Fixed a few bugs in entity definitions.
...
Maps: Stored non-entity objects in XML instead of PMP, for easier manual
editing. Updated existing maps to newest format, so that they can still
work. Added undocumented _rewriteMaps() JS function. Also renamed _mem
to vmem, and reclassified its undocumentedness as unintentional, since
it's reasonably useful.
Loader: added NonprogressiveLoad function, for ScEd/_rewriteMaps/etc
which don't care about progressiveness.
main.cpp: re-enabled vfs_display, since it doesn't crash now
Vector3D: stopped warning
This was SVN commit r2078.
2005-03-29 20:50:04 +00:00
MarkT
3c99f0f2eb
Minor JavaScript updates
...
This was SVN commit r2073.
2005-03-28 22:13:47 +00:00
204960c8ee
add vfs_init, shorten load timeslice
...
This was SVN commit r2059.
2005-03-27 01:47:36 +00:00
c11465cfbf
Updated actor references to use filenames instead of names, to allow more efficient loading. Added backward-compatible file support to the Actor Editor.
...
This was SVN commit r2049.
2005-03-25 23:04:36 +00:00
020645d583
Hacked up ScEd a bit, to disable its actor editor and to let users place entities (rather than actors) on the map.
...
This was SVN commit r2039.
2005-03-22 23:31:30 +00:00
f19d8dafee
improved update frequency and accuracy of progress bar (by splitting up more init functions).
...
also add thunk mechanism to ease binding to member functions;
finally, added instrumentation to measure how long functions really take
This was SVN commit r2038.
2005-03-22 21:00:56 +00:00
6d792365aa
rough but functional loading progress bar support.
...
numerous TODOs remaining - initial update instead of only after
completing first job; fix GUI overdraw issue; decrease granularity
(currently only 3 updates)
This was SVN commit r2033.
2005-03-22 02:17:55 +00:00
219509f00f
Fixed another missing posix.h. Documented a little bit of main.cpp.
...
This was SVN commit r2016.
2005-03-18 23:04:29 +00:00
eab88e4354
param to InitVfs made const (BTW, why check argc?); remove lib_init
...
This was SVN commit r2012.
2005-03-18 22:19:38 +00:00
19b3d2d388
rename oglExtAvail to oglHaveExtension
...
main.cpp: also provide for different screenshot file formats by passing
in extension
ogl.cpp: also add oglHaveVersion
This was SVN commit r1984.
2005-03-10 16:57:42 +00:00
56af3ca47d
Made lodbias and vsync config options work. Removed CHEEZY_NOMIPMAP (which forced mipmaps to be enabled), since it's evil.
...
This was SVN commit r1971.
2005-03-09 00:55:22 +00:00
f70703bc78
set sound master gain from config file (sound.mastergain)
...
This was SVN commit r1942.
2005-02-26 21:44:21 +00:00
Gee
5c8ed144ed
handlers section slightly updated.
...
This was SVN commit r1905.
2005-02-05 07:25:41 +00:00
880634b598
Small changes to ScEd, to remove some hacky bits and to make it not crash with player-colours
...
This was SVN commit r1899.
2005-02-04 23:16:42 +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
e372bd3f5a
Fixed probable mistyping. Removed apparently-unnecessary ScEd code.
...
This was SVN commit r1855.
2005-01-28 22:19:09 +00:00
f55107c114
sysdep: inline vsprintf2 definition (no need for printf.h)
...
win.cpp: remove hWnd (not needed for clipboard code) and TSC reference
(a temporary hack)
This was SVN commit r1840.
2005-01-27 15:50:11 +00:00
c12c6a0e4d
main: remove __try (non-portable). wdbg exception handler will cover it. if that needs to be debugged, add __try in win.cpp around call to main()
...
This was SVN commit r1817.
2005-01-25 18:56:43 +00:00
d29833e4ed
mouse_x/y => g_mouse_x/y
...
This was SVN commit r1767.
2005-01-23 17:35:36 +00:00
bcf89936c1
Fixed a few memory leaks as well as the CPlayer/SColour crash-on-exit bug
...
This was SVN commit r1756.
2005-01-23 01:36:47 +00:00
ae38aee3d2
Revamped CNetClient/CNetServer JS Interface and new CGameAttributes
...
implementation (moving towards a merger of CGameAttribs into CGame).
This was SVN commit r1746.
2005-01-19 22:32:25 +00:00
MarkT
25fdbfd931
Fixes for two pathfinding bugs (neither of which were actually pathfinding bugs), added player objects (details in TM)
...
This was SVN commit r1733.
2005-01-18 00:46:18 +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
4720a00f98
Made ScEd output entities into an XML file.
...
Added CStrW::utf8() (used by XMLWriter).
This was SVN commit r1716.
2005-01-12 14:31:47 +00:00
15fcf8f054
Neatened some debug messages. Changed main.cpp so ScEd can use it. Fixed minor inconsistencies and warnings.
...
This was SVN commit r1708.
2005-01-11 16:58:16 +00:00
fba99c3414
vfs: fix mounting archive contents - now relative to mount point as it should.
...
added flags to vfs_mount that enable looking for archives and mounting
subdirectories (previously always done, but slow)
main: uses above flags when mounting
This was SVN commit r1695.
2005-01-10 18:44:41 +00:00
56949e6fc4
lib: add big endian readers; add VC intrinsic bswap routines
...
tex: improve flip / bgr convert (now generalized "transforms"); add
support for transforming image before encoding
wsdl: add SDL_ShowCursor, minimize when tasking out
main: WriteScreenshot improved, fixes flipped screenshots
This was SVN commit r1689.
2005-01-09 14:23:59 +00:00
2077d4fd1d
timer.cpp: start FPS value = 60 => faster convergence
...
timer.h: TIMER uses debug_out
main/input: moved game_ticks to input.cpp (only used if input.cpp is
included)
This was SVN commit r1653.
2005-01-07 00:52:05 +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
f4fe8c8543
Sky colour, plus skycolor config value
...
This was SVN commit r1583.
2004-12-28 11:16:05 +00:00
c9d89e964b
Moved g_Gui.TickObjects to the main render loop and update the scheduler when no game is running
...
This was SVN commit r1531.
2004-12-18 23:25:58 +00:00
24abb51b59
First crack at loading screen (though need to figure out a way to move session loading to next frame to get it to actually stay on the screen). Some preliminary work on sub-windows.
...
This was SVN commit r1489.
2004-12-12 19:34:38 +00:00
9d317d8164
1) removed scaffolding from file
...
2) VFS: add path_copy convenience routine
3) various lib code: removed unnecessary const cluttering things (like
const char* _const_ name in param list)
This was SVN commit r1483.
2004-12-09 23:12:02 +00:00
cc02422908
1) TIMER added to timer.h (moved from main)
...
2) wposix: cache file status in struct dirent (Win32 specific)
3) vfs: speed up vfs_mount (via 2) and zip_cb path lookup caching
scheme)
4) temp scaffolding added to file.cpp to measure performance
This was SVN commit r1482.
2004-12-09 20:17:09 +00:00
f36008ac3b
added TIMER(name_of_block). it declares a scoped object that measures time between ctor and dtor, and is therefore perfect for measuring how long functions or basic blocks execute. used to gather results reported in "analysis: why is startup slow" thread.
...
also split out a few functions from Init() (more structured, easier
measuring)
This was SVN commit r1475.
2004-12-08 15:34:15 +00:00
643810a276
cleaned up VFS after yesterday's new code;
...
explicit shutdown, instead of atexit
This was SVN commit r1472.
2004-12-07 22:10:46 +00:00
e76871e7b0
- heavy changes to VFS tree internals: now allows loose files and archives to coexist, choosing archive if they're the same date+size
...
- reworked tree_lookup: dir names now require trailing '/' to
disambiguate. exception: vfs_open_dir (convenience)
- display VFS tree in stdout.txt unless g_Quickstart
This was SVN commit r1466.
2004-12-07 01:22:25 +00:00
e1506b6d3a
Removed unused Elvish
...
This was SVN commit r1462.
2004-12-07 00:17:14 +00:00
3fb241054f
add master sound disable, triggered if g_Quickstart == true.
...
(skips OpenAL init => speeds up startup)
This was SVN commit r1437.
2004-12-01 22:19:58 +00:00
f1dac9c626
better error handling: lots of little changes.
...
added some error codes, tried to eliminate unspecific return -1 where
it made sense.
This was SVN commit r1436.
2004-12-01 21:37:01 +00:00
b8d0df4b03
Re-enabled crash-dumping exception handler
...
This was SVN commit r1427.
2004-11-30 15:52:10 +00:00
caf8471132
Testing svk (and fixing tab usage)
...
This was SVN commit r1404.
2004-11-26 21:34:35 +00:00
d4f31c09da
replace detect() with individual routines; add sound card system_info;
...
add g_Quickstart that skips writing system_info (speeds up startup by
700ms)
This was SVN commit r1364.
2004-11-19 22:58:01 +00:00
c3a331b73f
add JS sound binding
...
This was SVN commit r1328.
2004-11-15 18:23:39 +00:00
Fire Giant
eb1424cb8f
Fixed a stupid typo (missing semicolon).
...
This was SVN commit r1315.
2004-11-14 21:16:39 +00:00
Fire Giant
a9fe8c0c61
Changed GUI load sequence in order to fix a problem which came up through the global objects being loaded before the main menu background object. The globals are now in 6_global.xml (should always be at the end of the load order) and the JS initialization now is in 1_init.xml.
...
This was SVN commit r1314.
2004-11-14 21:14:00 +00:00
fb09faf5be
Parser bug-fix
...
This was SVN commit r1313.
2004-11-14 18:56:13 +00:00
9a69d76feb
Minor update to add link to 5_atlas.xml, so that GUI development of the Atlas Editor is supported.
...
This was SVN commit r1303.
2004-11-11 23:51:52 +00:00
MarkT
793794649f
Combat code, some scripting, broken network, and fixed some bugs.
...
This was SVN commit r1301.
2004-11-11 07:09:32 +00:00
Calefaction
9b47d446d2
Updated to instansiate and tear down the mesh managed.
...
This was SVN commit r1300.
2004-11-08 22:21:50 +00:00
e48b5f9b64
enable file listing hook in ParseArgs
...
This was SVN commit r1287.
2004-11-07 22:46:57 +00:00
3136791492
Linux/GCC Compat(tm)
...
This was SVN commit r1284.
2004-11-07 21:30:47 +00:00
Calefaction
3c69a79f0f
Updated to output OpenGL version
...
This was SVN commit r1281.
2004-10-31 07:37:32 +00:00
Calefaction
955ddcf9a1
More programmable pipeline updates
...
This was SVN commit r1280.
2004-10-30 21:57:46 +00:00
Calefaction
7947293015
Initial programmable pipeline push
...
This was SVN commit r1272.
2004-10-23 18:13:54 +00:00
MarkT
d33d2e4450
Added some support for user profiles
...
This was SVN commit r1270.
2004-10-23 14:39:28 +00:00
a8fff67c91
remove "p-pressed" debug_out
...
This was SVN commit r1267.
2004-10-22 21:54:31 +00:00
0a4c838185
Exciting space->tab transformations
...
This was SVN commit r1265.
2004-10-21 15:04:19 +00:00
20061f0e38
due to h_allow_free, no longer rely on h_mgr cleaning up buffers (that was a hack, and wouldn't work if OpenAL is reset at runtime)_
...
now snd_cleanup before h_mgr_cleanup - makes sense anyway.
also added snd_update call that doesn't change OpenAL position - this is
so sound works in the main menu.
This was SVN commit r1263.
2004-10-20 23:16:38 +00:00
d30c7ef9aa
use correct path to sound assets
...
This was SVN commit r1259.
2004-10-19 13:45:50 +00:00
Calefaction
50dee130ae
Updated to properly support LOD bias settings in config. Fixes mipmap blurryness.
...
This was SVN commit r1254.
2004-10-17 21:01:00 +00:00
f0f7f236b7
sound test filename -> game data, since ogg playing works again.
...
This was SVN commit r1251.
2004-10-16 20:55:56 +00:00
90a0860081
Added load for 4_manual.xml.
...
This was SVN commit r1243.
2004-10-15 18:01:22 +00:00
1798a1ab1d
remove testing code that makes clicks do strange things ;)
...
This was SVN commit r1242.
2004-10-15 17:26:36 +00:00
390fe343a0
gives sound engine current position during update; also fixed sound shutdown order issue (must come after h_mgr_shutdown)
...
note: you will need to fiddle a bit to test this ATM: see
http://forums.wildfiregames.com/0ad/index.php?showtopic=1672 #5
This was SVN commit r1240.
2004-10-15 13:29:04 +00:00
769e521349
Added references to multiple GUI XML files (temporary adjustment to make it easier to work on different GUI pages).
...
This was SVN commit r1227.
2004-10-07 21:06:08 +00:00
2c9ac03375
Another minor fix
...
This was SVN commit r1225.
2004-10-07 20:14:20 +00:00
MarkT
2ab625720b
Fairly major XML/entprop changes; some more minor stuff that fell out as a consequence.
...
This was SVN commit r1220.
2004-10-07 19:23:35 +00:00
711118ee97
less dependencies: handle.h forward-defines Handle, so that not everything that uses res headers is dependent on h_mgr
...
This was SVN commit r1216.
2004-10-06 14:25:36 +00:00
53f8283cfc
update sound test rig, have added a few (local) filenames for testing
...
This was SVN commit r1212.
2004-10-05 13:14:34 +00:00
622febf5b7
update sound test rig, have added a few (local) filenames for testing
...
This was SVN commit r1211.
2004-10-05 13:14:03 +00:00
6d4f94112d
Fixed memory leak
...
This was SVN commit r1195.
2004-09-23 12:42:37 +00:00
Calefaction
0a05c2977a
Updated to reflect MaterialManager
...
This was SVN commit r1194.
2004-09-23 05:21:18 +00:00
Calefaction
4fff66cfce
Initial import of material code. MaterialReader is implemented and functional. Currently models do not attempt to load materials, nor does the renderer use them.
...
This was SVN commit r1192.
2004-09-23 04:00:56 +00:00
ab7b542c20
console height now relative to y resolution instead of always 600 pixels
...
This was SVN commit r1188.
2004-09-22 14:01:50 +00:00
777f06143d
- A lot of small network fixes
...
- Connecting client(s) to a server and giving orders to a shared set of
entities now works - Yeah!
- Removed thread sync from CNetServer
This was SVN commit r1180.
2004-09-21 14:40:43 +00:00
6fd0c451c2
changed to include sound code (test "rig")
...
This was SVN commit r1163.
2004-09-19 15:58:13 +00:00
d373e7a559
Moved language selection into the .cfg file
...
This was SVN commit r1130.
2004-09-06 11:13:36 +00:00
959600b0d1
Removed FPS display
...
This was SVN commit r1121.
2004-09-05 11:27:23 +00:00
Gee
ec7ace7016
no message
...
This was SVN commit r1108.
2004-09-03 05:49:20 +00:00
756c89d85d
Removed GUI TEMPmessage
...
This was SVN commit r1104.
2004-09-02 19:18:14 +00:00
Gee
51b5254a9d
Added a GUI file to load
...
This was SVN commit r1086.
2004-08-31 02:10:40 +00:00
70d84beab2
Altered font handling -- now uses CFont in preference to unifont_* (yay, pointless OO) and allows font mapping ("default"=>"palatino12", etc) using .cfg files
...
This was SVN commit r1074.
2004-08-27 22:08:30 +00:00