icculus.org git repositories - divverent/nexuiz.git/commit

]> icculus.org git repositories - divverent/nexuiz.git/commit

projects / divverent / nexuiz.git / commit

author	div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
	Sun, 27 Sep 2009 10:58:51 +0000 (10:58 +0000)
committer	div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
	Sun, 27 Sep 2009 10:58:51 +0000 (10:58 +0000)
commit	b1fb02b430177ede6207cc9e705062c7611ef4b1
tree	96454a08a0e073121be3fb9eecdfb73b0d5e983e	tree
parent	9a7ffeab1beac668f07fa806138becff47b7f920	commit \| diff

FULL trunk-branch merge. Will undo some stuff afzer this commit.

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@7944 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

174 files changed:

.patchsets		diff \| blob \| history
data/Makefile		diff \| blob \| history
data/balance.cfg	[moved from data/weaponsHavoc.cfg with 50% similarity]	diff \| blob \| history
data/balance25.cfg	[moved from data/weapons.cfg with 67% similarity]	diff \| blob \| history
data/balanceHavoc.cfg	[new file with mode: 0644]	blob
data/balanceSamual.cfg	[new file with mode: 0644]	blob
data/build-compat-pack.sh		diff \| blob \| history
data/default.cfg		diff \| blob \| history
data/default25.cfg	[new file with mode: 0644]	blob
data/default26.cfg	[new file with mode: 0644]	blob
data/defaultHavoc.cfg		diff \| blob \| history
data/defaultNexuiz.cfg		diff \| blob \| history
data/effectinfo.txt		diff \| blob \| history
data/gfx/eggandbacon_mini.tga	[new file with mode: 0644]	blob
data/gfx/eggandbacon_radar.tga	[deleted file]	blob \| history
data/gfx/hud/sb_flag_blue_carrying.tga		diff \| blob \| history
data/gfx/hud/sb_flag_blue_lost.tga		diff \| blob \| history
data/gfx/hud/sb_flag_blue_shielded.tga		diff \| blob \| history
data/gfx/hud/sb_flag_blue_taken.tga		diff \| blob \| history
data/gfx/hud/sb_flag_red_carrying.tga		diff \| blob \| history
data/gfx/hud/sb_flag_red_lost.tga		diff \| blob \| history
data/gfx/hud/sb_flag_red_shielded.tga		diff \| blob \| history
data/gfx/hud/sb_flag_red_taken.tga		diff \| blob \| history
data/input-tuba.cfg	[new file with mode: 0644]	blob
data/keybinds.txt		diff \| blob \| history
data/maps/accident.waypoints		diff \| blob \| history
data/maps/accident.waypoints.cache		diff \| blob \| history
data/maps/aggressor.waypoints		diff \| blob \| history
data/maps/aggressor.waypoints.cache		diff \| blob \| history
data/maps/aneurysm.waypoints.cache		diff \| blob \| history
data/maps/basement.waypoints		diff \| blob \| history
data/maps/basement.waypoints.cache		diff \| blob \| history
data/maps/basementctf.waypoints.cache		diff \| blob \| history
data/maps/bleach.waypoints.cache		diff \| blob \| history
data/maps/bloodprison.waypoints.cache		diff \| blob \| history
data/maps/bloodprisonctf.waypoints		diff \| blob \| history
data/maps/bloodprisonctf.waypoints.cache		diff \| blob \| history
data/maps/bluesky.waypoints.cache		diff \| blob \| history
data/maps/campaignnexuiz25.txt		diff \| blob \| history
data/maps/darkzone.waypoints.cache		diff \| blob \| history
data/maps/desertfactory.waypoints.cache		diff \| blob \| history
data/maps/dieselpower.waypoints		diff \| blob \| history
data/maps/dieselpower.waypoints.cache		diff \| blob \| history
data/maps/downer.waypoints		diff \| blob \| history
data/maps/downer.waypoints.cache		diff \| blob \| history
data/maps/eggandbacon.bsp		diff \| blob \| history
data/maps/eggandbacon.map		diff \| blob \| history
data/maps/eggandbacon.waypoints.cache		diff \| blob \| history
data/maps/eggandbacon/lm_0000.tga		diff \| blob \| history
data/maps/eggandbacon/lm_0001.tga		diff \| blob \| history
data/maps/eggandbacon/lm_0002.tga		diff \| blob \| history
data/maps/eggandbacon/lm_0003.tga		diff \| blob \| history
data/maps/evilspace.waypoints.cache		diff \| blob \| history
data/maps/farewell.waypoints.cache		diff \| blob \| history
data/maps/final_rage.waypoints.cache		diff \| blob \| history
data/maps/reslimed.waypoints		diff \| blob \| history
data/maps/reslimed.waypoints.cache		diff \| blob \| history
data/maps/ruiner.waypoints.cache		diff \| blob \| history
data/maps/runningman.waypoints.cache		diff \| blob \| history
data/maps/runningman_1on1remix.waypoints.cache		diff \| blob \| history
data/maps/runningmanctf.waypoints.cache		diff \| blob \| history
data/maps/silvercity.waypoints.cache		diff \| blob \| history
data/maps/skyway.waypoints		diff \| blob \| history
data/maps/skyway.waypoints.cache		diff \| blob \| history
data/maps/slimepit.waypoints.cache		diff \| blob \| history
data/maps/soylent.waypoints.cache		diff \| blob \| history
data/maps/starship.waypoints.cache		diff \| blob \| history
data/maps/stormkeep.waypoints.cache		diff \| blob \| history
data/maps/stormkeep2.waypoints.cache		diff \| blob \| history
data/maps/strength.waypoints.cache		diff \| blob \| history
data/maps/toxic.waypoints.cache		diff \| blob \| history
data/maps/warfare.waypoints.cache		diff \| blob \| history
data/merge-settings-into-cfg.pl	[new file with mode: 0644]	blob
data/models/gibs/robo.md3	[new file with mode: 0644]	blob
data/models/gibs/robo.md3_0.skin	[new file with mode: 0644]	blob
data/models/gibs/robo.md3_1.skin	[new file with mode: 0644]	blob
data/models/gibs/robo1.md3	[new file with mode: 0644]	blob
data/models/gibs/robo1.md3_0.skin	[new file with mode: 0644]	blob
data/models/gibs/robo1.md3_1.skin	[new file with mode: 0644]	blob
data/models/gibs/robo2.md3	[new file with mode: 0644]	blob
data/models/gibs/robo2.md3_0.skin	[new file with mode: 0644]	blob
data/models/gibs/robo2.md3_1.skin	[new file with mode: 0644]	blob
data/models/gibs/robo3.md3	[new file with mode: 0644]	blob
data/models/gibs/robo3.md3_0.skin	[new file with mode: 0644]	blob
data/models/gibs/robo3.md3_1.skin	[new file with mode: 0644]	blob
data/models/gibs/robo4.md3	[new file with mode: 0644]	blob
data/models/gibs/robo4.md3_0.skin	[new file with mode: 0644]	blob
data/models/gibs/robo4.md3_1.skin	[new file with mode: 0644]	blob
data/models/gibs/robo5.md3	[new file with mode: 0644]	blob
data/models/gibs/robo6.md3	[new file with mode: 0644]	blob
data/models/gibs/robo7.md3	[new file with mode: 0644]	blob
data/models/gibs/robo7.md3_0.skin	[new file with mode: 0644]	blob
data/models/gibs/robo7.md3_1.skin	[new file with mode: 0644]	blob
data/models/gibs/robo8.md3	[new file with mode: 0644]	blob
data/models/gibs/robo8.md3_0.skin	[new file with mode: 0644]	blob
data/models/gibs/robo8.md3_1.skin	[new file with mode: 0644]	blob
data/models/player/grunt.txt		diff \| blob \| history
data/models/player/mulder.txt		diff \| blob \| history
data/models/player/xolar.txt		diff \| blob \| history
data/models/turrets/ewheel-base2.md3	[new file with mode: 0644]	blob
data/models/turrets/ewheel-base2.md3.framegroups	[new file with mode: 0644]	blob
data/physics10.cfg	[new file with mode: 0644]	blob
data/physics11.cfg	[new file with mode: 0644]	blob
data/physics20.cfg	[new file with mode: 0644]	blob
data/physics26.cfg	[new file with mode: 0644]	blob
data/physicsQ2.cfg	[new file with mode: 0644]	blob
data/physicsQ2a.cfg	[new file with mode: 0644]	blob
data/qcsrc/client/Main.qc		diff \| blob \| history
data/qcsrc/client/View.qc		diff \| blob \| history
data/qcsrc/client/casings.qc		diff \| blob \| history
data/qcsrc/client/damage.qc		diff \| blob \| history
data/qcsrc/client/gibs.qc		diff \| blob \| history
data/qcsrc/client/modeleffects.qc		diff \| blob \| history
data/qcsrc/client/movetypes.qc		diff \| blob \| history
data/qcsrc/client/projectile.qc		diff \| blob \| history
data/qcsrc/client/sbar.qc		diff \| blob \| history
data/qcsrc/client/waypointsprites.qc		diff \| blob \| history
data/qcsrc/common/constants.qh		diff \| blob \| history
data/qcsrc/common/items.qc		diff \| blob \| history
data/qcsrc/common/items.qh		diff \| blob \| history
data/qcsrc/common/util.qc		diff \| blob \| history
data/qcsrc/common/util.qh		diff \| blob \| history
data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_names.c	[deleted file]	blob \| history
data/qcsrc/nexuiz.ncb	[new file with mode: 0644]	blob
data/qcsrc/nexuiz.sln	[new file with mode: 0644]	blob
data/qcsrc/nexuiz.suo	[new file with mode: 0644]	blob
data/qcsrc/nexuiz.vcproj	[new file with mode: 0644]	blob
data/qcsrc/nexuiz.vcproj.user	[new file with mode: 0644]	blob
data/qcsrc/server/bot/navigation.qc		diff \| blob \| history
data/qcsrc/server/bot/navigation.qh		diff \| blob \| history
data/qcsrc/server/bot/waypoints.qc		diff \| blob \| history
data/qcsrc/server/bot/waypoints.qh		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_weaponsystem.qc		diff \| blob \| history
data/qcsrc/server/clientcommands.qc		diff \| blob \| history
data/qcsrc/server/constants.qh		diff \| blob \| history
data/qcsrc/server/g_damage.qc		diff \| blob \| history
data/qcsrc/server/g_triggers.qc		diff \| blob \| history
data/qcsrc/server/g_world.qc		diff \| blob \| history
data/qcsrc/server/miscfunctions.qc		diff \| blob \| history
data/qcsrc/server/progs.src		diff \| blob \| history
data/qcsrc/server/race.qc		diff \| blob \| history
data/qcsrc/server/race.qh		diff \| blob \| history
data/qcsrc/server/scores.qc		diff \| blob \| history
data/qcsrc/server/t_items.qc		diff \| blob \| history
data/qcsrc/server/t_jumppads.qc		diff \| blob \| history
data/qcsrc/server/w_campingrifle.qc		diff \| blob \| history
data/qcsrc/server/w_common.qc		diff \| blob \| history
data/qcsrc/server/w_electro.qc		diff \| blob \| history
data/qcsrc/server/w_fireball.qc	[new file with mode: 0644]	blob
data/qcsrc/server/w_laser.qc		diff \| blob \| history
data/qcsrc/server/w_minstanex.qc		diff \| blob \| history
data/qcsrc/server/w_nex.qc		diff \| blob \| history
data/qcsrc/server/w_rocketlauncher.qc		diff \| blob \| history
data/scripts/nutsandbolts.shader	[new file with mode: 0644]	blob
data/textures/nutsandbolts1.tga	[new file with mode: 0644]	blob
data/textures/nutsandbolts1_gloss.tga	[new file with mode: 0644]	blob
data/textures/nutsandbolts3.tga	[new file with mode: 0644]	blob
data/textures/nutsandbolts3_gloss.tga	[new file with mode: 0644]	blob
data/textures/nutsandbolts4.tga	[new file with mode: 0644]	blob
data/textures/nutsandbolts4_gloss.tga	[new file with mode: 0644]	blob
data/textures/nutsandbolts5.tga	[new file with mode: 0644]	blob
data/textures/nutsandbolts5_gloss.tga	[new file with mode: 0644]	blob
data/tooltips.db		diff \| blob \| history
data/update-cvarcount.sh		diff \| blob \| history
data/weaponsNexrun.cfg		diff \| blob \| history
misc/tools/WeaponEncounterProfile.pm		diff \| blob \| history
server/rcon2irc/echo-rcon.pl	[new file with mode: 0644]	blob
server/rcon2irc/joinmessage.pl	[new file with mode: 0644]	blob
server/rcon2irc/raw.pl	[new file with mode: 0644]	blob
server/rcon2irc/rbiserver.pl		diff \| blob \| history
server/rcon2irc/rcon2irc.pl		diff \| blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom