ryzom-core

Commit Graph

Select branches

Hide Pull Requests

10-use-item-shortcut-client

13-inventory-fixes

16-drag-drop-to-player-trade-window-from-all-inventories

18-enchant-icon-does-not-properly-update-on-weapon

20-add-equip-option-to-right-click-dialog-in-all-inventories

21-fix-nopatch-without-argument-crash

23-sort-inventory-by-type-weight-bulk-quantity-quality

23-sort-inventory-by-type-weight-bulk-quantity-quality-2

25-remove-lock-option-from-item-menu-in-guild-inventory

26-encoding-issues-in-client-beta-after-core4-merge

27-fixed-crash-with-html-image-downloads

30-changes-for-silan-refactoring

35-allow-drag-and-drop-between-zig-and-guild

36-add-ability-to-have-translated-titles-with-untraslated-fields

38-add-smooth-resizing-of-entitie-when-vpb-are-changed

40-dragging-from-player-trade-to-inventory-takes-two-tries

43-crafting-items-are-not-sorted

46-rework-item-buff-icon-placement

47-hide-quality-indicator-on-item-if-equal-to-1

51-shift-enter-at-merchant-no-longer-sells-to-merchant

52-add-escape-shortcut-to-open-quit-menu

53-setting-to-change-tooltip-opacity

55-remove-chat-replies-shortcuts

6-animal-status-innacurate-when-zig-is-in-bag

60-weapon-does-not-show-in-both-hands-on-load-in

add-screenshot-dir-to-config

add-toggle-free-look-ah

atys

core4

develop

feature/3ds-max-2020

feature/bonusmalus-timers

feature/build-pipeline-v3

feature/cdb-packed

feature/cdb-packed-ryzomclassic

feature/change-sound-driver-ingame

feature/clean-deprecated

feature/code-to-root

feature/colissions-stairs

feature/compatibility-old-gcc

feature/core4-atys

feature/css-lang-var

feature/develop-atys

feature/hires-textures

feature/hunter

feature/hunter-dxsdk-download

feature/nel-dll

feature/opengl3

feature/pipeline-tools

feature/post-code-move

feature/pre-code-move

feature/prepare-cross-merge

feature/quick-start-py

feature/split-action-bar-1-and-2

feature/streamed-package

feature/version-resources

fix-area-effect-flying-text

fix-linux-multi-monitor

fix-media-player

fix-media-player-playlist-limit

fix-menu-scroll

fix-viewtext-localized-text

fix_opengl_on_mac

fixes

fx

hg/ark

hg/atys

hg/compatibility

hg/compatibility-develop

hg/develop

hg/feature/build_pipeline_v3

hg/feature/cdb-packed

hg/feature/cef3

hg/feature/game-device

hg/feature/gsoc2012-fabien

hg/feature/gsoc2013-dfighter

hg/feature/html-improvements

hg/feature/light_cycle

hg/feature/material-editor

hg/feature/menu-navi

hg/feature/opengl3

hg/feature/qt5

hg/feature/sdl2

hg/feature/sound

hg/feature/sse2

hg/feature/streamed-package

hg/hotfix/patches-from-atys

hg/yubo

inventory-fixes

kaetemi-develop

main/atys-live

main/atys-pre-live

main/gingo-test

main/yubo-dev

merge/2021-11-19

ryzom/ark/features

ryzom/deepl

ryzom/lua-features

ryzom/op_refactoring

ryzom/patch-changes

ryzom/sheets

ryzom/silan_refactoring

ryzom/ui/improvements

ryzomclassic-develop

self-kill

storyline/s2e0

storyline/s2e1

undelete-develop

use-item-macro

webig-fixes

3.3.0

Live-746

Live-791

Live-803

Live-813

Live-831

Live-832

Live-834

compatibility-merge

latest-default-graft

latest-graft-to-default

latest-merge-from-default

live/837

live/893

live/895

ryzom-patch-3.0.0

ryzom-patch-3.0.1

