]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
terencehill [Wed, 10 Aug 2016 13:40:54 +0000 (15:40 +0200)]
Merge branch 'master' into terencehill/scoreboard_panel_2
Mario [Mon, 8 Aug 2016 13:47:02 +0000 (23:47 +1000)]
Allow setting item's glow colour from server
Mario [Mon, 8 Aug 2016 11:16:57 +0000 (21:16 +1000)]
Allow melee while crouching (the technical limitation preventing this before no longer exists, disallowing it is unintuitive)
Mario [Mon, 8 Aug 2016 05:44:32 +0000 (15:44 +1000)]
Add an extra mode to g_showweaponspawns which shows all weapon locations with the same impulse (may overlap if multiple weapons share the same spawnpoint)
Mario [Mon, 8 Aug 2016 03:47:47 +0000 (13:47 +1000)]
Also reset observer's weapon stats
Mario [Mon, 8 Aug 2016 03:42:03 +0000 (13:42 +1000)]
Alternative fix: don't modify the player state if it's not owned by the client
Mario [Mon, 8 Aug 2016 03:40:24 +0000 (13:40 +1000)]
Only detach playerstate if observer was a player (potential fix for player state related issues when switching from spectator to observer)
TimePath [Sun, 7 Aug 2016 11:17:03 +0000 (21:17 +1000)]
Run whitespace checker
TimePath [Sun, 7 Aug 2016 11:15:46 +0000 (21:15 +1000)]
Run header checker
TimePath [Sun, 7 Aug 2016 11:09:32 +0000 (21:09 +1000)]
s/LOG_WARNING/LOG_WARN/g
TimePath [Sun, 7 Aug 2016 11:02:23 +0000 (21:02 +1000)]
#pragma once
TimePath [Sun, 7 Aug 2016 09:24:26 +0000 (19:24 +1000)]
#pragma once
TimePath [Sun, 7 Aug 2016 09:22:18 +0000 (09:22 +0000)]
Merge branch 'TimePath/gametypes_cleanup' into 'master'
Cleanup gametypes
Propagate entity references
See merge request !346
TimePath [Sun, 7 Aug 2016 09:07:35 +0000 (19:07 +1000)]
Gametypes: propagate entity references, set limit to 24 due to use of bitflags
Mario [Sun, 7 Aug 2016 04:53:25 +0000 (14:53 +1000)]
Clear out PHYS_INPUT_TIMELENGTH from most of the physics code
TimePath [Sun, 7 Aug 2016 04:49:39 +0000 (14:49 +1000)]
Merge branch 'TimePath/bot_api'
Mario [Sun, 7 Aug 2016 04:14:59 +0000 (14:14 +1000)]
Add a mutator parameter for the physics tick rate
TimePath [Sun, 7 Aug 2016 03:46:16 +0000 (13:46 +1000)]
Bots: define the API boundaries
TimePath [Mon, 28 Mar 2016 03:58:08 +0000 (14:58 +1100)]
cloc
Mario [Sun, 7 Aug 2016 02:42:54 +0000 (12:42 +1000)]
Remove hardcoded stat values for testing
terencehill [Sat, 6 Aug 2016 17:15:03 +0000 (19:15 +0200)]
Add new scoreboard cvars in the skin exporter
terencehill [Sat, 6 Aug 2016 17:04:11 +0000 (19:04 +0200)]
Make it pass compilation units
terencehill [Sat, 6 Aug 2016 15:42:09 +0000 (17:42 +0200)]
Don't take into account border size if panel bg isn't shown
terencehill [Sat, 6 Aug 2016 14:37:40 +0000 (16:37 +0200)]
Apply panel bg to the scoreboard in the Nexuiz skin too
terencehill [Sat, 6 Aug 2016 13:00:53 +0000 (15:00 +0200)]
Update scoreboard cvars in the menu and add "Enable rows / columns highlighting" checkbox
terencehill [Sat, 6 Aug 2016 12:56:44 +0000 (14:56 +0200)]
Don't enter hud editor when the scoreboard is active
terencehill [Sat, 6 Aug 2016 12:24:32 +0000 (14:24 +0200)]
Slightly brighter color for the scoreboard
terencehill [Sat, 6 Aug 2016 11:31:29 +0000 (13:31 +0200)]
Add missing panel numbers to _hud_panelorder
terencehill [Sat, 6 Aug 2016 10:45:11 +0000 (12:45 +0200)]
Merge branch 'master' into terencehill/scoreboard_panel_2
Conflicts:
qcsrc/client/main.qh
qcsrc/client/scoreboard.qc
TimePath [Sat, 6 Aug 2016 08:35:30 +0000 (08:35 +0000)]
Merge branch 'TimePath/scoreboard_elo' into 'master'
Scoreboard elo
Cleans up registration of score fields (more to come?) and adds a (not shown by default) current gametype elo field parsed from xonstat
See merge request !309
TimePath [Sat, 6 Aug 2016 08:24:39 +0000 (18:24 +1000)]
Scoreboard ELO: accept hash change
TimePath [Sat, 6 Aug 2016 08:14:23 +0000 (18:14 +1000)]
Merge branch 'master' into TimePath/scoreboard_elo
TimePath [Sat, 6 Aug 2016 07:52:21 +0000 (17:52 +1000)]
Spectator list: fix compile
TimePath [Sat, 6 Aug 2016 07:51:41 +0000 (17:51 +1000)]
Scoreboard ELO: show "..." when loading, "N/A" when missing
TimePath [Sat, 6 Aug 2016 06:59:04 +0000 (16:59 +1000)]
Merge branch 'master' into TimePath/scoreboard_elo
# Conflicts:
# .gitlab-ci.yml
# qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
# qcsrc/server/mutators/mutator/gamemode_freezetag.qc
# qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
# qcsrc/server/scores_rules.qc
TimePath [Sat, 6 Aug 2016 06:46:36 +0000 (06:46 +0000)]
Merge branch 'Mario/showspecs' into 'master'
Merge branch Mario/showspecs (M merge request)
Shows who's spectating you (disabled by default).
See merge request !340
TimePath [Sat, 6 Aug 2016 06:40:35 +0000 (06:40 +0000)]
Merge branch 'TimePath/slist_refresh' into 'master'
Add a refresh button to the server list
Closes #1037
See merge request !305
TimePath [Sat, 6 Aug 2016 06:35:07 +0000 (06:35 +0000)]
Merge branch 'Mario/intrusive' into 'master'
Merge branch Mario/intrusive (L merge request)
Moves a few more entities to the new intrusive list system, further improving performance.
See merge request !344
TimePath [Sat, 6 Aug 2016 06:26:43 +0000 (16:26 +1000)]
Server list: soft refresh
TimePath [Sat, 6 Aug 2016 06:20:15 +0000 (16:20 +1000)]
Merge branch 'TimePath/remove_remove'
TimePath [Sat, 6 Aug 2016 05:47:09 +0000 (15:47 +1000)]
Use set_movetype everywhere
terencehill [Fri, 5 Aug 2016 20:39:20 +0000 (22:39 +0200)]
Fix bad player name truncation position in the relative cell of the scoreboard
terencehill [Fri, 5 Aug 2016 20:33:17 +0000 (22:33 +0200)]
Add back left and right margin to the first and last column of the scoreboard (but with a different implementation)
terencehill [Fri, 5 Aug 2016 20:23:20 +0000 (22:23 +0200)]
Allow to toggle the scoreboard even when the game is paused
terencehill [Fri, 5 Aug 2016 13:07:51 +0000 (15:07 +0200)]
Add a team color setting for team tables so that accuracy and rankings can be displayed with a non-team color, for example in the luminos_old skin
terencehill [Fri, 5 Aug 2016 01:13:39 +0000 (03:13 +0200)]
More namespace fixing
terencehill [Fri, 5 Aug 2016 00:13:08 +0000 (02:13 +0200)]
Fix incorrect scoreboard/HUD fading on quick (repeated) press/release of the scoreboard key
terencehill [Thu, 4 Aug 2016 23:39:05 +0000 (01:39 +0200)]
Scoreboard borders are nice in the old luminos skin too
terencehill [Thu, 4 Aug 2016 23:22:07 +0000 (01:22 +0200)]
scoreboard_border_thickness --> hud_panel_mapvote_highlight_border
terencehill [Thu, 4 Aug 2016 23:17:55 +0000 (01:17 +0200)]
Port more scoreboard cvars to the hud skins
terencehill [Thu, 4 Aug 2016 22:11:30 +0000 (00:11 +0200)]
Add a missing check
terencehill [Thu, 4 Aug 2016 18:41:27 +0000 (20:41 +0200)]
HUD_PrintScoreboardHeader
terencehill [Thu, 4 Aug 2016 18:16:41 +0000 (20:16 +0200)]
Center text vertically in the rows
terencehill [Thu, 4 Aug 2016 18:09:25 +0000 (20:09 +0200)]
Fix bg fading
terencehill [Thu, 4 Aug 2016 13:27:00 +0000 (15:27 +0200)]
More namespace fixing
terencehill [Thu, 4 Aug 2016 13:06:13 +0000 (15:06 +0200)]
Use a proper namespace for many scoreboard variables
terencehill [Thu, 4 Aug 2016 12:32:26 +0000 (14:32 +0200)]
Luma skin: unify style by giving HUD panel colors to the scoreboard
terencehill [Thu, 4 Aug 2016 12:23:32 +0000 (14:23 +0200)]
Integrate text, highlighting and background of scoreboard tables in the panel HUD system; remove table bg from luma skin
terencehill [Wed, 3 Aug 2016 22:22:02 +0000 (00:22 +0200)]
Display panel boders for each table in the scoreboard, including accuracy, rankings and map stats
Mario [Wed, 3 Aug 2016 01:36:37 +0000 (11:36 +1000)]
Only spawn a single casing when firing shotgun
Mario [Wed, 3 Aug 2016 01:18:19 +0000 (11:18 +1000)]
Whitelist move_movetype
Mario [Wed, 3 Aug 2016 01:04:38 +0000 (11:04 +1000)]
Fix references to .movetype
Mario [Wed, 3 Aug 2016 00:28:44 +0000 (10:28 +1000)]
Merge branch 'master' into Mario/intrusive
Mario [Wed, 3 Aug 2016 00:24:08 +0000 (00:24 +0000)]
Merge branch 'terencehill/infomessages_panel_update' into 'master'
Infomessages panel update; Display command names everywhere in the HUD instead of the commands theirselves
* Infomessages panel:
* Allow message wrapping
* Reduce number of messages displayed when spectating / observing by showing 3 less important messages in rotation
* Make command names translatable
* Display command names everywhere in the HUD instead of the commands theirselves
See merge request !342
terencehill [Sun, 31 Jul 2016 14:23:23 +0000 (16:23 +0200)]
Remove simple borders from the scoreboard
TimePath [Sun, 31 Jul 2016 11:26:51 +0000 (21:26 +1000)]
Remove remove()
TimePath [Sun, 31 Jul 2016 09:49:35 +0000 (19:49 +1000)]
Merge branch 'master' into TimePath/physics
# Conflicts:
# qcsrc/common/physics/player.qc
# qcsrc/common/triggers/trigger/jumppads.qc
# qcsrc/common/weapons/weapon/electro.qc
# qcsrc/server/g_world.qc
Mario [Sun, 31 Jul 2016 06:38:16 +0000 (16:38 +1000)]
Update hash
Mario [Sat, 30 Jul 2016 20:01:08 +0000 (06:01 +1000)]
Make hidden itemstime mode actually functional
terencehill [Sat, 30 Jul 2016 14:56:45 +0000 (16:56 +0200)]
Move scoreboard files to hud/panel/
terencehill [Sat, 30 Jul 2016 14:23:31 +0000 (16:23 +0200)]
Make the scoreboard a panel
Mario [Fri, 29 Jul 2016 23:41:27 +0000 (09:41 +1000)]
Apply extra rocket detonation force in experimental balance
Mario [Fri, 29 Jul 2016 23:38:09 +0000 (09:38 +1000)]
Allow shockwave outside of new toys mutator, apply experimental balance changes to balance-mario
Mario [Fri, 29 Jul 2016 23:14:56 +0000 (09:14 +1000)]
Use .groundentity (compatibility with engine)
Mario [Fri, 29 Jul 2016 21:12:35 +0000 (07:12 +1000)]
Add a hidden mode to itemstime to show times to players outside of warmup
terencehill [Fri, 29 Jul 2016 13:42:46 +0000 (15:42 +0200)]
Apply a minimal line spacing
terencehill [Fri, 29 Jul 2016 11:40:50 +0000 (13:40 +0200)]
Display vote binds and counts in the vote panel in a cleaner way
Mario [Fri, 29 Jul 2016 10:57:08 +0000 (20:57 +1000)]
Fix auxiliary crosshairs not appearing when re-entering the vehicle
Mario [Fri, 29 Jul 2016 10:48:06 +0000 (20:48 +1000)]
Clean up auxiliary crosshair code a little
terencehill [Fri, 29 Jul 2016 10:09:46 +0000 (12:09 +0200)]
Use command names in every other getcommandkey call; simplify handling of pass_key notification argument
Mario [Thu, 28 Jul 2016 15:25:30 +0000 (01:25 +1000)]
Disable sv_autopause by default (introduces some bugs, annoyingly pauses music when paused)
Mario [Thu, 28 Jul 2016 15:02:30 +0000 (15:02 +0000)]
Merge branch 'Mario/teams_bitflag' into 'master'
Merge branch Mario/teams_bitflag (M merge request)
Adds support for odd team matches, such as pink vs blue and yellow vs red.
See merge request !335
Mario [Thu, 28 Jul 2016 14:50:17 +0000 (14:50 +0000)]
Merge branch 'sev/hud_ctf_update' into 'master'
Add CTF stalemate indicator to HUD
For issue #1667
![stalemate](/uploads/
00dd98264789258f6fc199d0268f941b /stalemate.png)
It turns out that the bracket idea would be very cumbersome to implement,
so I have refined the approach with the background image.
See merge request !338
Mario [Thu, 28 Jul 2016 13:50:43 +0000 (23:50 +1000)]
Get player view angles before spawning casings (partial fix for casings spawning at fixed origin)
Mario [Thu, 28 Jul 2016 13:37:00 +0000 (23:37 +1000)]
Fix black crosshair when in vehicle with per weapon crosshair colour enabled
Mario [Thu, 28 Jul 2016 13:22:00 +0000 (23:22 +1000)]
Add an intrusive list for projectiles
Mario [Thu, 28 Jul 2016 12:52:49 +0000 (22:52 +1000)]
Give mines an intrusive list
Mario [Thu, 28 Jul 2016 12:08:53 +0000 (22:08 +1000)]
Add an intrusive list for turrets
Mario [Thu, 28 Jul 2016 12:02:43 +0000 (22:02 +1000)]
Merge branch 'master' into Mario/intrusive
Mario [Thu, 28 Jul 2016 12:01:45 +0000 (22:01 +1000)]
Don't add monster to list again if re-spawning
Mario [Thu, 28 Jul 2016 12:00:22 +0000 (22:00 +1000)]
Add an intrusive list for vehicles
Mario [Thu, 28 Jul 2016 06:49:07 +0000 (16:49 +1000)]
Add an intrusive list for bot waypoints
Mario [Wed, 27 Jul 2016 17:00:28 +0000 (03:00 +1000)]
Add an intrusive list for monsters
TimePath [Thu, 28 Jul 2016 09:55:29 +0000 (19:55 +1000)]
TimePath [Wed, 27 Jul 2016 12:29:35 +0000 (12:29 +0000)]
Merge branch 'TimePath/intrusive' into 'master'
Implement intrusive lists
Provides a solution to the abuse of `find` and `findchain` (hidden behind `FOREACH_*`)
See merge request !343
TimePath [Wed, 27 Jul 2016 12:14:53 +0000 (22:14 +1000)]
Loops: copy reference to next entity before entering lambda
TimePath [Wed, 27 Jul 2016 12:04:38 +0000 (22:04 +1000)]
Move objerror to qc
Mario [Wed, 27 Jul 2016 02:02:08 +0000 (12:02 +1000)]
Give electro secondary orbs a size so they sit on floors and walls properly, also add a secondary 'sticking' mode to electro orbs (disabled by default)
Mario [Tue, 26 Jul 2016 23:54:39 +0000 (09:54 +1000)]
Update hash
TimePath [Tue, 26 Jul 2016 23:47:45 +0000 (09:47 +1000)]
Fix item drawing