]>
de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
terencehill [Sun, 10 May 2015 19:52:07 +0000 (21:52 +0200)]
Revert previous change of item/tab.qc: title must be empty otherwise the default title ("Form1") gets inherited from the dialog superclass
TimePath [Sun, 10 May 2015 12:15:27 +0000 (22:15 +1000)]
Use the new item system for health and armor
TimePath [Sun, 10 May 2015 11:12:47 +0000 (21:12 +1000)]
Use the new item system for ammo
TimePath [Sun, 10 May 2015 09:19:51 +0000 (19:19 +1000)]
Initial item system setup
Mattia Basaglia [Sun, 10 May 2015 09:10:08 +0000 (11:10 +0200)]
Store the name of the vote caller
TimePath [Sun, 10 May 2015 03:56:21 +0000 (13:56 +1000)]
Merge remote-tracking branch 'origin/master' into terencehill/listbox_item_highlight
TimePath [Sun, 10 May 2015 03:41:57 +0000 (13:41 +1000)]
Merge remote-tracking branch 'origin/master' into terencehill/menu_remove_tab_title
# Conflicts:
# qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc
# qcsrc/menu/xonotic/dialog_settings_game_hud.qc
# qcsrc/menu/xonotic/dialog_settings_game_messages.qc
# qcsrc/menu/xonotic/dialog_settings_game_model.qc
# qcsrc/menu/xonotic/dialog_settings_game_view.qc
# qcsrc/menu/xonotic/dialog_settings_game_weapons.qc
TimePath [Sun, 10 May 2015 03:39:24 +0000 (13:39 +1000)]
Merge remote-tracking branch 'origin/master' into terencehill/hud_configure
# Conflicts:
# qcsrc/menu/xonotic/mainwindow.qc
Mario [Sun, 10 May 2015 03:15:51 +0000 (03:15 +0000)]
Merge branch 'TimePath/qc_updates' into 'master'
Merge branch TimePath/qc_updates (XXL merge request, but no functional changes or file relocations)
Major:
* Stops relying on the progs.src order by fixing all the `#include` lists, prerequisite for removing `-Wno-field-redeclared`. Test script included at `test/compilationunit.sh`
Minor:
* `float` -> `int`
* `var .float fld; ent.fld` -> `var .float fld; ent.(fld)`, less magic
* menu `spawnXXX()` -> `NEW(XXX)`, allows for overloaded constructors to replace `makeXXX(..)`
* some entity class annotations to serve as documentation, and later type checking
See merge request !124
terencehill [Fri, 8 May 2015 22:27:52 +0000 (00:27 +0200)]
Remove useless title attribute (and related attributes) from the tab class, the tab button already holds the tab title
terencehill [Fri, 8 May 2015 00:00:49 +0000 (02:00 +0200)]
Fix crosshair picker indentation
Penguinum [Thu, 7 May 2015 12:10:53 +0000 (15:10 +0300)]
useless
Penguinum [Wed, 6 May 2015 18:35:30 +0000 (21:35 +0300)]
alpha_min
TimePath [Wed, 6 May 2015 09:30:38 +0000 (19:30 +1000)]
Add two useful macros
TimePath [Wed, 6 May 2015 09:10:40 +0000 (19:10 +1000)]
Rename the underscore headers
TimePath [Wed, 6 May 2015 08:38:18 +0000 (08:38 +0000)]
Explain `CLASS` and `NEW` macros
TimePath [Wed, 6 May 2015 06:31:46 +0000 (16:31 +1000)]
Fix typedefs
Penguinum [Wed, 6 May 2015 06:25:04 +0000 (09:25 +0300)]
Xonotic-like code formatting
Mario [Wed, 6 May 2015 06:13:23 +0000 (16:13 +1000)]
Fix TimePath's greatest blunder
TimePath [Wed, 6 May 2015 06:12:05 +0000 (16:12 +1000)]
Use stock dpdefs
Penguinum [Tue, 5 May 2015 17:10:31 +0000 (20:10 +0300)]
Antiwall is moved to clientwall and clientillusionary
Mario [Tue, 5 May 2015 13:11:25 +0000 (23:11 +1000)]
Fix some minor issues with crouching and looking up/down
Mario [Tue, 5 May 2015 12:17:41 +0000 (22:17 +1000)]
Remove some leftovers from a merge causing CTF to break with bots
Mario [Tue, 5 May 2015 11:04:44 +0000 (21:04 +1000)]
Add constants for player hitbox, for use in a couple of places where varying size can break things
TimePath [Sun, 3 May 2015 23:24:19 +0000 (09:24 +1000)]
Make menu includes order insensitive
TimePath [Sun, 3 May 2015 23:04:29 +0000 (09:04 +1000)]
#include base classes
TimePath [Sun, 3 May 2015 22:50:36 +0000 (08:50 +1000)]
#include base classes
TimePath [Sun, 3 May 2015 22:25:19 +0000 (08:25 +1000)]
Don't accumulate the beginning of the constructor
TimePath [Sun, 3 May 2015 22:22:35 +0000 (08:22 +1000)]
Sort menu classes
TimePath [Sun, 3 May 2015 21:54:22 +0000 (07:54 +1000)]
Tidy up OO helpers
terencehill [Sun, 3 May 2015 16:15:35 +0000 (18:15 +0200)]
Forgot to patch this file in the previous commit
terencehill [Sun, 3 May 2015 16:11:03 +0000 (18:11 +0200)]
Allow custom color and alpha values for the crosshair picker (like it is for the charmap)
terencehill [Sun, 3 May 2015 14:39:44 +0000 (16:39 +0200)]
Listbox / Picker: Implement item fading in a different way so that it gets influenced by menu_slowmo
terencehill [Sun, 3 May 2015 11:39:49 +0000 (13:39 +0200)]
Optimize cellToCrosshair function
TimePath [Sun, 3 May 2015 11:39:11 +0000 (21:39 +1000)]
Merge CLASS and EXTENDS, #define NEW(cname) (spawn##cname())
terencehill [Sun, 3 May 2015 11:38:12 +0000 (13:38 +0200)]
Highlight the selected cell in the picker
TimePath [Sun, 3 May 2015 06:34:58 +0000 (16:34 +1000)]
Cleanup server progs.src
TimePath [Sun, 3 May 2015 06:16:26 +0000 (16:16 +1000)]
Cleanup weapons #includes
TimePath [Sun, 3 May 2015 05:09:20 +0000 (15:09 +1000)]
Fix client compile
TimePath [Sun, 3 May 2015 05:00:21 +0000 (15:00 +1000)]
Cleanup vehicle #includes
TimePath [Sun, 3 May 2015 03:19:14 +0000 (13:19 +1000)]
Fix more server #includes
TimePath [Sun, 3 May 2015 02:06:55 +0000 (12:06 +1000)]
Modularise commands
terencehill [Sat, 2 May 2015 22:54:23 +0000 (00:54 +0200)]
Remove crosshair images from the skins
terencehill [Sat, 2 May 2015 22:43:31 +0000 (00:43 +0200)]
Don't color the dot in the crosshair preview
terencehill [Sat, 2 May 2015 22:30:57 +0000 (00:30 +0200)]
Make Charmap and CrosshairPicker subclasses of the class Picker
TimePath [Sat, 2 May 2015 12:28:02 +0000 (22:28 +1000)]
Make most server includes order insensitive
TimePath [Sat, 2 May 2015 05:15:44 +0000 (15:15 +1000)]
Create common client header
TimePath [Sat, 2 May 2015 04:48:31 +0000 (14:48 +1000)]
Fix MCU client compile
(multiple compilation units)
TimePath [Sat, 2 May 2015 04:40:48 +0000 (14:40 +1000)]
Remove direct server #includes from client
TimePath [Sat, 2 May 2015 03:14:27 +0000 (13:14 +1000)]
Sort #includes
terencehill [Fri, 1 May 2015 21:08:10 +0000 (23:08 +0200)]
Make crosshair picker code similar to the charmap's in order to simplify cell highlighting (each single crosshair was a special button). Add a custom simplified class for the crosshair preview too (it's not a button anymore).
Mario [Fri, 1 May 2015 19:22:00 +0000 (05:22 +1000)]
Boolerize another pesky float
TimePath [Fri, 1 May 2015 13:46:42 +0000 (23:46 +1000)]
Make client includes order insensitive
Mario [Fri, 1 May 2015 11:55:49 +0000 (21:55 +1000)]
Merge branch 'master' into Mario/qc_physics_prehax
Conflicts:
qcsrc/server/autocvars.qh
qcsrc/server/g_triggers.qc
qcsrc/server/g_triggers.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutator_dodging.qc
qcsrc/server/t_plats.qc
qcsrc/server/target_music.qc
Mario [Fri, 1 May 2015 11:53:37 +0000 (21:53 +1000)]
Convert some more floats to ints/bools
TimePath [Fri, 1 May 2015 08:57:44 +0000 (18:57 +1000)]
Avoid including the same file twice in progs.src
terencehill [Thu, 30 Apr 2015 20:21:22 +0000 (22:21 +0200)]
Add the fade effect in the charmap too
terencehill [Tue, 28 Apr 2015 18:34:48 +0000 (20:34 +0200)]
Make work menu_showboxes with the charmap
terencehill [Mon, 27 Apr 2015 19:11:16 +0000 (21:11 +0200)]
Better names for 3 fields
terencehill [Mon, 27 Apr 2015 17:45:25 +0000 (19:45 +0200)]
Add skin attributes for listbox focused items and allow customization of the fade effect
terencehill [Sun, 26 Apr 2015 12:33:56 +0000 (14:33 +0200)]
Listbox: highlight item under the cursor
TimePath [Sun, 26 Apr 2015 07:32:03 +0000 (17:32 +1000)]
Define client entity classes
TimePath [Sun, 26 Apr 2015 06:46:37 +0000 (16:46 +1000)]
Reclaim the `new` keyword for entity classes
TimePath [Sun, 26 Apr 2015 06:07:49 +0000 (16:07 +1000)]
Make pointer to member usage explicit
TimePath [Sat, 25 Apr 2015 06:32:36 +0000 (16:32 +1000)]
Declare more ints as ints
TimePath [Sat, 25 Apr 2015 06:17:02 +0000 (16:17 +1000)]
Declare more ints as ints
TimePath [Sat, 25 Apr 2015 06:00:13 +0000 (16:00 +1000)]
Declare more ints as ints
Mario [Sun, 26 Apr 2015 04:21:16 +0000 (14:21 +1000)]
Revert spawn_furthest to 0.5 (half random, half furthest, works better for small maps)
Mario [Sat, 25 Apr 2015 08:41:21 +0000 (18:41 +1000)]
Default cl_movement to 1
Mario [Sat, 25 Apr 2015 08:32:09 +0000 (18:32 +1000)]
Merge some changes from combined updates branch
Mario [Sat, 25 Apr 2015 04:23:53 +0000 (14:23 +1000)]
Fix a few more floats
Mario [Sat, 25 Apr 2015 04:21:18 +0000 (14:21 +1000)]
Fix copy of ammo_none in defs.qh
Mario [Sat, 25 Apr 2015 04:18:57 +0000 (14:18 +1000)]
Few more floats to ints/bools
Mario [Sat, 25 Apr 2015 04:16:22 +0000 (14:16 +1000)]
Fix a few more floats in arrays
Mario [Sat, 25 Apr 2015 04:03:18 +0000 (14:03 +1000)]
Boolinterize hud.qc
Mario [Sat, 25 Apr 2015 02:52:46 +0000 (12:52 +1000)]
Fix some more floats in arrays
Mario [Sat, 25 Apr 2015 02:15:22 +0000 (02:15 +0000)]
Merge branch 'TimePath/lint' into 'master'
TimePath/lint
A few changes to get my static analysis tool working
See merge request !121
TimePath [Sun, 19 Apr 2015 10:53:16 +0000 (20:53 +1000)]
Declare `.SendEntity` as `bool(entity, int)`
TimePath [Sun, 19 Apr 2015 10:52:47 +0000 (20:52 +1000)]
Declare `stoi` and `itos` when QCC_SUPPORT_INT
TimePath [Sat, 18 Apr 2015 06:38:45 +0000 (06:38 +0000)]
Remove redundant assignment
Penguinum [Fri, 24 Apr 2015 13:56:44 +0000 (16:56 +0300)]
fix (unused variable)
Penguinum [Fri, 24 Apr 2015 13:49:14 +0000 (16:49 +0300)]
Some cleanup
Penguinum [Fri, 24 Apr 2015 13:36:42 +0000 (16:36 +0300)]
Looks like everything works now
Mario [Fri, 24 Apr 2015 12:15:10 +0000 (22:15 +1000)]
Couple more array fixes
Mario [Fri, 24 Apr 2015 12:11:50 +0000 (22:11 +1000)]
Few more floats to ints for arrays
Mario [Fri, 24 Apr 2015 12:08:50 +0000 (22:08 +1000)]
Some more floats to ints/bools
Mario [Fri, 24 Apr 2015 12:02:12 +0000 (22:02 +1000)]
Fix a few more floats, add the long awaited stob macro
Mario [Fri, 24 Apr 2015 05:33:32 +0000 (15:33 +1000)]
Add a couple of missing pieces for the impressive announcement
Mario [Fri, 24 Apr 2015 04:55:56 +0000 (14:55 +1000)]
Convert a load more floats into ints and bools
Penguinum [Thu, 23 Apr 2015 12:03:15 +0000 (15:03 +0300)]
Antiwall works, need to modify triggers
Penguinum [Thu, 23 Apr 2015 09:38:40 +0000 (12:38 +0300)]
Started working on antiwalls
Mario [Thu, 23 Apr 2015 08:34:23 +0000 (18:34 +1000)]
Even more floats to bool/int
Mario [Thu, 23 Apr 2015 07:33:06 +0000 (17:33 +1000)]
Add impressive announcement to vortex
Mario [Thu, 23 Apr 2015 00:59:00 +0000 (10:59 +1000)]
Convert some floats into ints
terencehill [Sun, 19 Apr 2015 10:35:13 +0000 (12:35 +0200)]
Merge branch 'master' into terencehill/hud_configure
Mario [Sat, 18 Apr 2015 03:51:49 +0000 (03:51 +0000)]
Merge branch 'terencehill/unlimited_ammo_fixes' into 'master'
Unlimited ammo fixes
Fix a few weapons not working with 0 ammo while owning the unlimited ammo powerup
Namely Arc, Devastator and Hagar.
See merge request !119
Mirio [Thu, 16 Apr 2015 00:10:12 +0000 (02:10 +0200)]
Update credits
Mario [Wed, 15 Apr 2015 23:58:45 +0000 (09:58 +1000)]
Add an option to override the default physics set (useful for using cvar based physics sets rather than the regular config scripts)
Mario [Wed, 15 Apr 2015 22:49:44 +0000 (08:49 +1000)]
Remove an old unused model
terencehill [Wed, 15 Apr 2015 22:47:56 +0000 (00:47 +0200)]
Merge branch 'master' into terencehill/unlimited_ammo_fixes