ryzom-patch-3.0.2

ryzom-patch-3.1.0

ryzom-patch-3.1.0-april_patch

ryzom-patch-3.1.0-hotfix

ryzom-patch-3.2.0

ryzom-patch-3.2.1

ryzom-patch-3.3.0

ryzom-patch-3.3.1

ryzom-patch-3.4.0

ryzom-patch-3.4.0_Atysmas

ryzom-patch-3.4.0_Steam_Fix

ryzom-patch-3.5.0

ryzom-patch-3.5.0.9637

ryzom/3.0.0

ryzom/3.0.1

ryzom/3.0.2

ryzom/3.1.0

ryzom/3.1.0-april_patch

ryzom/3.1.0-hotfix

ryzom/3.2.0

ryzom/3.2.1

ryzom/3.3.0

ryzom/3.3.1

ryzom/3.4.0

ryzom/3.4.0-atysmas

ryzom/3.4.0-steam_fix

ryzom/3.5.0

ryzom/3.5.0.9637

ryzomcore/v0.10.0

ryzomcore/v0.11.0

ryzomcore/v0.11.1

ryzomcore/v0.11.2

ryzomcore/v0.11.3

ryzomcore/v0.12.0

ryzomcore/v0.8.0

ryzomcore/v0.9.0

ryzomcore/v0.9.1

ryzomcore/v1.0.0

ryzomcore/v1.0.1

ryzomcore_0_8_0

v0.10.0

v0.11.0

v0.11.1

v0.11.2

v0.11.3

v0.12.0

v0.8.0

v0.9.0

v0.9.1

v1.0.0

v1.0.1

e5731412bc Merge branch 'fix-linux-multi-monitor' into 'main/gingo-test' Meelis Mägi 2022-03-25 10:49:18 +0000
7b1a38ae96 Fix build error on mac/windows fix-linux-multi-monitor nimetu 2022-03-25 12:46:35 +0200
62742dceca Fix build error on mac/windows core4 nimetu 2022-03-25 12:46:35 +0200
1b386dd648 Enable ConfigureEvent for fullscreen window nimetu 2022-03-24 14:49:08 +0200
853e19cd64 Fix KDE/GNOME windowed/fullscreen switching nimetu 2022-03-22 14:18:50 +0200
a04956989a Client should only use setWindowPos in windowed mode nimetu 2022-03-22 15:13:50 +0200
4fa80a0aec Fix getCurrentScreenMode() when no window has been created yet nimetu 2022-03-18 14:45:38 +0200
cc54a0b1f4 Enable ConfigureEvent for fullscreen window nimetu 2022-03-24 14:49:08 +0200
42986280a5 Fix KDE/GNOME windowed/fullscreen switching nimetu 2022-03-22 14:18:50 +0200
9a219fb410 Client should only use setWindowPos in windowed mode nimetu 2022-03-22 15:13:50 +0200
f6a020bd3a Fix getCurrentScreenMode() when no window has been created yet nimetu 2022-03-18 14:45:38 +0200
8487efe66b Merge branch 'add-toggle-free-look-ah' into 'main/gingo-test' Meelis Mägi 2022-03-22 12:21:09 +0000
dbf01362cb Add CUserControls::getFreeLook() method add-toggle-free-look-ah nimetu 2022-03-22 14:19:44 +0200
3a3cad6176 Add toggle_free_look action handler nimetu 2022-03-21 10:46:12 +0200
9e3e56b50b Merge remote-tracking branch 'origin/53-setting-to-change-tooltip-opacity' into main/yubo-dev main/yubo-dev Nuno 2022-03-20 10:37:52 +0100
224c14cfef Merge remote-tracking branch 'origin/fix-media-player-playlist-limit' into main/yubo-dev Nuno 2022-03-20 10:37:20 +0100
fbf842c75a Merge remote-tracking branch 'origin/feature/split-action-bar-1-and-2' into main/yubo-dev Nuno 2022-03-20 10:36:17 +0100
ef1cde194d Merge branch 'fix-media-player-playlist-limit' into 'main/gingo-test' Meelis Mägi 2022-03-14 12:00:10 +0000
80e556ca8a Limit media playlist using list maxelements property fix-media-player-playlist-limit nimetu 2022-03-14 13:49:15 +0200
fc8c8e1660 Merge branch '53-setting-to-change-tooltip-opacity' into 'main/gingo-test' Ben Saine 2022-03-07 09:32:17 +0000
b184192bc2

