Commit Graph

217 Commits

Author SHA1 Message Date
Pfauenauge90
d7edd5ede7 Help window Closing button fixed
Former-commit-id: 80adaac65b93562e0be6adad412db6cf413d0a64
2019-04-17 22:46:43 +02:00
Pfauenauge90
0635894557 Error Window, Alpha Version Display
Former-commit-id: e2ad4e0974c513f806227720cdb2055c1847e9d7
2019-04-17 22:38:52 +02:00
Pfauenauge90
93fedf3b86 Rebase and Login Error
Former-commit-id: 1865dd58d43ae0a7d78b61ca3a9684ca76fce02d
2019-04-17 19:41:22 +02:00
Pfauenauge90
69c01a92a5 Merge branch 'master' of https://gitlab.com/Pfauenauge/veloren
Former-commit-id: 9f8264abda29d9def99b011fe9d3b2504704998c
2019-04-17 19:38:04 +02:00
Joshua Barretto
1e4d02a5d8 Merge branch 'singleplayer' into 'master'
Start Singleplayer server when singleplayer is selected

See merge request veloren/veloren!39

Former-commit-id: ac8c9f3f52871d89847fdecc74ac58bb593e762b
2019-04-17 15:31:02 +00:00
Louis Pearson
a768971c6c Stop singleplayer thread whenever a session is left
Former-commit-id: 16fcf35cbc856bebc12944781c2ac1a4daab5550
2019-04-17 09:22:26 -06:00
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
Louis Pearson
76adbec3bb Add method to drop singleplayer thread
Former-commit-id: b62a90728d4e83a005687538e134cee427491052
2019-04-17 08:57:23 -06:00
timokoesters
1ae18fecf8 Change timeout to 20s
Former-commit-id: dca0d08a06c27259cdaaf0138024f53c6c93d94e
2019-04-17 16:46:04 +02:00
Louis Pearson
7ec6e09332 Add basic singleplayer support
Former-commit-id: 929b05faca5d2b95a96349dfc17a62b3165289a1
2019-04-17 07:41:34 -06: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
Pfauenauge90
858055b8c4 Error Window
Former-commit-id: e58ba8be94bb6f6b39c713f44dec20089c20b348
2019-04-15 22:51:32 +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