Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity
2,804 Commits 5 Branches 28 Tags 13 GiB
5c9501830c
Commit Graph

142 Commits

Author SHA1 Message Date
Matei
f5613e74c8 Changed water color to Jason's dark blue. 
This was SVN commit r2792.
 2005-09-28 05:53:22 +00:00
Matei
b7c04793f4 Updated water to use black-and-white texture and mix it with material color, allowing water color to be changed. 
This was SVN commit r2786.
 2005-09-27 23:14:08 +00:00
Matei
f2cae8cb9b Added animated water. 
This was SVN commit r2783.
 2005-09-27 18:17:45 +00:00
prefect
1c71c72e74 Fix for Linux build: 
Header filenames in #include are case sensitive

This was SVN commit r2764.
 2005-09-25 21:17:35 +00:00
janwas
37e9fc0388 - update load times 
- config: add proper HAVE_ macro for string_s functions rather than
checking MSC ver directly
- string_s: disable parts of the self-test that trigger errors if not
using the string_s.cpp implementation

This was SVN commit r2760.
 2005-09-21 16:42:56 +00:00
janwas
13501cf58b hook up emulate_glCompressedTexImage2D to new tex transform code (which takes care of DDS unpack) 
to that end, provide support for "wrapping" existing textures so that
tex_* and ogl_tex* calls may be used.

also have renderer use ogl_tex for its created-on-the-fly composite
alpha texture
also named atlas's thread (for fun+profit during debugging)

This was SVN commit r2754.
 2005-09-19 22:48:20 +00:00
Matei
603c475cf0 This was SVN commit r2749. 2005-09-18 06:28:23 +00:00
Matei
e5dea3e5a1 Water source code :|. 
This was SVN commit r2746.
 2005-09-18 03:47:15 +00:00
olsner
a0a01e7a7d Linux/GCC Compat, added some includes, ported inline assembly stuff to gnu syntax (and misc. cleanup in ia32.cpp) 
This was SVN commit r2702.
 2005-09-12 23:37:52 +00:00
Matei
6f10e8c09c Updated building placement cursor to make the object glow read and not be placeable if trying to place in an invalid area. 
Also a small fix: made the selection bandbox not appear when the view is
being rotated using left+right drag (it doesn't make sense to show it
then).

This was SVN commit r2674.
 2005-09-06 08:25:41 +00:00
janwas
21709a5a7a (as before, belonged in the previous batches) 
This was SVN commit r2649.
 2005-09-02 02:58:40 +00:00
janwas
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
janwas
0e20c08969 waio: fix spurious WARN_ERR 
vfs: integrate hotload code
fixed a few warnings as well.

This was SVN commit r2609.
 2005-08-13 17:09:57 +00:00
janwas
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
janwas
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
Ykkrosh
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
janwas
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
Ykkrosh
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
Ykkrosh
0331883a86 Temporary fix for mouse input. Improved performance in player-colour model renderer. Also improved performance in lighting, at least in unoptimised builds. 
This was SVN commit r2328.
 2005-05-20 17:09:47 +00:00
janwas
fd4eb91e93 debug_out -> debug_printf; MICROLOG moved to ps/Pyrogenesis.h 
This was SVN commit r2285.
 2005-05-11 18:56:30 +00:00
janwas
f0e311440e all functions called via delay-load mechanism now return int (allows closures that can interrupt themselves when time is up) 
This was SVN commit r2231.
 2005-05-03 21:36:57 +00:00
Ykkrosh
d2948937a0 Fixed prop player-colouring. Allowed per-object colours. (Coming soon: data to demonstrate it.) 
This was SVN commit r2113.
 2005-04-07 04:29:07 +00:00
janwas
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
janwas
308535d58d add instrumentation to see what's slow when starting a session 
renderer: also move list of alpha maps here from InitResources

This was SVN commit r2007.
 2005-03-18 22:02:20 +00:00
janwas
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
Ykkrosh
3b1395d80b Optimised game-loading, by not reading terrain textures or calculating bounding boxes when not necessary; maps load about twenty seconds faster (at least in Debug mode). Also fixed possible minor bug (FLT_MIN vs -FLT_MAX) and other trivial things. 
This was SVN commit r1917.
 2005-02-09 23:19:48 +00:00
olsner
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
983ddb2283 Just submitting a few optimizations to the player renderer and the executables for all the non-programmers :) 
This was SVN commit r1873.
 2005-01-30 06:49:51 +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
Ykkrosh
39389b7bb2 Proper blending for player-colours 
This was SVN commit r1847.
 2005-01-28 15:38:49 +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
8192c5b1c5 This was SVN commit r1810. 2005-01-25 03:27:38 +00:00
NoMonkey
f96b676fc9 This was SVN commit r1809. 2005-01-25 03:12:04 +00:00
NoMonkey
b2e50cfea9 This was SVN commit r1805. 2005-01-24 08:28:03 +00:00
NoMonkey
bdafae6453 This was SVN commit r1804. 2005-01-24 06:33:20 +00:00
NoMonkey
761dfde0c5 This was SVN commit r1803. 2005-01-24 06:14:13 +00:00
NoMonkey
85ed304a25 This was SVN commit r1798. 2005-01-23 23:04:00 +00:00
Ykkrosh
225446d648 Alternative player-colour rendering, which probably works with lights 
This was SVN commit r1792.
 2005-01-23 22:02:36 +00:00
Ykkrosh
113d89e148 Possible texture environment code for single-pass player-colour rendering 
This was SVN commit r1754.
 2005-01-22 21:25:27 +00:00
olsner
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
janwas
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
Ykkrosh
a84351441e Fixed invalid GL commands (as complained about by 82845G drivers) 
This was SVN commit r1612.
 2005-01-02 00:26:48 +00:00
Ykkrosh
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
Ykkrosh
465ceff912 More leak fixes 
This was SVN commit r1514.
 2004-12-16 12:41:54 +00:00
Ykkrosh
b534e640ca Resource leak fixes 
This was SVN commit r1513.
 2004-12-16 12:01:47 +00:00
Ykkrosh
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
Ykkrosh
aa1442e8f8 Fix for mesh manager crashes (plus some parts of Boost, which may be a little excessive) 
This was SVN commit r1488.
 2004-12-12 18:40:00 +00:00
janwas
77196dbe06 less dependencies on res/res.h in headers (a bad thing) => less recompiles when I change vfs.h :) 
This was SVN commit r1467.
 2004-12-07 02:04:38 +00:00
Calefaction
efe4673f15 Removed, no longer needed. GLSL replacement coming. 
This was SVN commit r1298.
 2004-11-08 22:10:30 +00:00
Calefaction
11900f8b38 *** empty log message *** 
This was SVN commit r1297.
 2004-11-08 22:10:06 +00:00
olsner
3136791492 Linux/GCC Compat(tm) 
This was SVN commit r1284.
 2004-11-07 21:30:47 +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
Ykkrosh
0a4c838185 Exciting space->tab transformations 
This was SVN commit r1265.
 2004-10-21 15:04:19 +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
notpete
81c829ec4c Minor changes. 
This was SVN commit r1217.
 2004-10-06 18:44:47 +00:00
olsner
cb11ff27c2 startServer() display corruption bug, bug #28 
This was SVN commit r1202.
 2004-09-28 16:01:11 +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
janwas
18e016578d fix tex_load return value check - Handle invalid <==> <= 0 
This was SVN commit r1153.
 2004-09-19 11:39:47 +00:00
janwas
167a077bc2 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 r1152.
 2004-09-19 11:38:54 +00:00
Ykkrosh
5a3c99d506 Removed some debug logging, since the bug seems to have been successfully removed 
This was SVN commit r1075.
 2004-08-27 22:10:25 +00:00
Ykkrosh
9cd4cab693 A few log categories 
This was SVN commit r994.
 2004-08-15 20:57:31 +00:00
Ykkrosh
138df056bd Fixed invalid GL code 
This was SVN commit r924.
 2004-08-06 15:01:23 +00:00
Ykkrosh
5390ff46ae Hopefully fixed the infinitely annoying graphics crashes (#1, #3, #9, #10, #14 on the bug tracker) 
This was SVN commit r922.
 2004-08-06 11:26:30 +00:00
olsner
b2afef529c Introducing: The Pre-Game State. The game instance is not created on program load as before, but can be started by JS functions. 
This was SVN commit r912.
 2004-08-05 13:07:51 +00:00
Ykkrosh
fe1bee706b Fixed loads of /W4 warnings, because it's easier than doing anything useful. Added some asserts to check potentially dangerous assumptions, implemented a few missing bits of code, adjusted some comments, etc. 
This was SVN commit r814.
 2004-07-24 14:04:40 +00:00
MarkT
6d8b9e33ef Minor additions: Added hotkeys to GUI buttons, camera bookmarking (not sure if this system will stay), shoring up some JS error checking, moved a bunch of constants into the config file and added a new rotation mode. 
This was SVN commit r804.
 2004-07-22 16:18:12 +00:00
Ykkrosh
f171a2faf0 Fixed something that looked a bit like a bug. Added controlled crashing when VBO creation fails (though it doesn't seem to help at all). 
This was SVN commit r791.
 2004-07-21 11:50:23 +00:00
Ykkrosh
b61b1e805c Better error handling! Wow! 
This was SVN commit r778.
 2004-07-19 19:05:34 +00:00
Ykkrosh
d0ba052464 Fixed subtle bug 
This was SVN commit r772.
 2004-07-18 16:06:10 +00:00
Ykkrosh
82de48832e MICROLOG function for high-speed logging of everything that happened just before a crash 
This was SVN commit r761.
 2004-07-15 19:29:56 +00:00
Ykkrosh
c62940201f Removed trailing newlines in log messages 
This was SVN commit r705.
 2004-07-11 16:05:58 +00:00
Ykkrosh
561299f899 Memory leak fix 
This was SVN commit r565.
 2004-06-19 20:54:36 +00:00
janwas
5cca6d753a found GL error by adding oglPrintError everywhere; now removed agian 
This was SVN commit r511.
 2004-06-15 02:43:38 +00:00
janwas
614420615e walk freelist and free the chunks (fixes mem leak) 
This was SVN commit r510.
 2004-06-14 16:01:38 +00:00
janwas
99b30d61ec added dtor to eliminate vertexbuffer mem leak 
This was SVN commit r509.
 2004-06-14 16:00:14 +00:00
janwas
15ca5cbf21 newline stomper and fixed warnings 
This was SVN commit r473.
 2004-06-11 02:14:18 +00:00
MarkT
e4fe4ed602 JS Interface to entities. It even partially works now. 
This was SVN commit r469.
 2004-06-10 22:24:03 +00:00
notpete
c61144cc84 Redundant; removed. 
This was SVN commit r428.
 2004-06-08 18:50:58 +00:00
janwas
e4378ffbdc added precompiled.h. these need to be newline-fixed also! 
This was SVN commit r421.
 2004-06-08 11:50:52 +00:00
notpete
a7d0c194ad Reworked model and terrain rendering to use new VertexBuffer classes; many other smaller changes. 
This was SVN commit r411.
 2004-06-07 19:53:58 +00:00
notpete
4f8ce4b1d4 Initial revision. 
This was SVN commit r410.
 2004-06-07 19:52:37 +00:00
janwas
cd3755b935 added headers (needed if !HAVE_PCH) 
This was SVN commit r398.
 2004-06-04 17:23:39 +00:00
janwas
c7a84e84be added precompiled.h everywhere 
This was SVN commit r392.
 2004-06-03 18:38:14 +00:00
MarkT
d32be2011f Pathfinding tweaks; coldet fixes. 
This was SVN commit r379.
 2004-06-03 02:20:48 +00:00
janwas
3abf9ac4b5 lots of type fixes; types.h is now a convenience wrapper on top of the standard uintN_t routines 
This was SVN commit r334.
 2004-06-01 17:34:12 +00:00
janwas
1eaadd38aa ran everything though mark's newline stomper. 
This was SVN commit r322.
 2004-05-30 00:46:58 +00:00
notpete
2d0ce81aee Optimistic bogus newline fix. 
This was SVN commit r317.
 2004-05-29 23:35:46 +00:00
notpete
2cbc27174c Moved from terrain directory. 
This was SVN commit r304.
 2004-05-29 20:53:40 +00:00
notpete
e5108b095f Initial revision; placeholder hardware p-buffers. Needs major revision or replacement. 
This was SVN commit r303.
 2004-05-29 20:52:58 +00:00
notpete
6f20408595 Moved from terrain; contains a whole load of changes related to shadows, props and animation. 
This was SVN commit r302.
 2004-05-29 20:51:42 +00:00