]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
TimePath [Wed, 14 Oct 2015 23:29:49 +0000 (10:29 +1100)]
Merge branch 'master' into TimePath/guide
# Conflicts:
# qcsrc/common/nades.qh
# qcsrc/common/vehicles/vehicle.qh
# qcsrc/menu/xonotic/dialog_multiplayer_media.qc
Mario [Wed, 14 Oct 2015 22:58:32 +0000 (08:58 +1000)]
Little bit more cleanup
Mario [Wed, 14 Oct 2015 22:55:14 +0000 (08:55 +1000)]
Clean up shotorg code a bit
Mario [Wed, 14 Oct 2015 22:44:47 +0000 (08:44 +1000)]
Disable the server's ability to adjust the client's view model alignment
Mario [Wed, 14 Oct 2015 22:23:21 +0000 (08:23 +1000)]
Clean up the bounds a little bit
Mario [Wed, 14 Oct 2015 22:20:49 +0000 (08:20 +1000)]
Make a common function for getting the player's gun alignment
Mario [Wed, 14 Oct 2015 02:05:07 +0000 (12:05 +1000)]
Add an argument to SetMovedir
Mario [Wed, 14 Oct 2015 00:01:16 +0000 (10:01 +1000)]
Clean up door key handling
Rudolf Polzer [Tue, 13 Oct 2015 23:48:25 +0000 (23:48 +0000)]
Merge branch 'terencehill/tooltips_cleanup' into 'master'
Tooltips cleanup
Remove a few superfluous tooltips
Fix a few tooltips
Reduce spam of "x minutes" and "x fps" strings of a few sliders
See merge request !230
TimePath [Tue, 13 Oct 2015 23:36:45 +0000 (10:36 +1100)]
Items: actually make no sound if the waypoint isn't visible for the player
Closes #1572
terencehill [Tue, 13 Oct 2015 22:41:50 +0000 (00:41 +0200)]
Merge branch 'master' into terencehill/tooltips_cleanup
Mario [Tue, 13 Oct 2015 22:23:49 +0000 (08:23 +1000)]
Fix barrel death message and assault objectives
Rudolf Polzer [Tue, 13 Oct 2015 19:19:48 +0000 (21:19 +0200)]
Transifex sync.
Rudolf Polzer [Tue, 13 Oct 2015 19:14:37 +0000 (21:14 +0200)]
Fix a format string bug.
Rudolf Polzer [Tue, 13 Oct 2015 19:14:11 +0000 (21:14 +0200)]
Download changes from transifex.
Rudolf Polzer [Tue, 13 Oct 2015 19:10:01 +0000 (21:10 +0200)]
Dummy transifex sync.
Rudolf Polzer [Tue, 13 Oct 2015 19:02:25 +0000 (21:02 +0200)]
Revert "Port the existing tooltips and keybinds translations to the main translation files"
This reverts commit
cd21b34eb6ea3331dbfc959e226d2884491d0c2d.
TimePath [Tue, 13 Oct 2015 07:52:46 +0000 (07:52 +0000)]
Merge branch 'TimePath/deathtypes' into 'master'
Deathtypes: port to registry
Yet another merge request
See merge request !234
TimePath [Tue, 13 Oct 2015 07:52:58 +0000 (18:52 +1100)]
Nades: don't forget to think
Closes #1571
Mario [Mon, 12 Oct 2015 20:30:58 +0000 (06:30 +1000)]
Minor whitespace cleanup
Mario [Mon, 12 Oct 2015 20:30:34 +0000 (06:30 +1000)]
Trigger targeted entities when key is picked up, mimics original Quake 1 behaviour
Mario [Mon, 12 Oct 2015 20:29:11 +0000 (06:29 +1000)]
Fix arguments for the door locked notifications
Mario [Mon, 12 Oct 2015 20:28:25 +0000 (06:28 +1000)]
Add an extra spawnflag to func_train to replicate original (Quake 1) behaviour (only starting moves when triggered)
Mario [Mon, 12 Oct 2015 11:50:43 +0000 (21:50 +1000)]
Fix multi model support with sv_defaultplayermodel cvars
TimePath [Sun, 11 Oct 2015 22:38:36 +0000 (09:38 +1100)]
Merge branch 'master' into TimePath/deathtypes
# Conflicts:
# qcsrc/client/damage.qc
# qcsrc/client/hud.qc
# qcsrc/client/main.qc
# qcsrc/client/progs.inc
# qcsrc/common/vehicles/vehicle/raptor_weapons.qc
# qcsrc/common/weapons/all.qc
# qcsrc/server/cheats.qc
# qcsrc/server/g_world.qc
# qcsrc/server/teamplay.qc
TimePath [Sun, 11 Oct 2015 08:40:25 +0000 (19:40 +1100)]
Merge branch 'TimePath/cleanup'
TimePath [Sun, 11 Oct 2015 07:10:16 +0000 (18:10 +1100)]
common: move instagib and nexball as they add custom items and weapons
TimePath [Sun, 11 Oct 2015 01:08:03 +0000 (12:08 +1100)]
lib: move csqcmodellib and warpzonelib
TimePath [Sat, 10 Oct 2015 08:35:02 +0000 (19:35 +1100)]
#includes: cleanup server
TimePath [Sat, 10 Oct 2015 03:28:18 +0000 (14:28 +1100)]
String: use strhasword
TimePath [Sat, 10 Oct 2015 03:24:19 +0000 (14:24 +1100)]
#includes: cleanup menu
TimePath [Sat, 10 Oct 2015 02:06:58 +0000 (13:06 +1100)]
#includes: cleanup client
Mario [Fri, 9 Oct 2015 12:14:17 +0000 (22:14 +1000)]
Add a server side option to disable bunnyhopping
TimePath [Fri, 9 Oct 2015 11:33:48 +0000 (22:33 +1100)]
Commands: move dump commands to their respective systems
TimePath [Fri, 9 Oct 2015 11:03:03 +0000 (22:03 +1100)]
Commands: use registry
TimePath [Fri, 9 Oct 2015 09:32:33 +0000 (20:32 +1100)]
#includes: cleanup
Mario [Fri, 9 Oct 2015 09:22:16 +0000 (09:22 +0000)]
Merge branch 'Mario/multiplayer_snake' into 'master'
Merge branch Mario/multiplayer_snake (M merge request)
Adds support for multiple players in the Snake minigame.
See merge request !238
Mario [Fri, 9 Oct 2015 08:58:38 +0000 (18:58 +1000)]
Fix a minor issue with snake tail
Mario [Fri, 9 Oct 2015 08:47:38 +0000 (18:47 +1000)]
Merge branch 'master' into Mario/multiplayer_snake
TimePath [Fri, 9 Oct 2015 06:19:31 +0000 (17:19 +1100)]
Doxygen config
TimePath [Thu, 8 Oct 2015 21:24:21 +0000 (08:24 +1100)]
Raptor: fix primary friendly fire
Mario [Thu, 8 Oct 2015 13:22:16 +0000 (23:22 +1000)]
Fix compile
Mario [Thu, 8 Oct 2015 12:08:25 +0000 (22:08 +1000)]
Make an unused function used
TimePath [Thu, 8 Oct 2015 11:35:21 +0000 (22:35 +1100)]
Revert "Merge branch 'TimePath/bot_api' into 'master'
\r"
This reverts commit
a39af09cb4b15ec94461af2c1f314098ffe7ce0c, reversing
changes made to
81b0f2bc5760bb652515453ac450f2822a98b725.
Mario [Thu, 8 Oct 2015 08:01:52 +0000 (18:01 +1000)]
Greatly improve network performance with snake movement
Mario [Thu, 8 Oct 2015 06:12:29 +0000 (16:12 +1000)]
Merge branch 'master' into Mario/multiplayer_snake
Mario [Thu, 8 Oct 2015 06:12:13 +0000 (16:12 +1000)]
Increase the maximum number of mutators
TimePath [Thu, 8 Oct 2015 06:08:22 +0000 (06:08 +0000)]
Merge branch 'TimePath/hudpanels_registry' into 'master'
HUD: initialize with registry
See merge request !236
Mario [Thu, 8 Oct 2015 06:07:55 +0000 (16:07 +1000)]
Merge branch 'master' into Mario/multiplayer_snake
TimePath [Thu, 8 Oct 2015 06:07:02 +0000 (06:07 +0000)]
Merge branch 'TimePath/bot_api' into 'master'
Decouple bots
If we're ever going to develop a new AI, this separation will make switching implementaions trivial
See merge request !237
Mario [Thu, 8 Oct 2015 06:01:25 +0000 (16:01 +1000)]
Fix lives to not reset when rejoining
Mario [Thu, 8 Oct 2015 05:30:39 +0000 (15:30 +1000)]
Add an obligatory comment
TimePath [Thu, 8 Oct 2015 05:09:36 +0000 (16:09 +1100)]
Merge branch 'master' into TimePath/deathtypes
# Conflicts:
# qcsrc/common/util-pre.qh
TimePath [Thu, 8 Oct 2015 04:54:42 +0000 (15:54 +1100)]
HUD: initialize with registry
TimePath [Thu, 8 Oct 2015 03:39:10 +0000 (14:39 +1100)]
Radar icons: fix colour
TimePath [Thu, 8 Oct 2015 01:54:02 +0000 (12:54 +1100)]
ent_cs: cleanup
TimePath [Thu, 8 Oct 2015 01:37:22 +0000 (12:37 +1100)]
Lib: re-home functions from common/util
TimePath [Thu, 8 Oct 2015 00:42:58 +0000 (11:42 +1100)]
Autocvar: use MakeConsoleSafe
TimePath [Wed, 7 Oct 2015 23:56:13 +0000 (10:56 +1100)]
Bots: move supporting code into bot directory
TimePath [Wed, 7 Oct 2015 23:15:40 +0000 (10:15 +1100)]
Bots: define the API boundaries
TimePath [Wed, 7 Oct 2015 21:28:53 +0000 (08:28 +1100)]
Effectinfo: temporary order fix
Mario [Wed, 7 Oct 2015 13:37:48 +0000 (23:37 +1000)]
Experimental support for multiplayer in the snake minigame
TimePath [Wed, 7 Oct 2015 10:24:33 +0000 (21:24 +1100)]
Deathtypes: port to registry
Mario [Wed, 7 Oct 2015 07:37:40 +0000 (17:37 +1000)]
Fix particleeffectnum usage
Mario [Wed, 7 Oct 2015 07:31:48 +0000 (17:31 +1000)]
Remove usage of "frame" event (improves performance, hopefully fixes PL)
TimePath [Wed, 7 Oct 2015 02:51:02 +0000 (13:51 +1100)]
Draw: purge SELFPARAM
TimePath [Wed, 7 Oct 2015 02:41:23 +0000 (13:41 +1100)]
Projectiles: fix invisible rockets
TimePath [Wed, 7 Oct 2015 01:43:32 +0000 (12:43 +1100)]
Registry: overflow check
TimePath [Wed, 7 Oct 2015 00:20:20 +0000 (11:20 +1100)]
Net: purge SELFPARAM from sendfuncs
TimePath [Tue, 6 Oct 2015 23:38:30 +0000 (10:38 +1100)]
Net: tempentity support
TimePath [Wed, 7 Oct 2015 00:43:57 +0000 (11:43 +1100)]
Itemstime: fix regression introduced by
0c071920ffd10ccebde36092b7b91eb1673ae856
TimePath [Tue, 6 Oct 2015 23:03:28 +0000 (10:03 +1100)]
Nades: always override dropweapon
TimePath [Tue, 6 Oct 2015 10:59:58 +0000 (21:59 +1100)]
Resolve preprocessor warnings
TimePath [Tue, 6 Oct 2015 10:50:58 +0000 (21:50 +1100)]
Nades: rename registry globals
TimePath [Tue, 6 Oct 2015 10:37:02 +0000 (21:37 +1100)]
Buffs: rename registry globals
TimePath [Tue, 6 Oct 2015 10:16:24 +0000 (21:16 +1100)]
Models: rename registry globals
TimePath [Tue, 6 Oct 2015 10:13:40 +0000 (21:13 +1100)]
Sounds: rename registry globals
TimePath [Tue, 6 Oct 2015 10:08:39 +0000 (21:08 +1100)]
Items: rename registry globals
TimePath [Tue, 6 Oct 2015 10:04:49 +0000 (21:04 +1100)]
Monsters: rename registry globals
TimePath [Tue, 6 Oct 2015 09:57:58 +0000 (20:57 +1100)]
Turrets: rename registry globals
TimePath [Tue, 6 Oct 2015 09:50:37 +0000 (20:50 +1100)]
Vehicles: rename registry globals
TimePath [Tue, 6 Oct 2015 09:41:12 +0000 (20:41 +1100)]
Weapons: rename registry globals
TimePath [Tue, 6 Oct 2015 08:04:53 +0000 (08:04 +0000)]
Merge branch 'TimePath/unified_weapons' into 'master'
Unified weapons (L merge request)
Internally converts every attack to behave as a weapon, this will be useful for playable monsters later.
Nades and hook are now proper offhand weapons. This capability can be used for vehicles and monsters to override the hook button for other abilities.
The nexball ball stealer is now its own weapon.
Turrets and vehicles also use weapons in preparation for future AI development.
See merge request !232
TimePath [Tue, 6 Oct 2015 07:51:36 +0000 (18:51 +1100)]
Bring back weapons.cfg; needed for playing on 0.8.1 servers
TimePath [Tue, 6 Oct 2015 01:41:18 +0000 (12:41 +1100)]
Merge branch 'master' into TimePath/unified_weapons
# Conflicts:
# qcsrc/common/nades.qc
# qcsrc/common/vehicles/sv_vehicles.qc
# qcsrc/common/vehicles/vehicle/bumblebee.qc
# qcsrc/common/vehicles/vehicle/spiderbot.qc
TimePath [Tue, 6 Oct 2015 01:28:32 +0000 (12:28 +1100)]
Hook: infinite ammo in mutator
TimePath [Tue, 6 Oct 2015 01:06:29 +0000 (12:06 +1100)]
Nades: check if player has hook for priming with weapon throw bind
TimePath [Tue, 6 Oct 2015 00:56:00 +0000 (11:56 +1100)]
Nades: always throw with weapon drop in case offhand is occupied
TimePath [Tue, 6 Oct 2015 00:07:24 +0000 (11:07 +1100)]
Hook: don't give weapon when offhand is active
TimePath [Tue, 6 Oct 2015 00:00:09 +0000 (11:00 +1100)]
Hook: merge offhand and weapon behaviour
Fixes offhand with nades
Fixes ammo
terencehill [Mon, 5 Oct 2015 12:27:37 +0000 (14:27 +0200)]
Remove more useless tooltips
TimePath [Mon, 5 Oct 2015 11:27:46 +0000 (22:27 +1100)]
Hook: fix server cfg
Mario [Mon, 5 Oct 2015 09:54:32 +0000 (09:54 +0000)]
Merge branch 'Mario/trailparticles' into 'master'
Merge branch Mario/trailparticles (M merge request)
Adds support for traileffect to CSQC models, so things like players can have tails (and eventually proper support for the nade trails).
See merge request !233
Mario [Mon, 5 Oct 2015 09:44:48 +0000 (19:44 +1000)]
Match master
Mario [Mon, 5 Oct 2015 09:39:25 +0000 (19:39 +1000)]
Add support for traileffect on CSQC models
TimePath [Mon, 5 Oct 2015 09:07:44 +0000 (20:07 +1100)]
Hook: fix hookbomb ownership
TimePath [Mon, 5 Oct 2015 08:10:52 +0000 (19:10 +1100)]
Weapons: Don't take mutator blocked weapons into account when sizing the weapons panel, unless they are held
TimePath [Mon, 5 Oct 2015 07:26:29 +0000 (18:26 +1100)]
Nexball: mutator lock ballstealer
TimePath [Mon, 5 Oct 2015 05:44:12 +0000 (16:44 +1100)]
Linked entities: simplify registration
TimePath [Mon, 5 Oct 2015 01:27:14 +0000 (12:27 +1100)]
Nades: check return of Nade_TrailEffect