]> icculus.org git repositories - divverent/nexuiz.git/commit
projects / divverent / nexuiz.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8c06c9e) | patch
trunk->branch merge:
authordiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Thu, 29 Nov 2007 07:56:24 +0000 (07:56 +0000)
committerdiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Thu, 29 Nov 2007 07:56:24 +0000 (07:56 +0000)
commit20c103582c535c5dbb5ad62d4566daf451cb71d2
tree03d1d8ad4d2c5cf47a6bfa68afc7cb679ce30376tree
parent8c06c9e84b1c6c00745ed02dcf25d111e5399755commit | diff
trunk->branch merge:
- worldspawn() fixes for precaching
- tuned speed rune
- improved evil1_metals
- Onslaught and Assault models/sprites (these game modes still need testing, but Assault should be in known working state now)
- no more flashblend in *.cfg
- optional mapinfo system (needs testing; compile qcsrc/server with -DMAPINFO to use it)

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2996 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
146 files changed:
data/default.cfg diff | blob | history
data/effectinfo.txt diff | blob | history
data/game_reset.cfg diff | blob | history
data/gfx/font_user0.tga [new file with mode: 0644] blob
data/gfx/font_user0.width [new file with mode: 0644] blob
data/high.cfg diff | blob | history
data/low.cfg diff | blob | history
data/maps/aggressor.mapinfo [new file with mode: 0644] blob
data/maps/aneurysm.mapinfo [new file with mode: 0644] blob
data/maps/basement.mapinfo [new file with mode: 0644] blob
data/maps/basementctf.mapinfo [new file with mode: 0644] blob
data/maps/bleach.mapinfo [new file with mode: 0644] blob
data/maps/bloodprison.mapinfo [new file with mode: 0644] blob
data/maps/bluesky.mapinfo [new file with mode: 0644] blob
data/maps/darkzone.mapinfo [new file with mode: 0644] blob
data/maps/dieselpower.mapinfo [new file with mode: 0644] blob
data/maps/dismal.mapinfo [new file with mode: 0644] blob
data/maps/downer.mapinfo [new file with mode: 0644] blob
data/maps/evilspace.mapinfo [new file with mode: 0644] blob
data/maps/farewell.mapinfo [new file with mode: 0644] blob
data/maps/final_rage.mapinfo [new file with mode: 0644] blob
data/maps/reslimed.mapinfo [new file with mode: 0644] blob
data/maps/ruiner.mapinfo [new file with mode: 0644] blob
data/maps/runningman.mapinfo [new file with mode: 0644] blob
data/maps/runningman_1on1remix.mapinfo [new file with mode: 0644] blob
data/maps/runningmanctf.mapinfo [new file with mode: 0644] blob
data/maps/silvercity.mapinfo [new file with mode: 0644] blob
data/maps/skyway.mapinfo [new file with mode: 0644] blob
data/maps/slimepit.mapinfo [new file with mode: 0644] blob
data/maps/soylent.mapinfo [new file with mode: 0644] blob
data/maps/starship.mapinfo [new file with mode: 0644] blob
data/maps/stormkeep.mapinfo [new file with mode: 0644] blob
data/maps/strength.mapinfo [new file with mode: 0644] blob
data/maps/toxic.mapinfo [new file with mode: 0644] blob
data/maps/warfare.mapinfo [new file with mode: 0644] blob
data/med.cfg diff | blob | history
data/models/onslaught/pad.dpm [new file with mode: 0644] blob
data/models/onslaught/reactor.dpm [new file with mode: 0644] blob
data/models/onslaught/shield.dpm [new file with mode: 0644] blob
data/models/sprites/defend.sp2 [new file with mode: 0644] blob
data/models/sprites/defend.tga [new file with mode: 0644] blob
data/models/sprites/destroy.sp2 [new file with mode: 0644] blob
data/models/sprites/destroy.tga [new file with mode: 0644] blob
data/models/sprites/push.sp2 [new file with mode: 0644] blob
data/models/sprites/push.tga [new file with mode: 0644] blob
data/normal.cfg diff | blob | history
data/omg.cfg diff | blob | history
data/qcsrc/common/campaign_setup.qc diff | blob | history
data/qcsrc/common/gamecommand.qc diff | blob | history
data/qcsrc/common/mapinfo.qc [new file with mode: 0644] blob
data/qcsrc/common/mapinfo.qh [new file with mode: 0644] blob
data/qcsrc/common/util.qc diff | blob | history
data/qcsrc/common/util.qh diff | blob | history
data/qcsrc/menu/gamecommand.qc diff | blob | history
data/qcsrc/menu/msys.qc diff | blob | history
data/qcsrc/server/assault.qc [new file with mode: 0644] blob
data/qcsrc/server/bots.qc diff | blob | history
data/qcsrc/server/campaign.qc diff | blob | history
data/qcsrc/server/cl_client.qc diff | blob | history
data/qcsrc/server/cl_impulse.qc diff | blob | history
data/qcsrc/server/cl_physics.qc diff | blob | history
data/qcsrc/server/cl_player.qc diff | blob | history
data/qcsrc/server/cl_weapons.qc diff | blob | history
data/qcsrc/server/cl_weaponsystem.qc diff | blob | history
data/qcsrc/server/clientcommands.qc diff | blob | history
data/qcsrc/server/constants.qh diff | blob | history
data/qcsrc/server/ctf.qc diff | blob | history
data/qcsrc/server/defs.qh diff | blob | history
data/qcsrc/server/g_damage.qc diff | blob | history
data/qcsrc/server/g_hook.qc diff | blob | history
data/qcsrc/server/g_world.qc diff | blob | history
data/qcsrc/server/gamecommand.qc diff | blob | history
data/qcsrc/server/havocbot_roles.qc diff | blob | history
data/qcsrc/server/miscfunctions.qc diff | blob | history
data/qcsrc/server/mode_onslaught.qc diff | blob | history
data/qcsrc/server/progs.src diff | blob | history
data/qcsrc/server/sv_main.qc diff | blob | history
data/qcsrc/server/t_items.qc diff | blob | history
data/qcsrc/server/teamplay.qc diff | blob | history
data/qcsrc/server/w_nex.qc diff | blob | history
data/qcsrc/server/w_rocketlauncher.qc diff | blob | history
data/qcsrc/server/w_uzi.qc diff | blob | history
data/scripts/final_rage.shader diff | blob | history
data/textures/core.tga [new file with mode: 0644] blob
data/textures/core_gloss.tga [new file with mode: 0644] blob
data/textures/core_glow.tga [new file with mode: 0644] blob
data/textures/evil1_metals/doormtl2_cln_bump.tga [new file with mode: 0644] blob
data/textures/evil1_metals/doormtl2_cln_gloss.tga [new file with mode: 0644] blob
data/textures/evil1_metals/doormtl2_drty2_bump.tga [new file with mode: 0644] blob
data/textures/evil1_metals/doormtl2_drty2_gloss.tga [new file with mode: 0644] blob
data/textures/evil1_metals/doormtl2_drty_bump.tga [new file with mode: 0644] blob
data/textures/evil1_metals/doormtl2_drty_gloss.tga [new file with mode: 0644] blob
data/textures/evil1_metals/doormtl2_rusty_bump.tga [new file with mode: 0644] blob
data/textures/evil1_metals/doormtl2_rusty_gloss.tga [new file with mode: 0644] blob
data/textures/evil1_metals/doormtl_cln_bump.tga [new file with mode: 0644] blob
data/textures/evil1_metals/doormtl_cln_gloss.tga [new file with mode: 0644] blob
data/textures/evil1_metals/doormtl_cmbo_bump.tga [new file with mode: 0644] blob
data/textures/evil1_metals/doormtl_cmbo_gloss.tga [new file with mode: 0644] blob
data/textures/evil1_metals/doormtl_drty2_bump.tga [new file with mode: 0644] blob
data/textures/evil1_metals/doormtl_drty2_gloss.tga [new file with mode: 0644] blob
data/textures/evil1_metals/doormtl_drty_bump.tga [new file with mode: 0644] blob
data/textures/evil1_metals/doormtl_drty_gloss.tga [new file with mode: 0644] blob
data/textures/evil1_metals/doormtl_rusty_bump.tga [new file with mode: 0644] blob
data/textures/evil1_metals/doormtl_rusty_gloss.tga [new file with mode: 0644] blob
data/textures/evil1_metals/mtl_rst2_bump.tga [new file with mode: 0644] blob
data/textures/evil1_metals/mtl_rst2_gloss.tga [new file with mode: 0644] blob
data/textures/evil1_metals/mtl_rst3_bump.tga [new file with mode: 0644] blob
data/textures/evil1_metals/mtl_rst3_gloss.tga [new file with mode: 0644] blob
data/textures/evil1_metals/mtl_rst4_bump.tga [new file with mode: 0644] blob
data/textures/evil1_metals/mtl_rst4_gloss.tga [new file with mode: 0644] blob
data/textures/evil1_metals/mtl_rst5_bump.tga [new file with mode: 0644] blob
data/textures/evil1_metals/mtl_rst5_gloss.tga [new file with mode: 0644] blob
data/textures/evil1_metals/rmetal1_bump.tga [new file with mode: 0644] blob
data/textures/evil1_metals/rmetal1_gloss.tga [new file with mode: 0644] blob
data/textures/evil1_metals/rmetal1b_bump.tga [new file with mode: 0644] blob
data/textures/evil1_metals/rmetal1b_gloss.tga [new file with mode: 0644] blob
data/textures/evil1_metals/rmetal2_bump.tga [new file with mode: 0644] blob
data/textures/evil1_metals/rmetal2_gloss.tga [new file with mode: 0644] blob
data/textures/evil1_metals/rmetal2b_bump.tga [new file with mode: 0644] blob
data/textures/evil1_metals/rmetal2b_gloss.tga [new file with mode: 0644] blob
data/textures/evil1_metals/rmetal2c_bump.jpg [deleted file] blob | history
data/textures/evil1_metals/rmetal2c_bump.tga [new file with mode: 0644] blob
data/textures/evil1_metals/rmetal2c_gloss.jpg [deleted file] blob | history
data/textures/evil1_metals/rmetal2c_gloss.tga [new file with mode: 0644] blob
data/textures/evil1_metals/rmetal2d_bump.jpg [deleted file] blob | history
data/textures/evil1_metals/rmetal2d_bump.tga [new file with mode: 0644] blob
data/textures/evil1_metals/rmetal2d_gloss.jpg [deleted file] blob | history
data/textures/evil1_metals/rmetal2d_gloss.tga [new file with mode: 0644] blob
data/textures/evil1_metals/rmetal2e_bump.jpg [deleted file] blob | history
data/textures/evil1_metals/rmetal2e_bump.tga [new file with mode: 0644] blob
data/textures/evil1_metals/rmetal2e_gloss.jpg [deleted file] blob | history
data/textures/evil1_metals/rmetal2e_gloss.tga [new file with mode: 0644] blob
data/textures/pad.tga [new file with mode: 0644] blob
data/textures/pad_gloss.tga [new file with mode: 0644] blob
data/textures/pad_glow.tga [new file with mode: 0644] blob
data/textures/pad_shirt.tga [new file with mode: 0644] blob
data/textures/reactor.jpg [new file with mode: 0644] blob
data/textures/reactor.tga [new file with mode: 0644] blob
data/textures/reactor_glow.tga [new file with mode: 0644] blob
data/textures/reactor_shirt.tga [new file with mode: 0644] blob
data/textures/shield.tga [new file with mode: 0644] blob
data/textures/shield_gloss.tga [new file with mode: 0644] blob
data/textures/shield_glow.tga [new file with mode: 0644] blob
data/textures/shield_norm.tga [new file with mode: 0644] blob
data/ultimate.cfg diff | blob | history
data/ultra.cfg diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.