Joshua Barretto
|
f44b05f9d3
|
Merge branch 'master' into 'master'
Changed default server address to 'server.veloren.net'
See merge request veloren/veloren!43
Former-commit-id: 60cfa39be80cbe2fc4a1f6db21b19c5850aa65e6
|
2019-04-17 15:08:56 +00:00 |
|
Joshua Barretto
|
a87cdc1993
|
Changed default server address to 'server.veloren.net'
Former-commit-id: 660083d3d7ca341428b8c3cd8d54dd3ac1f453ab
|
2019-04-17 16:08:25 +01:00 |
|
Joshua Barretto
|
cacb1855fd
|
Merge branch 'master' into 'master'
Change timeout to 20s
See merge request veloren/veloren!44
Former-commit-id: d2d90a870a7a429f6e0bdee86e1b0c95d362840d
|
2019-04-17 15:08:00 +00:00 |
|
timokoesters
|
1ae18fecf8
|
Change timeout to 20s
Former-commit-id: dca0d08a06c27259cdaaf0138024f53c6c93d94e
|
2019-04-17 16:46:04 +02:00 |
|
Joshua Barretto
|
786dc16092
|
Merge branch 'master' into 'master'
Added ForceUpdate component upon teleport-related commands
See merge request veloren/veloren!41
Former-commit-id: 7597499a7949620a20558a855ddb85a7ccea58d2
|
2019-04-17 13:02:16 +00:00 |
|
Joshua Barretto
|
9286de1368
|
Added ForceUpdate component upon teleport-related commands
Former-commit-id: ff10c863466e6f4f6cc931b5980917145f38b222
|
2019-04-17 14:00:24 +01:00 |
|
Joshua Barretto
|
49a2d6be64
|
Merge branch 'master' into 'master'
Fixed animation copypasta bug
See merge request veloren/veloren!38
Former-commit-id: 1ace57b79466228258c49f6943ec016a03f29231
|
2019-04-17 09:08:00 +00:00 |
|
Joshua Barretto
|
6693d22ecd
|
Fixed animation copypasta bug
Former-commit-id: e4b06e4e7c50214c7d7d9cc618ea7f117dc78ccc
|
2019-04-17 10:07:02 +01:00 |
|
Joshua Barretto
|
328a11a4af
|
Merge branch 'master' into 'master'
Added basic agent AI
See merge request veloren/veloren!36
Former-commit-id: 384f3be090870a308d82d543797e6c84064ccc84
|
2019-04-17 09:00:30 +00:00 |
|
Joshua Barretto
|
8029edde0b
|
Moved animation determination to Control ECS system
Former-commit-id: 6650bc4d882d3f6779f99afea2e05155ad008282
|
2019-04-17 09:59:38 +01:00 |
|
Joshua Barretto
|
edcabfa68f
|
Fix creation update
Former-commit-id: 3ad0f4cd3ee8f319229f85f1c0c289be9d4b5bfb
|
2019-04-17 01:39:39 +01:00 |
|
Joshua Barretto
|
2c650f9cff
|
Added basic agent AI
Former-commit-id: bb17edc8f2027c0c63c6a3ef0fc80c7a68c9aa05
|
2019-04-17 01:39:39 +01:00 |
|
Joshua Barretto
|
3fa8861e82
|
Merge branch 'master' into 'master'
Fix most spacing issues in chat
See merge request veloren/veloren!37
Former-commit-id: 5a2ed3489eb1125f03fa5a23ba0d1025cbf267ff
|
2019-04-17 00:38:48 +00:00 |
|
Imbris
|
3658a50685
|
Fix most spacing issues in chat
Former-commit-id: 90a4080123b77630888967423b030153b9f81709
|
2019-04-16 20:17:15 -04:00 |
|
Joshua Barretto
|
d4368e2891
|
Merge branch 'master' into 'master'
add chat commands
See merge request veloren/veloren!33
Former-commit-id: dbef1677b800ae3eaecdeba4fda12973654c9149
|
2019-04-16 21:16:07 +00:00 |
|
Joshua Barretto
|
a80ddb807f
|
Merge branch 'master' into 'master'
Better camera positioning, smooth acceleration
See merge request veloren/veloren!35
Former-commit-id: ca38f861d1cc102fd9f2cb3f490871ea753f748f
|
2019-04-16 19:25:01 +00:00 |
|
Joshua Barretto
|
db527e64df
|
Improved camera attributes and focus
Former-commit-id: 223f85c884c063c5cbb7d6c9f9f5c4a8c62a7ffd
|
2019-04-16 20:22:04 +01:00 |
|
Joshua Barretto
|
2ea1de2659
|
Added smooth acceleration
Former-commit-id: 4dfc695e5d1485b77ef98b1f5895d3eee69c46e1
|
2019-04-16 20:21:49 +01:00 |
|
Joshua Barretto
|
9928ad6e52
|
Merge branch 'master' into 'master'
Implement animation smoothing
Closes #22
See merge request veloren/veloren!34
Former-commit-id: a7ae76993439e5538e9131e7c20843377af5973b
|
2019-04-16 19:10:57 +00:00 |
|
timokoesters
|
8cc4399d18
|
Handle bone orientation and scale as well
Former-commit-id: 80c80342ae3458b98c2520359bc0a0705b22dbc1
|
2019-04-16 20:55:04 +02:00 |
|
timokoesters
|
713b59aeff
|
Implement animation smoothing
Former-commit-id: e89caca7d273934533c57c4324365a126d02e5df
|
2019-04-16 20:26:24 +02:00 |
|
Joshua Barretto
|
63cb6a1625
|
Merge branch 'keybinding' into 'master'
Add support for keybinding
Closes #7
See merge request veloren/veloren!30
Former-commit-id: 07afd6faabd3091f9bf232fa1688f444f5a6a26e
|
2019-04-16 17:45:14 +00:00 |
|
Louis Pearson
|
780e034674
|
Add better defaults support
Former-commit-id: fa77acae3ee2b99cbf37a8fec71ee1913e889d82
|
2019-04-16 11:41:39 -06:00 |
|
sxv20_
|
dbccb34582
|
replace if-let with match
Former-commit-id: ed39cbb1ccc69302cb65822ad4a4cfecd2bd8f86
|
2019-04-16 18:08:47 +01:00 |
|
sxv20_
|
4e3c97862e
|
Update docs
Former-commit-id: 381a759ebcefb4f0fad76fe66ca2720b572849b5
|
2019-04-16 18:08:47 +01:00 |
|
sxv20_
|
447bf18a63
|
add documentation
Former-commit-id: 5abbbaf9b24702dffc345466b1af60ee594bf01a
|
2019-04-16 18:08:47 +01:00 |
|
sxv20_
|
cf3235d351
|
move chat command code to cmd.rs
Former-commit-id: 25bbcceae51024439dbf6c143a49e3d5d55e7f4b
|
2019-04-16 18:08:47 +01:00 |
|
sxv20_
|
ee47b598aa
|
use handlers instead of hard-coding for commands
Former-commit-id: 80d693254bfbfc7ae0ea4dcbdc76301dca067468
|
2019-04-16 18:08:47 +01:00 |
|
sxv20_
|
f8d75d900e
|
Clean up help message and if-let
Former-commit-id: 450281467a92b2b8186df74d83d108457513277a
|
2019-04-16 18:08:47 +01:00 |
|
Sebastian Venter
|
031e4b36d6
|
add chat commands, rustfmt
Former-commit-id: 64941127598b53c64fe2e0e7c167f0ce3f358060
|
2019-04-16 18:08:47 +01:00 |
|
Louis Pearson
|
515039c62d
|
Add auto generation of settings.toml if it does not already exist
Former-commit-id: 941b81a8faeff89096256666c56ae472d9b569d5
|
2019-04-16 10:06:23 -06:00 |
|
Louis Pearson
|
9592eb67c5
|
Add default keybindings
Former-commit-id: c8886a2eb3326ba62e31ef84b93a29ee59f378b3
|
2019-04-16 08:57:31 -06:00 |
|
Louis Pearson
|
55f3f0857f
|
Add support for keybinding
Former-commit-id: 1edbf3bebb8d1651a1b912cedcd3513dfb287fa1
|
2019-04-16 08:57:31 -06:00 |
|
Joshua Barretto
|
19d6b7b38a
|
Merge branch 'anim' into 'master'
Animation States
See merge request veloren/veloren!31
Former-commit-id: 4f59aa8df9dbbcb9e89696a3b76b17a77a0f706a
|
2019-04-16 14:29:45 +00:00 |
|
Piotr
|
ddb32eec30
|
Animation States
Former-commit-id: 769f09dc44143b5e54623ea819db2d6149429184
|
2019-04-16 14:29:44 +00:00 |
|
Joshua Barretto
|
0a2b0e98e8
|
Merge branch 'master' into 'master'
Add proper README
See merge request veloren/veloren!32
Former-commit-id: 4880c96a57f0a06706421d4818bac8a677b599ae
|
2019-04-16 09:25:57 +00:00 |
|
timokoesters
|
53aea6c4c0
|
Add proper README
Former-commit-id: f615e2eff7ff3522d11758e9a607d30beb6eb707
|
2019-04-16 11:12:46 +02:00 |
|
Joshua Barretto
|
42686f5758
|
Merge branch 'master' into 'master'
Remove unnecessary == true
See merge request veloren/veloren!29
Former-commit-id: 89739c0788f389e8d9c7f4a8c2df2e177d274633
|
2019-04-15 17:52:11 +00:00 |
|
timokoesters
|
7ca6be2d5b
|
Remove unnecessary == true
Former-commit-id: bb9df3870e2549b8e66b0cc8d2ece29e336f22e9
|
2019-04-15 19:39:01 +02:00 |
|
Joshua Barretto
|
a41b642570
|
Merge branch 'master' into 'master'
Solve physics fighting problem
See merge request veloren/veloren!27
Former-commit-id: 010af4fb0f31b854dd1f8c42f6a65711cc9d84cd
|
2019-04-15 16:43:41 +00:00 |
|
Joshua Barretto
|
f32852054d
|
Merge branch 'master' into 'master'
Disable zooming when mouse is over UI elements
See merge request veloren/veloren!28
Former-commit-id: cd6f02ac06777c0ed065024f31d3960a2af4898a
|
2019-04-15 01:19:46 +00:00 |
|
Imbris
|
571e319a62
|
make zooming always work if cursor is grabbed
Former-commit-id: e07bb0746fa117f045d62919a4ca55a8eb0c6cf7
|
2019-04-14 20:53:42 -04:00 |
|
Imbris
|
e755afce91
|
simplify chat keybaord capture
Former-commit-id: 3c5c5c241fe0c0d97059c7b87c0c08104eb5c5fe
|
2019-04-14 20:45:54 -04:00 |
|
Imbris
|
b7439b9107
|
ignore tx.send() result
Former-commit-id: 2d4b2d258f8fd3b030bb7f1e9596ccb6750d50ff
|
2019-04-14 20:23:26 -04:00 |
|
Imbris
|
3812e0b58f
|
stop zooming when scrolling chat
Former-commit-id: a94f26e30029ef4cff1807c2347cbd2490c4afd7
|
2019-04-14 20:15:12 -04:00 |
|
Joshua Barretto
|
520706debf
|
Updated gitignore
Former-commit-id: aa8f178f7004c61af2f0463bc1b190ae25909372
|
2019-04-15 00:29:28 +01:00 |
|
Joshua Barretto
|
c98d841890
|
Fixed physics sync
Former-commit-id: 86d3af46c69f6566f4cab8d93ecf27636a9563cf
|
2019-04-15 00:29:28 +01:00 |
|
Joshua Barretto
|
1e90cf68d5
|
Merge branch 'async_login' into 'master'
Add asynchronus client creation to Voxygen
See merge request veloren/veloren!26
Former-commit-id: 51278bbde64ac9dd48bc34a6e7b7922958883f73
|
2019-04-14 23:28:29 +00:00 |
|
Imbris
|
e377e8ff09
|
Add asynchronus client creation to Voxygen
Former-commit-id: 0c11cc8a7ddc7b425e036c2357c233e376002c6e
|
2019-04-14 23:28:29 +00:00 |
|
Joshua Barretto
|
490d255d48
|
Merge branch 'master' into 'master'
Added cargo lock, updated sphynx
See merge request veloren/veloren!25
Former-commit-id: 8df34e0fc051fe09363735f344f3d774ea3823cd
|
2019-04-14 16:53:11 +00:00 |
|