1
0
forked from 0ad/0ad
Commit Graph

2852 Commits

Author SHA1 Message Date
f2b662d12d Build: generate Atlas project files (with "update-workspaces --atlas") (for VS2003 only).
Premake: allow slight separation of files' locations on disk vs in the
project tree.
Atlas: require fewer include directories.

This was SVN commit r2956.
2005-10-17 01:11:12 +00:00
953d2621dd timer: improved timer_add_client - no longer has fixed-size storage. btw, name will change here - not happy with SUM_TIMER.
GUI/input code: moved g_active, g_keys etc. into ps/Globals; it has its
own input handler as well

all users of fopen(): add file_make_full_native_path to get correct path
even though current dir = system/

This was SVN commit r2954.
2005-10-16 23:16:08 +00:00
62c5e311f2 All fixed to include new 3D meshes
This was SVN commit r2953.
2005-10-16 21:35:27 +00:00
8c0da64fe1 This was SVN commit r2952. 2005-10-16 21:33:01 +00:00
80434a8a12 Updated with new meshes
This was SVN commit r2951.
2005-10-16 21:22:39 +00:00
bcca0722b4 New 3D meshes for large reeds and crops.
This was SVN commit r2950.
2005-10-16 21:13:21 +00:00
499c073873 This was SVN commit r2949. 2005-10-16 21:12:37 +00:00
d5e292657c zoom limit: carry over value of 25 that andrew had tried to set in main.cpp
This was SVN commit r2947.
2005-10-16 04:31:19 +00:00
af70f0136b GameView: made file-scope data static (prevents accidental/evil use from other files and name collisions)
TextureEntry: add SUM_TIMER around base color calculation
Zip: add SUM_TIMER around inflate/memcpy

main: re-removed g_MaxZoomHeight - this doesn't belong in the message
loop. it resides in GameView.cpp

This was SVN commit r2945.
2005-10-15 21:15:33 +00:00
pyrolink
bf99370232 Lowered g_YMinOffset
This was SVN commit r2944.
2005-10-15 19:38:04 +00:00
0d5ce47915 Leonidas Hero
This was SVN commit r2943.
2005-10-15 04:15:02 +00:00
d7996c104a CInput: swapped direction of mouse-wheel scrolling.
wsdl: initialise handles such that wsdl_shutdown doesn't try to close
them if they remain unchanged.
GameSetup: made work in Atlas.
Renderer: fixed progressive loading of water textures.

This was SVN commit r2941.
2005-10-14 21:59:08 +00:00
6ff0cf4cab workaround: wdetect needs to call dir_open with absolute paths. we therefore allow this (disabling the full path conversion thing), but it's a hack.
wdbg: stripped SE_DEBUG_NAME test code (Not needed for now); also
improved breakpoint code (had a look over it).

This was SVN commit r2939.
2005-10-14 20:28:55 +00:00
Fire Giant
e049e0a60d Fixed positioning of new LOS control (TODO: split into FoW and Reveal check boxes)
This was SVN commit r2938.
2005-10-14 02:06:51 +00:00
Fire Giant
39dbc65a19 Updated session setup screen and some minor changes in shell GUI layout.
This was SVN commit r2937.
2005-10-13 20:04:22 +00:00
b6dfb8174f fix 64bit bug: wsdl defined SDL_Event.user.code as intptr_t, but real SDL doesn't. brought that in line and fixed GUIHotkey code.
config: proper detect for clock_gettime

file: file_rel_chdir -> file_set_root_dir; it no longer changes current
directory; instead, root dir is prepended to all paths (not that bad
perf-wise)

netlog: avoid a CRT assert if log file open failed. now that current dir
is no longer being set, we need to think about what will happen to the
logs - they either need to use file_make_full_native_path, or use the
entire file.cpp interface instead of fopen etc.

This was SVN commit r2936.
2005-10-13 19:11:22 +00:00
7b31f0372b GameView: move camera lock params here
wsdl: add proper event queuing mechanism (no longer requires hacky
polling for changes and avoids WM_USER)
rename keys[] and mouse_buttons to g_keys and g_mouse_buttons
fix flipped mouse wheel direction; wsdl now sends up AND down event
(removed 'reset' hack in main.cpp)
main: clean up event handler and kill_mainloop

