01456b797c
further cleanup + fixed another shutdown order bug via h_force_close
...
This was SVN commit r1269.
2004-10-22 22:00:57 +00:00
6f114dcd5e
h_force_close support for sound shutdown issue
...
This was SVN commit r1268.
2004-10-22 21:58:03 +00:00
a8fff67c91
remove "p-pressed" debug_out
...
This was SVN commit r1267.
2004-10-22 21:54:31 +00:00
0f93e53e61
\n on debug_out
...
This was SVN commit r1266.
2004-10-21 15:08:10 +00:00
0a4c838185
Exciting space->tab transformations
...
This was SVN commit r1265.
2004-10-21 15:04:19 +00:00
27d52a8c45
WIP. have added some dox and armor-plated the lower-level components.
...
fixed shutdown order issue mentioned in task report.
further refactoring expected for vsrc_update et al (messy) and list_*
This was SVN commit r1264.
2004-10-20 23:18:52 +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
0540792825
add ERR_AGAIN error
...
This was SVN commit r1262.
2004-10-20 13:36:49 +00:00
1ef7ce088c
add support for forcibly closing cached files (needed when closing all active sounds before resetting openal)
...
This was SVN commit r1261.
2004-10-20 00:58:55 +00:00
0afc3c159d
trivialities: add extern, add assert to make sure oglInit called
...
This was SVN commit r1260.
2004-10-19 17:49:12 +00:00
d30c7ef9aa
use correct path to sound assets
...
This was SVN commit r1259.
2004-10-19 13:45:50 +00:00
8764693bd8
allow 0-length allocs without complaint (required when vfs_loading 0-length files, as happens with current art pack)
...
This was SVN commit r1258.
2004-10-19 13:29:51 +00:00
3c9823fd31
Don't override the printscreen key when the user's looking at some other program
...
This was SVN commit r1257.
2004-10-18 22:08:21 +00:00
34b553e2b2
remove ogg_display junk
...
This was SVN commit r1256.
2004-10-18 14:25:13 +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
e31edf4fb4
Fixed mouse-wheel zooming
...
This was SVN commit r1253.
2004-10-17 10:55:57 +00:00
b5d9f886a4
Don't complain when shutting down without having played a sound
...
This was SVN commit r1252.
2004-10-17 10:21:06 +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
f144aa0686
as per meeting today, disabled use of OpenAL ogg extension; wrote a quick, ugly, no-good hack to decode OGG files 'manually' (using vorbis)
...
(it doesn't stream, it loads the whole thing into memory - baad)
but the steaming pile seems to work! all is good ;)
This was SVN commit r1250.
2004-10-16 20:54:24 +00:00
d272a7ebb4
remove ofs field for vfs_start_io - never used
...
This was SVN commit r1249.
2004-10-16 20:52:18 +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
45ffe69f90
fix sign conversion bug (int -> size_t)
...
This was SVN commit r1241.
2004-10-15 13:42:13 +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
cd24c9c6f7
fixes for RES_UNIQUE (used by sound instances) - no longer add such handles to the h_find lookup data struct, because it can't handle several instances backed by the same file
...
This was SVN commit r1239.
2004-10-15 13:19:37 +00:00
6f2c1fbb8c
WIP; still tons of debug code
...
now theoretically supports 3d positional sound; solidified snd data
provider -> VSource code
This was SVN commit r1238.
2004-10-15 13:18:34 +00:00
Gee
fd91563f42
Sorry! Totally forgot to add the CInput.cpp/h
...
This was SVN commit r1237.
2004-10-14 21:01:13 +00:00
Gee
cdf7334d34
Added GetHeight()
...
This was SVN commit r1236.
2004-10-14 10:10:43 +00:00
Gee
5b74afce82
Added unifont_height...
...
This was SVN commit r1235.
2004-10-14 10:09:51 +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
Gee
c4684effb6
Progress bar added, and an optional attribute for the [icon] tags in text.
...
You can now displace an icon using: "[icon="smiley" displace="2 -3"]
I may rename it from 'displace' to something else if someone gives me a
good suggestion.
This was SVN commit r1232.
2004-10-14 02:32:26 +00:00
Calefaction
5275dc862b
Initial mini-map check-in
...
This was SVN commit r1230.
2004-10-08 01:10:14 +00:00
6b084c3173
Fixes to comply with VC2005.
...
This was SVN commit r1229.
2004-10-07 22:03:12 +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
442c6f315f
Added 'const' to appropriate bits of Xeromyces
...
This was SVN commit r1226.
2004-10-07 20:49:35 +00:00
2c9ac03375
Another minor fix
...
This was SVN commit r1225.
2004-10-07 20:14:20 +00:00
MarkT
6f10c954de
Missing JSCollection*. Oops.
...
This was SVN commit r1224.
2004-10-07 20:09:11 +00:00
53719430d1
Minor bug fixes
...
This was SVN commit r1223.
2004-10-07 20:02:58 +00:00
MarkT
3469e90636
Couple of files missing from previous commit.
...
This was SVN commit r1222.
2004-10-07 19:35:08 +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
notpete
e260a5eb8e
Support for recursive actor directories; few other minor changes.
...
This was SVN commit r1219.
2004-10-06 18:46:33 +00:00
notpete
17a4174505
Minor additional functionality.
...
This was SVN commit r1218.
2004-10-06 18:45:59 +00:00
notpete
81c829ec4c
Minor changes.
...
This was SVN commit r1217.
2004-10-06 18:44:47 +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
975344b515
less dependencies: handle.h forward-defines Handle, so that not everything that uses res headers is dependent on h_mgr
...
This was SVN commit r1215.
2004-10-06 14:12:10 +00:00
67d95dd3af
add ARRAY_SIZE
...
This was SVN commit r1214.
2004-10-06 14:11:55 +00:00
4f230f061d
less dependencies: handle.h forward-defines Handle, so that not everything that uses res headers is dependent on h_mgr
...
This was SVN commit r1213.
2004-10-06 14:00:43 +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
fecb8e38de
buggy, work-in-progress. can now again play sounds. basic culling/prioritization code in place.
...
This was SVN commit r1210.
2004-10-05 13:11:28 +00:00
7a0cf92c25
add RES_UNIQUE, required for sound code
...
This was SVN commit r1209.
2004-10-05 13:10:49 +00:00
13dfff0e12
removed unnecessary (unused) calc
...
This was SVN commit r1208.
2004-10-05 13:07:25 +00:00
10a81394ff
removed test rig crap
...
This was SVN commit r1207.
2004-10-03 23:28:57 +00:00
b6c1ad7126
had a look at CPU freq detect due to win32asm thread.
...
added comments + slight improvement (get system time first, then rdtsc)
=> good bit more accurate
This was SVN commit r1206.
2004-10-03 13:06:37 +00:00
cb11ff27c2
startServer() display corruption bug, bug #28
...
This was SVN commit r1202.
2004-09-28 16:01:11 +00:00
011666f393
Minor fixes for Linux/GCC
...
This was SVN commit r1201.
2004-09-26 21:21:34 +00:00
Calefaction
39501530d4
Updated to properly update material parameters.
...
This was SVN commit r1200.
2004-09-26 04:09:57 +00:00
Calefaction
4e93961f92
Minot change. The renderer now no longer does any work unless the game state is indicated as "started" by g_Game->IsGameStarted()
...
This was SVN commit r1199.
2004-09-26 04:05:35 +00:00
Calefaction
f888544789
*** empty log message ***
...
This was SVN commit r1198.
2004-09-24 03:52:32 +00:00
Calefaction
b1c269b72e
Complete materials checkin
...
This was SVN commit r1197.
2004-09-24 03:52:03 +00:00
7f962ea9c4
Fixed very minor bug
...
This was SVN commit r1196.
2004-09-23 13:23:42 +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
831053d680
Update to the material system
...
This was SVN commit r1193.
2004-09-23 05:10:03 +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
9c2fb5a466
stomped on vc2k5 warning (size_t -> uint)
...
This was SVN commit r1191.
2004-09-22 18:14:00 +00:00
df1b502bbd
Linux Compat and some updated PARANOIA code
...
This was SVN commit r1189.
2004-09-22 15:20:58 +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
7c157c5f90
Avoided minor for-scoping complaints
...
This was SVN commit r1187.
2004-09-22 11:51:43 +00:00
c28c5a1beb
fix of VC2k5 fix (both pointers to tokenized string are now char*)
...
This was SVN commit r1186.
2004-09-22 00:46:12 +00:00
4a7757dac6
VC2k5 fix: avoided ambiguous parameter naming
...
This was SVN commit r1185.
2004-09-21 22:11:33 +00:00
a1bd91d198
VC2k5 fix: don't keep converting char* -> const char* -> char*
...
This was SVN commit r1184.
2004-09-21 22:10:49 +00:00
0868b2ee6c
VC2k5 fix: strchr return value saved as const char* (cf Stu's CVS report #161 )
...
This was SVN commit r1183.
2004-09-21 18:43:58 +00:00
ff4af72da1
fix incorrect round up calculation
...
This was SVN commit r1182.
2004-09-21 16:59:50 +00:00
eb2989176e
startGame() shouldn't crash and burn if the game's already been started
...
This was SVN commit r1181.
2004-09-21 16:10:46 +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
6787a32b3c
potential vsnprintf buffer overflow
...
This was SVN commit r1179.
2004-09-21 14:35:30 +00:00
92ade065c3
vector<char> magic changed into a nicer std::string constructor (heap corruption induced paranoia =] )
...
This was SVN commit r1178.
2004-09-21 14:33:13 +00:00
a9075a887f
- Chat fix (server user didn't see his own text)
...
- Removed filter for Ctrl-Alt combinations (some pretty useful chars
like {[]} are on AltGr/CtrlAlt combinations here in Sweden)
This was SVN commit r1177.
2004-09-21 14:31:02 +00:00
8b2e918e05
cleanup + bulletproofing
...
This was SVN commit r1176.
2004-09-21 13:40:14 +00:00
dce92ce677
fix 2 stupid bugs causing crashes when loading from loose files - wasn't detecting all causes where transfers are unaligned => read rounded-up amount of data into original buffer as opposed to realign buffer => clobbered the heap.
...
This was SVN commit r1175.
2004-09-21 11:58:22 +00:00
7925a3fc4d
Avoid crashing when something minor that should never fail fails (though the cause of that failure is fairly major (but currently unknown))
...
This was SVN commit r1174.
2004-09-20 18:27:22 +00:00
ae2d42bbad
fix incorrect buffer free (now handled by ALBuffer); work in progress
...
This was SVN commit r1172.
2004-09-19 19:29:03 +00:00
85cf439f62
slight changes (memset IOSlot; if(.. < 0) -> CHECK_ERR)
...
This was SVN commit r1171.
2004-09-19 19:28:00 +00:00
b459e7e640
fixed debug_check_heap definition
...
This was SVN commit r1170.
2004-09-19 19:27:04 +00:00
ea9bd61195
now correctly set m_UnpackPos
...
This was SVN commit r1169.
2004-09-19 19:22:18 +00:00
69e9f3ef79
now stores its data in buffer, rather than copying to std::vector
...
This was SVN commit r1168.
2004-09-19 18:51:19 +00:00
a0f0215c15
fixed debug_check_heap definition
...
This was SVN commit r1167.
2004-09-19 18:45:04 +00:00
c3ed7df432
0 -> FALSE + add/removed debug code
...
This was SVN commit r1166.
2004-09-19 18:44:21 +00:00
1166c2a22c
workaround for stupid "void* -> unsigned cast" warning
...
This was SVN commit r1165.
2004-09-19 17:27:03 +00:00
022964c43b
moved low-level sound code to res/snd.cpp. CMusicPlayer is now an empty shell, pretty much; it will contain higher-level music logic (selecting track, fading in/out) implemented via snd calls
...
This was SVN commit r1164.
2004-09-19 16:01:41 +00:00
6fd0c451c2
changed to include sound code (test "rig")
...
This was SVN commit r1163.
2004-09-19 15:58:13 +00:00
cfe4562e6a
move low-level sound/music code from musicplayer to res/snd; also put oal.* in there
...
work in progress.
This was SVN commit r1162.
2004-09-19 15:57:20 +00:00
f6cfcd0555
slight change to interface (FileIO* vs simple void* output value) to simplify Zip interface (needed to change because now it has to store data of its own in IOs when doing partial reads)
...
This was SVN commit r1161.
2004-09-19 15:51:12 +00:00
5db49638cf
worked on partial zip reads. also changed to bring in line with file/vfs for slightly changed streaming interface
...
This was SVN commit r1160.
2004-09-19 15:49:46 +00:00
d3f452cd80
- add vfs_io_complete (wasn't in header) and vfs_size (convenience function)
...
- have vfs_load allocate the buffer, so mem_assign is no longer needed.
exposes buffer alignment requirement to VFS, but hey. simplifies things
a good bit.
- moved performance measuring crap to vfs_timed_io, a wrapper function
- various fixes for streaming code
This was SVN commit r1159.
2004-09-19 15:42:32 +00:00
b3a5bad377
fix 2 stupid h_mgr_shutdown bugs leading to failure to close some leaked handles at exit (see bug 26)
...
- was iterating over all HDATA slots up to last_in_use, but it is
inclusive
- when closing, wasn't resetting refcount, so h_free kept those with
refcount > 1 open
This was SVN commit r1158.
2004-09-19 13:46:38 +00:00
a872461a47
no longer 2 tex_write calls - just one that fills a TexInfo directly => no longer need mem_assign to wrap a pointer, only to dereference immediately thereafter
...
This was SVN commit r1157.
2004-09-19 13:43:53 +00:00
d46cf9cf1f
remove mem_assign and mem_assign_user (all call sites rewritten so that they're no longer needed)
...
still available in source, but shouldn't be necessary.
This was SVN commit r1156.
2004-09-19 13:41:49 +00:00
e4f160df27
fix headers: ogl_tex.h is user-level texture stuff, tex.h is only the texture loader.
...
this came up due to header change - some unnecessary stuff isn't
included by default anymore.
This was SVN commit r1155.
2004-09-19 11:57:51 +00:00