Merge pull request #654 from ryzom/feature/change-sound-driver-ingame nimetu 2022-03-07 11:01:26 +0200
95d1295553 Move hunter luabind names under generic names nimetu 2022-03-06 14:45:51 +0200
4c3cae63d4 Fix linking when using static libvorbisfile library nimetu 2022-03-06 14:11:57 +0200
0118e8d622 Fix CURL_LIBRARIES for cURL config-file package nimetu 2022-03-06 14:07:10 +0200
513712be02 Fix missing symbol from shared library under macOS nimetu 2022-03-06 13:49:45 +0200
fd4d3e0c34 Allow to change sound driver from ingame (ryzom/ryzomcore#63) feature/change-sound-driver-ingame Nimetu 2021-11-02 13:13:03 +0200
f36450d815 Sound driver selection ui Nimetu 2021-12-20 12:35:03 +0200
db526ef68b Runtime discovery of available sound drivers Nimetu 2021-11-03 15:39:39 +0200
d752c914f5 Rename lzma binary to nellzma nimetu 2022-03-05 23:19:13 +0200
d7909d74ba Merge branch '10-use-item-shortcut-client' into 'main/gingo-test' Ben Saine 2022-03-02 16:49:04 +0000
5ad6cffb21 add: item groups refactor draft 10-use-item-shortcut-client Ben 2022-03-02 11:48:56 -0500
85a8c956fb fixes 53-setting-to-change-tooltip-opacity bensaine 2022-02-26 15:56:43 -0500
1c65914b10 fix: tooltip opacity bensaine 2022-02-26 02:50:56 -0500
56d9c5fd04 Merge branch '47-hide-quality-indicator-on-item-if-equal-to-1' into main/yubo-dev Nuno 2022-02-25 18:52:33 +0100
00f02e1603 Added 47-hide-quality-indicator-on-item-if-equal-to-1 Nuno 2022-02-25 18:51:40 +0100
2817c8d823 Merge remote-tracking branch 'origin/52-add-escape-shortcut-to-open-quit-menu' into main/yubo-dev Nuno 2022-02-24 23:57:50 +0100
1fc8cabb22 Merge remote-tracking branch 'origin/51-shift-enter-at-merchant-no-longer-sells-to-merchant' into main/yubo-dev Nuno 2022-02-24 23:57:18 +0100
a5635ba27d Merge remote-tracking branch 'origin/18-enchant-icon-does-not-properly-update-on-weapon' into main/yubo-dev Nuno 2022-02-24 23:56:30 +0100
d6d0417419 add: hands to equip tab bensaine 2022-02-24 00:42:33 -0500
ddb4cce712 initial draft bensaine 2022-02-23 23:34:38 -0500
0e04bb2f10 Merge branch '18-enchant-icon-does-not-properly-update-on-weapon' into 'main/gingo-test' Meelis Mägi 2022-02-22 18:25:12 +0000
1725878201 Improve item icon buff update 18-enchant-icon-does-not-properly-update-on-weapon nimetu 2022-02-22 13:45:23 +0200
9d991864c8

Merge branch 'core4' into feature/quick-start-py feature/quick-start-py kaetemi 2022-02-22 13:02:28 +0800
a6139ade22

Disable arch checks on 32 bit GCC that don't build kaetemi 2022-02-22 12:56:44 +0800
3fae9db854

Set march explicitly kaetemi 2022-02-22 12:30:00 +0800
47d178e102

Explicitly disable SSE2 on 32bit build kaetemi 2022-02-22 12:08:43 +0800
40ffcb30b6

Set arch for x86 linunx build explicitly kaetemi 2022-02-22 11:44:33 +0800
80be596654

Create Docker image for 32 bit linux client build as well kaetemi 2022-02-22 10:54:40 +0800
57190a279a

Merge branch 'core4' into feature/quick-start-py kaetemi 2022-02-22 06:47:13 +0800
5b85b4e837

End music playback on critical error, ryzom/ryzomcore#661 kaetemi 2022-02-22 06:45:20 +0800
22883a1551

Music kaetemi 2022-02-22 06:45:20 +0800
fb3f1a2164 Merge branch '23-sort-inventory-by-type-weight-bulk-quantity-quality-2' into 'main/gingo-test' Ben Saine 2022-02-20 01:32:33 +0000
00c8c4f621 add: sorting (initial draft) 23-sort-inventory-by-type-weight-bulk-quantity-quality-2 bensaine 2021-12-01 12:28:34 -0500
e80e4b0d7c Merge branch '51-shift-enter-at-merchant-no-longer-sells-to-merchant' into 'main/gingo-test' Ben Saine 2022-02-19 17:26:53 +0000
ee699078a9 change: way of checking if shift is pushed 51-shift-enter-at-merchant-no-longer-sells-to-merchant bensaine 2022-02-19 12:26:37 -0500
43f21357fa

Merge branch 'core4' into feature/quick-start-py kaetemi 2022-02-19 08:07:35 +0800
01881d26c3

Fix luabind under GCC 9 etc kaetemi 2022-02-19 08:07:12 +0800
36622e9cc8 Merge branch '52-add-escape-shortcut-to-open-quit-menu' into 'main/gingo-test' Ben Saine 2022-02-18 06:15:54 +0000
caeccac5d6 add: open quit dialog on escape 52-add-escape-shortcut-to-open-quit-menu bensaine 2022-02-18 01:15:42 -0500
929a126155 Merge remote-tracking branch 'origin/60-weapon-does-not-show-in-both-hands-on-load-in' into main/yubo-dev Nuno 2022-02-15 14:11:04 +0100
53aa9162a0 Merge branch '60-weapon-does-not-show-in-both-hands-on-load-in' into 'main/gingo-test' Ben Saine 2022-02-14 17:02:20 +0000
d453ba89b2 Fix Weapon does not show in both hands on load-in 60-weapon-does-not-show-in-both-hands-on-load-in nimetu 2022-02-14 18:51:04 +0200
a71b15f4c4 Merge branch 'feature/split-action-bar-1-and-2' into 'main/gingo-test' Meelis Mägi 2022-02-12 16:35:13 +0000
904f9e5ec9 Merge branch '30-changes-for-silan-refactoring' into 'main/gingo-test' Nuno Gonçalves (Ulukyn) 2022-02-11 14:14:21 +0000
e1bb180055 Merge branch '23-sort-inventory-by-type-weight-bulk-quantity-quality' into 'main/gingo-test' Ben Saine 2022-02-11 02:16:02 +0000
7290fe937d Merge branch '38-add-smooth-resizing-of-entitie-when-vpb-are-changed' into 'main/gingo-test' Nuno Gonçalves (Ulukyn) 2022-02-11 02:16:02 +0000
5676438aff Update action_handler_item.cpp bensaine 2022-02-09 20:31:35 -0500
7f796d86ec Update inventory_manager.cpp bensaine 2022-02-09 20:12:58 -0500
eda9f224bc Merge remote-tracking branch 'origin/10-use-item-shortcut-client' into main/yubo-dev Nuno 2022-02-09 23:33:04 +0100
214f2f94ed Merge branch '43-crafting-items-are-not-sorted' into 'main/gingo-test' Meelis Mägi 2022-02-09 21:44:24 +0000
7200a01f3d Merge branch 'main/gingo-test' into main/atys-live main/atys-live Nuno 2022-02-09 22:38:58 +0100
7df9b2f255 Merge branch '58-add-rotz-roty-and-dist-reflect-lua-to-3dcamera-of-a-scene' into 'main/gingo-test' main/gingo-test Nuno Gonçalves (Ulukyn) 2022-02-09 21:38:23 +0000
8697553956 Resolve "Add rotz roty and dist reflect lua to 3DCamera of a scene" Nuno Gonçalves (Ulukyn) 2022-02-09 21:38:23 +0000
3308a0a43a Merge branch '58-add-rotz-roty-and-dist-reflect-lua-to-3dcamera-of-a-scene' into 'main/gingo-test' Nuno Gonçalves (Ulukyn) 2022-02-09 21:38:07 +0000
fb7932113e Added Nuno 2022-02-09 22:37:58 +0100
9fc091f99b Add macro checks for enable code for old gcc version (< 40800) Nuno 2022-02-09 17:24:49 +0100
3069d648e6 Merge branch 'server/yubo-dev' into main/yubo-dev Nuno 2022-02-09 17:20:26 +0100
7129a8fa5f Add macro checks for enable code for old gcc version (< 40800) Nuno 2022-02-09 17:20:08 +0100
ab4aa7487c Revert "Merge branch 'server/yubo-dev' into main/yubo-dev" Nuno 2022-02-09 16:27:46 +0100
a4d92c34bd Merge branch 'server/yubo-dev' into main/yubo-dev Nuno 2022-02-09 16:27:46 +0100
47d3a0bb8a Merge remote-tracking branch 'origin/10-use-item-shortcut-client' into server/yubo-dev Nuno 2022-02-09 16:26:58 +0100
df24bf6129 fixes bensaine 2022-02-09 00:11:12 -0500
9517cc7384 Merge remote-tracking branch 'origin/10-use-item-shortcut-client' into server/yubo-dev Nuno 2022-02-09 02:38:54 +0100
fe4c39b593 move hotbar index bensaine 2022-02-08 20:35:19 -0500
3fc85ea291 Split action bar 1 and 2 into separate sets feature/split-action-bar-1-and-2 nimetu 2022-02-08 15:30:47 +0200
7aa639138a revert _IsHotbarSlot bensaine 2022-02-07 23:49:24 -0500
b3b473d671 Merge branch 'main/yubo-dev' into server/yubo-dev Nuno 2022-02-08 02:52:14 +0100
66980e5002 ? Nuno 2022-02-08 02:51:55 +0100
96c0da8efd Merge branch 'main/atys-live' into main/yubo-dev Nuno 2022-02-08 02:47:48 +0100
52c4b07bd5 Merge branch '10-use-item-shortcut-client' into main/yubo-dev Nuno 2022-02-08 02:47:45 +0100
e7dec3d6b0 add: INVENTORIES:hotbar bensaine 2022-02-07 20:46:39 -0500
45518dd32c Merge branch 'main/gingo-test' into main/atys-live Nuno 2022-02-08 02:32:29 +0100
d2508c8b15 Update hunter to 0.23.321 nimetu 2022-01-29 11:29:43 +0200
ec1b58713e Merge branch 'main/gingo-test' into main/atys-live Nuno 2022-02-07 23:48:14 +0100
c1f33eb142

Merge remote-tracking branch 'origin/core4' into feature/quick-start-py kaetemi 2022-02-08 02:18:34 +0800
1138817a50

Clarify CTA further, ref ryzom/ryzomcore#660 Jan Boon 2022-02-07 22:38:14 +0800
439eb542e6

Address ryzom/ryzomcore#659 Jan Boon 2022-02-07 21:30:04 +0800
ca106f4361

Merge remote-tracking branch 'origin/core4' into feature/quick-start-py kaetemi 2022-02-07 03:37:51 +0800
c9f9717e1f

Some corrections Jan Boon 2022-02-06 17:30:21 +0800
b6b67f7482 initial draft bensaine 2022-02-04 18:17:31 -0500