This was SVN commit r2934.
2005-10-13 18:05:55 +00:00
991d6c438c Fix water renderer to fully specify its texture environment.
This was SVN commit r2932.
2005-10-13 15:46:31 +00:00
a6225ffa21 added a randomized texture
This was SVN commit r2931.
2005-10-13 09:10:43 +00:00
db4bb3a4d1 This was SVN commit r2930. 2005-10-13 09:09:47 +00:00
e95f2f4de4 New grass tall texture to randomize the grass
This was SVN commit r2929.
2005-10-13 08:53:09 +00:00
141c39ab91 Modified grass_field_lush_tall.xml to randomize a bit.
This was SVN commit r2928.
2005-10-13 08:52:31 +00:00
b950a98ffb pond-battle2.pmp and pond-battle2.xml are an update for the possible gamedev submission. This is for CheeZy to add his magic.
This was SVN commit r2927.
2005-10-13 07:44:42 +00:00
Dnas
82a8126002 Updated hele_[a-h]1.dds. and first commit! :-)
This was SVN commit r2926.
2005-10-13 07:29:35 +00:00
c153fb5c62 This was SVN commit r2925. 2005-10-13 07:25:37 +00:00
2cd06a66ae Fixed the hellenes/super_unit_1.xml actor to use the correct tunic mesh.
This was SVN commit r2924.
2005-10-13 01:56:53 +00:00
46c84a8b99 This was SVN commit r2923. 2005-10-13 01:44:05 +00:00
d30b9fdc23 This was SVN commit r2922. 2005-10-13 01:31:16 +00:00
2dae4ab373 This was SVN commit r2921. 2005-10-13 01:06:07 +00:00
0babbd8420 This was SVN commit r2920. 2005-10-13 00:46:04 +00:00
8435fb880c vfs_mount: bugfix: wasn't populating VFS from archive (cause of massive VFS slowdown recently). also fixed another overzealous validate check
ogl_tex: bind() implementation much simplified; also fix bug that set
TMU correctly when disabling texturing
wsdl: fix stdout.txt redirect; now works regardless of current
directory. also no longer disable file buffering except when in full
debug mode (because it's so slow). also add minimize button to caption
bar in windowed mode.

This was SVN commit r2919.
2005-10-12 23:48:44 +00:00
04654b4064 This was SVN commit r2918. 2005-10-12 21:32:10 +00:00
a1cddc4ac3 gameview, renderer: LoadWaterTextures is now a coroutine because it takes friggin forever (3 seconds). VFS performance is down by a factor of ten! investigating is on todo.
dyn_array.h -> allocators.h
ogl_tex: reenable performance warning
tex: comments
h_mgr: debug_printf if long filename is passed in (so we notice)
wsdl: squelch DestroyWindow warning. will look into the cause.
sysdep: slightly simplify "restrict" determination

This was SVN commit r2916.
2005-10-12 17:19:07 +00:00
deaaf5236c Fix build for g++
This was SVN commit r2915.
2005-10-12 16:27:23 +00:00
3c2d38502c dyn_array: added matrix allocator for convenience. renamed to "allocators.cpp" (now contains several of them)
LOSMananager: uses matrix allocator; free them in dtor

This was SVN commit r2914.
2005-10-12 15:51:26 +00:00
4285883f3d wdetect: changed gfx_card detect to hopefully support multiple adapters (now returns the primary)
file: add timer
h_mgr bugfix: h_force_free wasn't clearing refcnt
mem: add note on shutdown order
snd: bugfixes: VSrc_validate was overzealous (al_src == 0 is allowed);
sd->is_valid wasn't being set -> leaked AL buffers.
wsdl: remove overzealous ReleaseDC check (false alarm)
gamesetup: clarify (resource) shutdown order

This was SVN commit r2913.
2005-10-12 15:09:32 +00:00
dff64f6b96 Fix some broken links to props in the persian house xml file
This was SVN commit r2912.
2005-10-12 08:38:08 +00:00
906d0f31fa update with Ken's map and fixes for some bad unit meshes
This was SVN commit r2911.
2005-10-12 07:56:17 +00:00
c1ec44d751 ogl_tex: work around bug #69; greatly simplify upload implementation; add support for emulating s3tc
tex: add support for generating mipmaps in software (simplifies
ogl_tex_upload)
all codecs: change interface, adding "restrict" keyword; rename util
functions to tex_util
tex_dds: support for decompressing images with mipmaps included

This was SVN commit r2909.
2005-10-12 04:41:28 +00:00
b53e236a02 Greek Archers completed, Trader completed, Super Unit 2 is completed
This was SVN commit r2908.
2005-10-12 04:33:02 +00:00
e9864faa97 all resource implementations:
- add automatically called validate function
- make sure dtors correctly handle partial reload failures

all file code: IO routines renamed to io_* from *_io

h_mgr: add suballocator for filenames; some reorganization+cleanup;
better example code and added some notes to docs

snd: reorg to move resource methods next to struct

This was SVN commit r2907.
2005-10-12 04:35:01 +00:00
c498468fd0 wsdl(+main): add support for cleanly shutting down game if X clicked or Alt+F4 pressed. also cleanup; correctly declare SDL_Event
dyn_array: add pool allocator - see comments.
file(+gamesetup): add suballocator for aiocb (requires shutdown); revise
validator; rename file_*_io to file_io_*

This was SVN commit r2906.
2005-10-12 04:27:55 +00:00
ece006f43e sysdep: add restrict keyword (placebo if not supported)
gfx: extern "C"-ed
wtime, util, win, wdbg_sym: minor / commenting only
wdetect: don't skip gfx_card detect if buffer already filled
glext_funcs: remove obsolete defs

detect: call both OpenGL and platform-specific gfx_card detect; cleanup
vendor name to remove copyright/Inc crap

ogl: remove some variables that don't belong. moved vendor cleanup to
detect. moved S3TC emu code to ogl_tex

This was SVN commit r2905.
2005-10-12 04:22:44 +00:00
990e343ae6 renderer: load/unload water textures (similar to alpha maps); do that in delay load and avoid leaking them.
GUIrenderer: add oglSquelchError

lib.h: add feq() (checks for floating point equality); remove redundant
if from SAFE_DELETE
maths: use new feq()
Model*RData, VertexArray: fix trivial warnings

This was SVN commit r2904.
2005-10-12 04:16:41 +00:00
de5361047a Player colour rendering fallback now looks exactly the same as the fast path
again (using multi-pass).

This was SVN commit r2902.
2005-10-12 01:07:01 +00:00
7e7e0cd052 Demo map for Ken featuring all the completed art work so far of structures/units
This was SVN commit r2901.
2005-10-12 00:37:05 +00:00
30b80c032d Alexander Hero (hopefully I included everything)
This was SVN commit r2900.
2005-10-11 11:59:26 +00:00
8d37fba12f This was SVN commit r2899. 2005-10-11 05:22:18 +00:00
e05ca36bc5 Changed water color/depth/alpha again
This was SVN commit r2897.
2005-10-10 23:05:53 +00:00
1b59f4c56e Keep renderer in sync with simulation when running too slowly for the sim to keep up
This was SVN commit r2895.
2005-10-10 19:49:02 +00:00