]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Mario [Tue, 14 Apr 2015 23:00:17 +0000 (09:00 +1000)]
Merge branch 'master' into Mario/vaporizer_damage
Conflicts:
qcsrc/common/weapons/w_vaporizer.qc
Mario [Tue, 14 Apr 2015 21:49:15 +0000 (07:49 +1000)]
Revert changes to electro combos (too controversial, will move to a different branch)
Mirio [Thu, 9 Apr 2015 18:18:40 +0000 (20:18 +0200)]
Changed wrong cvar in that balance config, fixed
Mirio [Thu, 9 Apr 2015 18:01:30 +0000 (20:01 +0200)]
Lower midair radius for Electro, cause you were hurting yourself a lot by shooting the combo from a higher to lower level
Rudolf Polzer [Thu, 9 Apr 2015 13:08:36 +0000 (15:08 +0200)]
Don't immediately send name changes while you're typing (spam).
This is because the engine automatically sends changes to $_cl_name to the server.
Maybe we later want to use another cvar for menu editing of the name... sucks.
Rudolf Polzer [Thu, 9 Apr 2015 13:02:20 +0000 (15:02 +0200)]
Don't show a clear textbox button in name entry fields.
Mario [Mon, 6 Apr 2015 15:06:58 +0000 (01:06 +1000)]
Fix references to unfinished plasma ammo item
Mario [Sun, 5 Apr 2015 20:23:15 +0000 (20:23 +0000)]
Merge branch 'matthiaskrgr/hudsetup' into 'master'
fix commands
changed path to hudsetup map as requested by div0
See merge request !116
Mario [Sun, 5 Apr 2015 18:09:27 +0000 (18:09 +0000)]
Merge branch 'terencehill/mapvote_cursor_fix' into 'master'
Fix for #1465 "joining server while on map selection screen locks cursor"
Setting hud_configure_prev to -1 to detect the very first frame isn't useful anymore.
See merge request !115
terencehill [Sun, 5 Apr 2015 12:16:30 +0000 (14:16 +0200)]
Fix for #1465 "joining server while on map selection screen locks cursor"
Setting hud_configure_prev to -1 to detect the very first frame isn't useful anymore.
Matthias Krüger [Sat, 4 Apr 2015 20:07:47 +0000 (22:07 +0200)]
fix commands
Mario [Fri, 3 Apr 2015 10:11:56 +0000 (10:11 +0000)]
Merge branch 'matthiaskrgr/hudsetup' into 'master'
Matthiaskrgr/hudsetup
makes hudsetup an actual map which is handled via map compile server.
the map is not shown in lsmaps or map selections as I saw it.
needs equivalent branch in map repo to work
See merge request !111
Mario [Tue, 31 Mar 2015 12:49:25 +0000 (12:49 +0000)]
Merge branch 'Mario/crosshair_blink_fix' into 'master'
Merge branch Mario/crosshair_blink_fix (XXS merge request)
Fixes blinking crosshair while spectating.
See merge request !114
Mario [Tue, 31 Mar 2015 12:47:15 +0000 (23:47 +1100)]
Disable hit indication while spectating (serves no purpose as a spectator, disabling also fixes "blinking" bug)
Mario [Tue, 31 Mar 2015 12:37:17 +0000 (12:37 +0000)]
Merge branch 'Mario/accuracy_fix' into 'master'
Merge branch Mario/accuracy_fix (M merge request)
Restores the hacks to use Blaster weapon for secondary fire's accuracy counting in overkill and instagib.
See merge request !113
Mario [Tue, 31 Mar 2015 12:20:35 +0000 (23:20 +1100)]
Fix secondary fire taking accuracy off the overkill/instagib primary attacks
Mario [Fri, 27 Mar 2015 08:15:05 +0000 (08:15 +0000)]
Merge branch 'Mario/nade_fixes' into 'master'
Merge branch Mario/nade_fixes (M merge request)
Fixes nades disappearing when touching clips, allows dropping the nade down only when player is both looking down and holding crouch, fixes ultra fast overkill superweapon re-spawn times, adds an option to change the nade throw offset (possibly useful for servers that wish to attempt to reproduce the old overkill's nade throw offsets).
See merge request !112
Mario [Fri, 27 Mar 2015 07:58:43 +0000 (18:58 +1100)]
Merge branch 'master' into Mario/nade_fixes
Rudolf Polzer [Tue, 24 Mar 2015 18:52:05 +0000 (19:52 +0100)]
Allow maps to specify "warpzone_isboxy" "1" to disable exacttrigger logic on anything.
This allows for some performance optimizations.
Rudolf Polzer [Tue, 24 Mar 2015 18:51:00 +0000 (19:51 +0100)]
Make the face normal calculation clearer by using less variables.
Rudolf Polzer [Tue, 24 Mar 2015 14:36:12 +0000 (15:36 +0100)]
Kill dotproduct() function as it's built-in in QC; move cross() to warpzonelib so warpzonelib can use it and stay standalone.
Rudolf Polzer [Sat, 21 Mar 2015 22:13:35 +0000 (23:13 +0100)]
Fix some overbright maps when realtime world lights are enabled.
Rudolf Polzer [Tue, 17 Mar 2015 11:03:11 +0000 (12:03 +0100)]
Support workarea limiting of the window size.
Requires an engine change to support getresolution(-2) to return the workarea.
Mario [Mon, 16 Mar 2015 22:09:42 +0000 (09:09 +1100)]
Set nade throw offset to "0 0 0" (will leave the cvar in there incase some servers wish to use it)
Mario [Mon, 16 Mar 2015 21:56:10 +0000 (08:56 +1100)]
Comment out a hack which removes nades when they touch clips
Mario [Mon, 16 Mar 2015 21:52:44 +0000 (08:52 +1100)]
Reset overkill superweapon respawn time to 2 minutes (seems a 1 was missed in the 120 second cooldown cvar one of the old ports)
Mario [Mon, 16 Mar 2015 21:48:27 +0000 (08:48 +1100)]
Also require crouch to drop the nade down
Mario [Mon, 16 Mar 2015 20:58:02 +0000 (07:58 +1100)]
Add a setting to handle nade throwing offset, defaulting to -20 (seems to work well)
Mario [Mon, 16 Mar 2015 20:42:44 +0000 (07:42 +1100)]
Fix a warning when dying in overkill with no attacker set
Rudolf Polzer [Mon, 9 Mar 2015 13:09:09 +0000 (14:09 +0100)]
Disable lightning arc branching, as this can (and WILL) recurse infinitely.
Rudolf Polzer [Mon, 9 Mar 2015 12:28:55 +0000 (13:28 +0100)]
Make sure the number of lightning beam segments is bounded.
Otherwise, beam list overflow and infinite loops.
Matthias Krüger [Fri, 6 Mar 2015 14:35:32 +0000 (15:35 +0100)]
Merge branch 'master' into matthiaskrgr/hudsetup
Mario [Fri, 6 Mar 2015 07:31:36 +0000 (07:31 +0000)]
Merge branch 'terencehill/weapon_panel_retry' into 'master'
Weapons panel improvements
I've taken into account sev's feedback at !106 and after lots of tests I came up with something good, I think.
To sum it up the changes:
* weapons are now sorted either vertically (more rows) or horizontally (more columns) (not just vertically as before)
* all weapons layout: more symmetrical distribution, icons are now as big as possible
* only owned layout: prefer stretched layouts (like in sev's branch) but avoid too much stretched layouts where item aspect ratio gets altered
See merge request !110
Mario [Thu, 5 Mar 2015 15:08:20 +0000 (02:08 +1100)]
Add some missing "bad" cvars
Rudolf Polzer [Wed, 25 Feb 2015 15:04:54 +0000 (16:04 +0100)]
Stop using model "" in func_breakable - it's unreliable when effects is
set.
Rather use EF_NODRAW to prevent sending.
Rudolf Polzer [Wed, 25 Feb 2015 14:06:28 +0000 (15:06 +0100)]
target_spawn: Retokenize when needed.
Rudolf Polzer [Wed, 25 Feb 2015 10:55:31 +0000 (11:55 +0100)]
Don't annoy bots with noise :)
Mario [Mon, 23 Feb 2015 23:40:53 +0000 (10:40 +1100)]
Fix voting with nospectators
Rudolf Polzer [Sat, 21 Feb 2015 15:04:42 +0000 (16:04 +0100)]
Damn. NOW it's good :)
Rudolf Polzer [Sat, 21 Feb 2015 15:03:44 +0000 (16:03 +0100)]
Initialize func_breakable sound on connect.
terencehill [Sat, 21 Feb 2015 14:56:15 +0000 (15:56 +0100)]
Improve check for vertical sorting
Rudolf Polzer [Sat, 21 Feb 2015 14:17:30 +0000 (15:17 +0100)]
Use the right sound channel.
Rudolf Polzer [Sat, 21 Feb 2015 14:09:14 +0000 (15:09 +0100)]
Oops. Unbreak - stopsoundto is no longer public.
Rudolf Polzer [Sat, 21 Feb 2015 12:56:07 +0000 (13:56 +0100)]
There's smoke in the master bedroom.
In other words: func_breakable.sound1 support.
terencehill [Sun, 15 Feb 2015 18:55:56 +0000 (19:55 +0100)]
Merge branch 'master' into terencehill/weapon_panel_retry
terencehill [Sun, 15 Feb 2015 00:14:46 +0000 (01:14 +0100)]
Onlyowned layout: instead of keeping original table proportions as much as possible, use the previous method that prefers stretched layouts but avoid too much stretched layouts where item aspect ratio gets altered
terencehill [Sat, 14 Feb 2015 13:23:47 +0000 (14:23 +0100)]
Reimplement all-weapons table size calculation in order to make item aspect ratio as close as possible to the desired aspect ratio, which means icons as big as possible.
Mario [Sat, 14 Feb 2015 13:07:07 +0000 (13:07 +0000)]
Merge branch 'sev/weapon_panel_retry' into 'master'
Weapon Panel Retry
Based on the discussion at !105, I've made the following changes to @terencehill's implementation:
- The icons are distributed symmetrically, no matter if the panel is arranged vertically or horizontally
- If the bounds touch a screen edge, the panel is snapped to that edge
This merge request replaces !105.
See merge request !106
Mario [Sat, 14 Feb 2015 13:02:54 +0000 (00:02 +1100)]
Merge branch 'master' into sev/weapon_panel_retry
Mario [Thu, 12 Feb 2015 11:01:28 +0000 (22:01 +1100)]
Disable ammo charging by default
Mirio [Thu, 12 Feb 2015 10:44:03 +0000 (11:44 +0100)]
Forgot keep owner cvar in 0.8; buff SG; change back spawn furthest
Severin Meyer [Mon, 9 Feb 2015 19:16:29 +0000 (20:16 +0100)]
Center onlyowned weapon panel if the panel bounds reach across the whole screen
terencehill [Mon, 9 Feb 2015 11:28:39 +0000 (12:28 +0100)]
Center onlyowned panel if the original panel snaps to a whole screen side
terencehill [Mon, 9 Feb 2015 10:49:02 +0000 (11:49 +0100)]
Upscale icons with the previous code (AR "fix") rather then with hud_panel_weapons_onlyowned_icon_maxscale (feature removed)
Rudolf Polzer [Mon, 9 Feb 2015 11:07:58 +0000 (12:07 +0100)]
Merge remote-tracking branch 'origin/divVerent/crypto-fixes'
terencehill [Mon, 9 Feb 2015 10:01:47 +0000 (11:01 +0100)]
Weapon panel only owned mode: reduce table trying to keep the original table proportions as much as possible, gives a more consistent layout across different number of owned weapons. Weapons are now sorted either vertically or horizontally depending on the original table proportions
Mirio [Sun, 8 Feb 2015 17:23:48 +0000 (18:23 +0100)]
Add Melano to extended, add translators
Mario [Sun, 8 Feb 2015 15:22:12 +0000 (15:22 +0000)]
Merge branch 'terencehill/menu_fix' into 'master'
Terencehill/menu fix
Fix for bug #1453 "Advanced settings dialog does not close after pressing OK"
See merge request !107
terencehill [Sat, 7 Feb 2015 20:00:55 +0000 (21:00 +0100)]
Ultimate improvement of the onlyowned layout: change the automatic fix of the weapon icon aspect ratio to note scale the icon up, then scale it up (when there's enough available space) with hud_panel_weapons_onlyowned_icon_maxscale without altering aspect ratio
terencehill [Sat, 7 Feb 2015 19:07:50 +0000 (20:07 +0100)]
Improve weapon icon distribution
Mario [Sat, 7 Feb 2015 12:57:37 +0000 (12:57 +0000)]
Merge branch 'TimePath/issues/1455' into 'master'
"volume must be in range 0-1" warnings when playing the tuba
Closes xonotic/xonotic-data.pk3dir#1455
See merge request !108
Mario [Sat, 7 Feb 2015 08:54:45 +0000 (08:54 +0000)]
Merge branch 'TimePath/issues/1454' into 'master'
Menu VM crash when g_invasion is set to 1
See merge request !109
TimePath [Sat, 7 Feb 2015 08:45:19 +0000 (19:45 +1100)]
Don't call gameTypeChangeNotify() without a parent
Closes #1454
TimePath [Sat, 7 Feb 2015 08:34:23 +0000 (19:34 +1100)]
Cleanup
TimePath [Sat, 7 Feb 2015 07:03:54 +0000 (18:03 +1100)]
Fix the tuba with pythonic modulo
Closes #1455
TimePath [Sat, 7 Feb 2015 05:54:02 +0000 (16:54 +1100)]
Cleanup
Severin Meyer [Thu, 5 Feb 2015 20:43:33 +0000 (21:43 +0100)]
Make the weapon panel snapping work with any padding value
Severin Meyer [Thu, 5 Feb 2015 19:09:07 +0000 (20:09 +0100)]
Base weapon panel snap threshold on screen size
Mario [Thu, 5 Feb 2015 18:30:23 +0000 (05:30 +1100)]
Fix TDM slider not changing point limit
Severin Meyer [Thu, 5 Feb 2015 17:09:49 +0000 (18:09 +0100)]
Make the weapon panel even more symmetrical and snappier
terencehill [Thu, 5 Feb 2015 14:52:06 +0000 (15:52 +0100)]
Revert
855007679 as it caused bug #1453 "Advanced settings dialog does not close after pressing OK"
Severin Meyer [Wed, 4 Feb 2015 20:05:58 +0000 (21:05 +0100)]
Distribute the icons on the weapons panel more symmetrically and snap the panel to the screen edge
Mario [Wed, 4 Feb 2015 03:20:10 +0000 (03:20 +0000)]
Merge branch 'sev/crosshairs_size' into 'master'
Crosshair size
I've noticed that the default scale of the crosshairs is quite small. This causes aliasing issues, even at a resolution of 1920x1080, esp. for the per-weapon crosshairs.
With this branch I propose to slightly increase the default scale of all crosshairs from 0.3 to 0.4, as well as to increase some of the per-weapon crosshair scales,
to improve the first impression.
Before/After (1920x1080):
![crosshairs](https://gitlab.com/uploads/xonotic/xonotic-data.pk3dir/
15a0b111db /crosshairs.png)
See merge request !104
Severin Meyer [Tue, 3 Feb 2015 16:21:36 +0000 (17:21 +0100)]
Slightly increase the default scale of the crosshairs
Mario [Tue, 3 Feb 2015 10:51:50 +0000 (21:51 +1100)]
Merge branch 'sev/new_crosshairs'
Severin Meyer [Tue, 3 Feb 2015 10:08:41 +0000 (11:08 +0100)]
Add new crosshairs to the menu. The old crosshairs remain accessible through the crosshair cvar.
Mario [Tue, 3 Feb 2015 05:31:40 +0000 (05:31 +0000)]
Merge branch 'Mirio/credits' into 'master'
Mirio/credits
Somehow CuBe0wL got lost
See merge request !92
Mario [Tue, 3 Feb 2015 04:40:48 +0000 (04:40 +0000)]
Merge branch 'terencehill/weapon_panel_fix' into 'master'
Terencehill/weapon panel fix
Recent weapons panel changes weren't all good so I had to revert them: weapon icons currently are too wide when owning few weapons, onlyowned enabled and the panel shape is more squared.
Then I furtherly improved the previous code to achieve the same sev's goal, that is, more compact layout and better use of the available space.
See merge request !102
Mario [Tue, 3 Feb 2015 04:40:20 +0000 (04:40 +0000)]
Merge branch 'terencehill/string_prefixes_cleanup' into 'master'
Terencehill/string prefixes cleanup
Clean up translation context prefixes
See merge request !89
Mario [Tue, 3 Feb 2015 04:38:14 +0000 (04:38 +0000)]
Merge branch 'terencehill/GetClientErrorString_fix' into 'master'
Terencehill/GetClientErrorString fix
Add color code handling to GetClientErrorString (example command where it gets called: tell ^1wrong_player_name blabla)
See merge request !101
terencehill [Tue, 3 Feb 2015 00:22:56 +0000 (01:22 +0100)]
Add color code handling to GetClientErrorString (example command where it gets called: tell ^1wrong_player_name blabla)
terencehill [Tue, 3 Feb 2015 00:41:19 +0000 (01:41 +0100)]
Merge branch 'master' into terencehill/string_prefixes_cleanup
Conflicts:
qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
terencehill [Mon, 2 Feb 2015 23:37:19 +0000 (00:37 +0100)]
Merge branch 'master' into terencehill/weapon_panel_fix
Conflicts:
qcsrc/client/hud.qc
terencehill [Mon, 2 Feb 2015 18:43:13 +0000 (19:43 +0100)]
Fix weapon count when there's a complain_weapon (add it only if you don't have it!)
terencehill [Mon, 2 Feb 2015 17:52:09 +0000 (18:52 +0100)]
Show default set of owned weapons in the hud editor even if onlyowned is disabled
terencehill [Mon, 2 Feb 2015 16:45:38 +0000 (17:45 +0100)]
Weapons panel: better way to enlarge weapon_size to match desired aspect
Mario [Mon, 2 Feb 2015 10:22:27 +0000 (21:22 +1100)]
Merge remote-tracking branch 'origin/develop'
TimePath [Mon, 2 Feb 2015 09:45:34 +0000 (20:45 +1100)]
Fix post qc_updates merge fallout
TimePath [Mon, 2 Feb 2015 09:26:21 +0000 (20:26 +1100)]
Fix post qc_updates merge fallout
Mario [Mon, 2 Feb 2015 08:42:40 +0000 (08:42 +0000)]
Merge branch 'Mario/qc_updates' into 'master'
QC Updates
Updates mainly aiding transpilation, but also nice to have if sticking with DarkPlaces
* `float` -> `int`/`bool`
* Helps the transpiler immensely
* Scope visibility reduction
* Replaces `#define` with `const`
* More readable transpiler output (constant names instead of inline values)
* Replaces `vector_[xyz]` with `vector.[xyz]` (but not `entity.vector_[xyz]` because of a compiler bug)
* Removes `-Wno-double-declaration`
* Required for compilation of transpiled source
* Removes useless uses of `var`, `noref` and `local`
* Uses `#include` instead of `progs.src`
* Will help qc_physics
Squashed preview: [
7239bacff8b7fb9fe9541d6c6dc852e78b5049ac ](https://gitlab.com/xonotic/xonotic-data.pk3dir/commit/
7239bacff8b7fb9fe9541d6c6dc852e78b5049ac ?force_show_diff=true)
See merge request !97
TimePath [Mon, 2 Feb 2015 08:23:09 +0000 (19:23 +1100)]
Merge branch 'master' into Mario/qc_updates
Conflicts:
qcsrc/menu/classes.c
qcsrc/menu/item/modalcontroller.qc
qcsrc/menu/menu.qh
qcsrc/menu/xonotic/maplist.qc
qcsrc/server/command/banning.qc
qcsrc/server/ipban.qc
qcsrc/server/miscfunctions.qc
TimePath [Mon, 2 Feb 2015 07:32:58 +0000 (18:32 +1100)]
Move functions out of headers
Mario [Mon, 2 Feb 2015 06:54:15 +0000 (17:54 +1100)]
Hide preconnect hook behind an #ifdef
Mario [Mon, 2 Feb 2015 05:11:07 +0000 (05:11 +0000)]
Merge branch 'TimePath/issues/1451' into 'master'
seta _cl_gender
Closes xonotic/xonotic-data.pk3dir#1451
See merge request !100
TimePath [Mon, 2 Feb 2015 00:39:08 +0000 (11:39 +1100)]
seta _cl_gender
TimePath [Mon, 2 Feb 2015 00:19:10 +0000 (11:19 +1100)]
Fix a regression
Rudolf Polzer [Sun, 1 Feb 2015 17:58:58 +0000 (18:58 +0100)]
Serverbench: include full scoreboard.
terencehill [Sun, 1 Feb 2015 13:09:39 +0000 (14:09 +0100)]
Merge branch 'master' into terencehill/weapon_panel_fix
Mario [Sun, 1 Feb 2015 10:54:53 +0000 (10:54 +0000)]
Merge branch 'Melanosuchus/preconnect' into 'master'
ClientPreConnect
Sends an event log on ClientPreConnect, requires xonotic/darkplaces!14
The log format is basically the same as the one used in :join.
See merge request !99
Mario [Sun, 1 Feb 2015 08:19:33 +0000 (08:19 +0000)]
Merge branch 'terencehill/menu_optimizations' into 'master'
Terencehill/menu optimizations
Optimize ModalController_draw code so that #1432 (Header labels flicker) gets partially fixed (that is, only in the tab that fades out)
More details in this comment: https://gitlab.com/xonotic/xonotic-data.pk3dir/issues/1432#note_709376
See merge request !79