]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
TimePath [Mon, 15 Dec 2014 02:53:12 +0000 (13:53 +1100)]
Begin porting SV_WalkMove for the stair jump fix
TimePath [Sun, 14 Dec 2014 11:48:00 +0000 (22:48 +1100)]
Merge branch 'master' into TimePath/experiments/csqc_prediction
Conflicts:
qcsrc/server/cl_physics.qc
TimePath [Sun, 14 Dec 2014 11:38:29 +0000 (22:38 +1100)]
Fix schrödinger's IS_ONGROUND bug
It was possible for the client to report being on the ground, and the server to report being in the air
Mario [Sun, 14 Dec 2014 11:38:28 +0000 (11:38 +0000)]
Merge branch 'TimePath/combined_updates' into 'master'
TimePath/combined_updates
samual/combined_updates without the bad merge with nyov's effects changes
See merge request !50
Mario [Sun, 14 Dec 2014 11:35:46 +0000 (22:35 +1100)]
Enable categories by default
Mario [Sun, 14 Dec 2014 11:29:19 +0000 (22:29 +1100)]
Fix cases of if not
Mario [Sun, 14 Dec 2014 11:09:55 +0000 (11:09 +0000)]
Merge branch 'TimePath/issues/1415' into 'master'
Issue 1415
When plasma is ready, increment `AMMO_COUNT` by 1
See merge request !51
TimePath [Sun, 14 Dec 2014 06:48:34 +0000 (17:48 +1100)]
Fix ammo panel layout
Fixes #1415
TimePath [Sun, 14 Dec 2014 03:13:13 +0000 (14:13 +1100)]
Fix entering HUD editor from main menu
TimePath [Sun, 14 Dec 2014 02:54:14 +0000 (13:54 +1100)]
Fix particle/decal effects settings
TimePath [Sun, 14 Dec 2014 02:18:05 +0000 (13:18 +1100)]
Fix mutator window height
TimePath [Sun, 14 Dec 2014 02:02:41 +0000 (13:02 +1100)]
Remove map features listing (again)
TimePath [Sun, 14 Dec 2014 01:57:53 +0000 (12:57 +1100)]
Merge branch 'master' into TimePath/combined_updates
Conflicts:
qcsrc/common/notifications.qh
Mario [Sun, 14 Dec 2014 01:54:09 +0000 (12:54 +1100)]
Move cvars to the proper location
TimePath [Sun, 14 Dec 2014 01:22:25 +0000 (12:22 +1100)]
Merge remote-tracking branch 'origin/master' into TimePath/combined_updates
Conflicts:
effects-high.cfg
effects-ultra.cfg
qcsrc/client/View.qc
qcsrc/common/mapinfo.qh
qcsrc/menu/classes.c
qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c
qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
qcsrc/menu/xonotic/dialog_settings_effects.c
TimePath [Sun, 14 Dec 2014 01:09:46 +0000 (12:09 +1100)]
Merge branch 'master' into TimePath/combined_updates
TimePath [Sun, 14 Dec 2014 01:06:55 +0000 (12:06 +1100)]
Apply nyov/effects
nyov [Tue, 25 Nov 2014 08:31:16 +0000 (08:31 +0000)]
Merge branch 'master' into samual/combined_updates
Mario [Sun, 14 Dec 2014 00:24:42 +0000 (00:24 +0000)]
Merge branch 'mirceakitsune/player_cubemaps' into 'master'
Merge branch mirceakitsune/player_cubemaps (L merge request)
Adds reflective shaders to the player models.
See merge request !49
Mario [Sun, 14 Dec 2014 00:04:14 +0000 (11:04 +1100)]
Add Arc to keybinds, for Mirio
Mario [Sat, 13 Dec 2014 23:52:41 +0000 (10:52 +1100)]
Merge branch 'master' into mirceakitsune/player_cubemaps
Mario [Sat, 13 Dec 2014 23:11:30 +0000 (10:11 +1100)]
Update English weapon names
Mario [Sat, 13 Dec 2014 12:02:58 +0000 (23:02 +1100)]
Remove an old comment for the sake of clearing fteqcc's name
Mario [Sat, 13 Dec 2014 12:01:58 +0000 (23:01 +1100)]
Ultra minor cleanup
Mario [Sat, 13 Dec 2014 11:50:54 +0000 (22:50 +1100)]
Get rid of a Nexuiz legacy commented code block
Mario [Sat, 13 Dec 2014 11:49:16 +0000 (22:49 +1100)]
Remove even more fteqcc junk
Mario [Sat, 13 Dec 2014 11:45:49 +0000 (22:45 +1100)]
Remove some old fteqcc legacy bug checks
Mario [Sat, 13 Dec 2014 09:49:21 +0000 (20:49 +1100)]
Fix compile
Mario [Sat, 13 Dec 2014 09:33:05 +0000 (20:33 +1100)]
Fix !(x == y) in pathlib
Mario [Sat, 13 Dec 2014 09:24:45 +0000 (20:24 +1100)]
Remove a bad call from nexball (weapons are already initialized at start)
Mario [Sat, 13 Dec 2014 09:07:27 +0000 (20:07 +1100)]
Apply antilag to monsters in g_subs
Mario [Sat, 13 Dec 2014 09:04:30 +0000 (20:04 +1100)]
Fix paranthesis
Mario [Sat, 13 Dec 2014 09:00:34 +0000 (20:00 +1100)]
Unfreeze players on round reset
Mario [Sat, 13 Dec 2014 08:50:09 +0000 (19:50 +1100)]
Don't send taunt sounds to spectatees
Mario [Sat, 13 Dec 2014 08:35:27 +0000 (19:35 +1100)]
Use x != y instead of !(x == y)
Mario [Sat, 13 Dec 2014 08:33:54 +0000 (19:33 +1100)]
Clean up a bot weapon check
Mario [Sat, 13 Dec 2014 08:28:59 +0000 (19:28 +1100)]
Electro can be used to climb
Mario [Sat, 13 Dec 2014 08:22:51 +0000 (19:22 +1100)]
Restore infinite mine lifetime function
Mario [Sat, 13 Dec 2014 08:03:58 +0000 (19:03 +1100)]
Fix casing of buff notifications
Mario [Sat, 13 Dec 2014 08:01:18 +0000 (19:01 +1100)]
Use spaces in notifications list
Mario [Sat, 13 Dec 2014 05:58:51 +0000 (16:58 +1100)]
Supposedly fix "lagging" rockets
Mario [Sat, 13 Dec 2014 05:53:25 +0000 (16:53 +1100)]
Add new cubemaps cvar to configs
Mario [Sat, 13 Dec 2014 05:37:47 +0000 (05:37 +0000)]
Merge branch 'Mario/ctf_leadlimit' into 'master'
Merge branch Mario/ctf_leadlimit (XXS merge request)
Sets CTF lead limit to 6, as requested in issue #102.
See merge request !28
Mario [Sat, 13 Dec 2014 05:34:44 +0000 (05:34 +0000)]
Merge branch 'terencehill/insta_notifications' into 'master'
Terencehill/insta notifications
Rename some notifications: MINSTA -> INSTAGIB
See merge request !41
Mario [Sat, 13 Dec 2014 05:33:25 +0000 (16:33 +1100)]
Apply an optimization by terencehill
Mario [Sat, 13 Dec 2014 05:29:48 +0000 (16:29 +1100)]
Merge branch 'master' into terencehill/insta_notifications
Conflicts:
qcsrc/common/notifications.qh
qcsrc/server/mutators/mutator_instagib.qc
Mario [Sat, 13 Dec 2014 05:22:47 +0000 (05:22 +0000)]
Merge branch 'terencehill/centerprint_panel_fix' into 'master'
Terencehill/centerprint panel fix
A generic message centerprinted together with a countdown message leaps every second at low fps
See merge request !45
Mario [Sat, 13 Dec 2014 05:19:00 +0000 (05:19 +0000)]
Merge branch 'terencehill/misc_cleanups' into 'master'
Terencehill/misc cleanups
Miscellaneous cleanups and some small fixes
See merge request !46
Mario [Sat, 13 Dec 2014 04:57:17 +0000 (15:57 +1100)]
Fix another silly use of translation
Mario [Sat, 13 Dec 2014 04:55:21 +0000 (15:55 +1100)]
Assuming letters can be translated in some languages, undo fix of decimals translation
Mario [Sat, 13 Dec 2014 04:51:41 +0000 (15:51 +1100)]
Fix some silly translated strings
Mario [Fri, 12 Dec 2014 08:12:26 +0000 (19:12 +1100)]
Reorder jumppad file a little and get rid of dotproduct usage in physics code
Mario [Fri, 12 Dec 2014 07:52:57 +0000 (18:52 +1100)]
Remove some old comments
Mario [Fri, 12 Dec 2014 06:50:43 +0000 (17:50 +1100)]
Fix button mask
Mario [Fri, 12 Dec 2014 06:48:09 +0000 (17:48 +1100)]
notnot
Mario [Fri, 12 Dec 2014 05:51:25 +0000 (16:51 +1100)]
Fix client side multijump not turning off when server side multijump is
Mario [Fri, 12 Dec 2014 05:42:30 +0000 (16:42 +1100)]
Make CSQC use PlayerJump
Mario [Fri, 12 Dec 2014 05:23:52 +0000 (16:23 +1100)]
Handle client frames same as server
Mario [Fri, 12 Dec 2014 05:13:30 +0000 (16:13 +1100)]
Move client side jump calculation into CheckPlayerJump
Mario [Fri, 12 Dec 2014 04:44:25 +0000 (15:44 +1100)]
Add a hack to fix track_canjump (using client cvar will break prediction)
Mario [Fri, 12 Dec 2014 04:34:55 +0000 (15:34 +1100)]
Partial fix for multijump
Mario [Fri, 12 Dec 2014 03:11:12 +0000 (14:11 +1100)]
Client side multijump (broken due to physics issues)
Mario [Fri, 12 Dec 2014 02:11:59 +0000 (13:11 +1100)]
Broken jumppad prediction
TimePath [Fri, 12 Dec 2014 01:20:54 +0000 (12:20 +1100)]
Merge branch 'master' into TimePath/experiments/csqc_prediction
Conflicts:
qcsrc/server/cl_physics.qc -> qcsrc/common/physics.qc (weapon cvars)
qcsrc/server/progs.src (build order)
Mario [Fri, 12 Dec 2014 00:13:01 +0000 (11:13 +1100)]
Almost fix ladder prediction (entering and idle are still iffy)
Mario [Thu, 11 Dec 2014 23:44:07 +0000 (10:44 +1100)]
Add Archer to the credits
Mario [Thu, 11 Dec 2014 23:38:41 +0000 (10:38 +1100)]
Merge remote-tracking branch 'origin/Mirio/credits'
Mario [Thu, 11 Dec 2014 23:22:03 +0000 (10:22 +1100)]
Merge branch 'Mario/weapons_new'
Mario [Thu, 11 Dec 2014 23:18:57 +0000 (10:18 +1100)]
Make crylink force match master
Mirio [Thu, 11 Dec 2014 23:15:15 +0000 (00:15 +0100)]
Updated team members, translators
Mario [Thu, 11 Dec 2014 23:10:25 +0000 (10:10 +1100)]
Remove shockwave from mutator menu
Mario [Thu, 11 Dec 2014 22:57:09 +0000 (09:57 +1100)]
Fix comment
Mario [Thu, 11 Dec 2014 22:50:32 +0000 (09:50 +1100)]
Attempt to make ladders predicted (currently quite messed up)
TimePath [Thu, 11 Dec 2014 07:43:38 +0000 (18:43 +1100)]
Create button macros
TimePath [Thu, 11 Dec 2014 04:46:13 +0000 (15:46 +1100)]
Fix dodging not working
TimePath [Thu, 11 Dec 2014 04:06:45 +0000 (15:06 +1100)]
Simplify dodging code
Mario [Thu, 11 Dec 2014 03:44:39 +0000 (14:44 +1100)]
Remove an unused stat
Mario [Thu, 11 Dec 2014 02:59:50 +0000 (13:59 +1100)]
Call the setpressedkeys functions in the right place (doesn't fix prediction, but fixes broken prediction)
TimePath [Thu, 11 Dec 2014 02:37:45 +0000 (13:37 +1100)]
Move dodging macros into mutator
TimePath [Thu, 11 Dec 2014 02:34:21 +0000 (13:34 +1100)]
Remove physics macro includes
TimePath [Thu, 11 Dec 2014 02:15:32 +0000 (13:15 +1100)]
Extract physics macro definitions
Mario [Thu, 11 Dec 2014 01:48:57 +0000 (12:48 +1100)]
Use the common definition to set movement
Mario [Thu, 11 Dec 2014 01:39:59 +0000 (12:39 +1100)]
Use TRUE and FALSE instead of 1 and 0
Mario [Thu, 11 Dec 2014 01:12:04 +0000 (12:12 +1100)]
Make dead check common (don't really need it, as physics are disabled while dead)
Mario [Thu, 11 Dec 2014 01:03:42 +0000 (12:03 +1100)]
Move some dodging stuff into dodging file
Mario [Thu, 11 Dec 2014 00:31:44 +0000 (11:31 +1100)]
Rough support for dodging prediction
TimePath [Wed, 10 Dec 2014 20:51:20 +0000 (07:51 +1100)]
Fix air acceleration the same way
moveflags are a lie
TimePath [Wed, 10 Dec 2014 20:44:01 +0000 (07:44 +1100)]
Fix slope sliding
Mario [Wed, 10 Dec 2014 11:47:44 +0000 (22:47 +1100)]
Predict jetpack
TimePath [Wed, 10 Dec 2014 11:43:05 +0000 (22:43 +1100)]
Fix crazy walk speed
TimePath [Wed, 10 Dec 2014 11:37:02 +0000 (22:37 +1100)]
Sync air physics with engine
TimePath [Wed, 10 Dec 2014 10:51:43 +0000 (21:51 +1100)]
Sync walk physics with engine
TimePath [Wed, 10 Dec 2014 09:09:37 +0000 (20:09 +1100)]
Sync water move physics with engine
Mario [Wed, 10 Dec 2014 07:43:38 +0000 (18:43 +1100)]
Move stat updates to a function for easier access
TimePath [Wed, 10 Dec 2014 05:57:09 +0000 (16:57 +1100)]
Improve water movement prediction
TimePath [Wed, 10 Dec 2014 04:52:13 +0000 (15:52 +1100)]
Use more constants
Mario [Wed, 10 Dec 2014 04:18:03 +0000 (15:18 +1100)]
Move physics stats loading into physics file
Mario [Wed, 10 Dec 2014 00:00:12 +0000 (11:00 +1100)]
Failed attempt to make CheckWaterJump work with CSQC
Mario [Tue, 9 Dec 2014 23:53:48 +0000 (10:53 +1100)]
Fix water movement and add a networked stat for the tiny movement while frozen
Mario [Tue, 9 Dec 2014 23:27:27 +0000 (10:27 +1100)]
Fix water prediction by using a legacy function